Some Aspire progress

Author: ejsmith

src/Exceptionless.AppHost/ElasticsearchExtensions.cs

@@ -11,24 +11,23 @@ namespace Aspire.Hosting;
 public static class ElasticsearchBuilderExtensions
 {
     /// <summary>
-    /// Adds a Elasticsearch container to the application model. The default image is "docker.elastic.co/elasticsearch/elasticsearch" and tag is "latest". This version the package defaults to the 8.12.2 tag of the redis container image
+    /// Adds a Elasticsearch container to the application model. The default image is "docker.elastic.co/elasticsearch/elasticsearch" and tag is "latest". This version the package defaults to the 8.12.2 tag of the Elasticsearch container image
     /// </summary>
     /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
     /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
     /// <param name="port">The host port to bind the underlying container to.</param>
     /// <returns>A reference to the <see cref="IResourceBuilder{T}"/>.</returns>
     public static IResourceBuilder<ElasticsearchResource> AddElasticsearch(this IDistributedApplicationBuilder builder, string name, int? port = null)
     {
-        var redis = new ElasticsearchResource(name);
-        return builder.AddResource(redis)
-                      .WithHttpEndpoint(containerPort: 9200)
-                      .WithAnnotation(new ContainerImageAnnotation { Image = "docker.elastic.co/elasticsearch/elasticsearch", Tag = "8.12.2" })
-                      .WithEnvironment("discovery.type", "single-node")
-                      //.WithEnvironment("network.host", "0.0.0.0")
-                      .WithEnvironment("XPACK_SECURITY_ENABLED", "false")
-                      .WithEnvironment("action.destructive_requires_name", "false")
-                      .WithEnvironment("ES_JAVA_OPTS", "-Xms1g -Xmx1g")
-                  .PublishAsContainer();
+        var elasticsearch = new ElasticsearchResource(name);
+        return builder.AddResource(elasticsearch)
+            .WithHttpEndpoint(containerPort: 9200, hostPort: port, name: "http")
+            .WithAnnotation(new ContainerImageAnnotation { Image = "docker.elastic.co/elasticsearch/elasticsearch", Tag = "8.12.2" })
+            .WithEnvironment("discovery.type", "single-node")
+            .WithEnvironment("xpack.security.enabled", "false")
+            .WithEnvironment("action.destructive_requires_name", "false")
+            .WithEnvironment("ES_JAVA_OPTS", "-Xms1g -Xmx1g")
+            .PublishAsConnectionString();
     }
 
     /// <summary>
@@ -78,14 +77,14 @@ public string? ConnectionStringExpression
                 return connectionStringAnnotation.Resource.ConnectionStringExpression;
             }
 
-            return $"{{{Name}.bindings.tcp.host}}:{{{Name}.bindings.tcp.port}}";
+            return $"http://{{{Name}.bindings.tcp.host}}:{{{Name}.bindings.tcp.port}}";
         }
     }
 
     /// <summary>
     /// Gets the connection string for the Elasticsearch server.
     /// </summary>
-    /// <returns>A connection string for the redis server in the form "host:port".</returns>
+    /// <returns>A connection string for the Elasticsearch server in the form "host:port".</returns>
     public string? GetConnectionString()
     {
         if (this.TryGetLastAnnotation<ConnectionStringRedirectAnnotation>(out var connectionStringAnnotation))
@@ -100,7 +99,7 @@ public string? ConnectionStringExpression
 
         // We should only have one endpoint for Elasticsearch for local scenarios.
         var endpoint = allocatedEndpoints.Single();
-        return endpoint.EndPointString;
+        return $"http://{endpoint.EndPointString}";
     }
 }
 

src/Exceptionless.AppHost/Program.cs

@@ -1,6 +1,6 @@
 var builder = DistributedApplication.CreateBuilder(args);
 
-var elastic = builder.AddElasticsearch("Elastic")
+var elastic = builder.AddElasticsearch("Elasticsearch")
     .WithKibana();
 
 var cache = builder.AddRedis("Redis")

src/Exceptionless.Core/Configuration/AppOptions.cs

@@ -114,13 +114,8 @@ public static AppOptions ReadFromConfiguration(IConfiguration config)
         options.EnableRepositoryNotifications = config.GetValue(nameof(options.EnableRepositoryNotifications), true);
         options.EnableWebSockets = config.GetValue(nameof(options.EnableWebSockets), true);
 
-        try
-        {
-            var versionInfo = FileVersionInfo.GetVersionInfo(typeof(AppOptions).Assembly.Location);
-            options.Version = versionInfo?.FileVersion;
-            options.InformationalVersion = versionInfo?.ProductVersion;
-        }
-        catch { }
+        options.Version = GetVersion();
+        options.InformationalVersion = GetInformationalVersion();
 
         options.CacheOptions = CacheOptions.ReadFromConfiguration(config, options);
         options.MessageBusOptions = MessageBusOptions.ReadFromConfiguration(config, options);
@@ -135,6 +130,40 @@ public static AppOptions ReadFromConfiguration(IConfiguration config)
 
         return options;
     }
+
+    private static string? _informationalVersion = null;
+    private static string? _version = null;
+
+    private static void GetVersionInternal()
+    {
+        try
+        {
+            var versionInfo = FileVersionInfo.GetVersionInfo(typeof(AppOptions).Assembly.Location);
+            _version = versionInfo?.FileVersion;
+            _informationalVersion = versionInfo?.ProductVersion;
+        }
+        catch { }
+    }
+
+    public static string GetVersion()
+    {
+        if (_version != null)
+            return _version;
+
+        GetVersionInternal();
+
+        return _version ?? string.Empty;
+    }
+
+    public static string GetInformationalVersion()
+    {
+        if (_informationalVersion != null)
+            return _informationalVersion;
+
+        GetVersionInternal();
+
+        return _informationalVersion ?? string.Empty;
+    }
 }
 
 public enum AppMode

src/Exceptionless.Core/Utility/AppDiagnostics.cs

@@ -9,8 +9,8 @@ public static class AppDiagnostics
 {
     internal static readonly AssemblyName AssemblyName = typeof(AppDiagnostics).Assembly.GetName();
     internal static readonly string? AssemblyVersion = typeof(AppDiagnostics).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? AssemblyName.Version?.ToString();
-    internal static readonly ActivitySource ActivitySource = new(AssemblyName.Name ?? "Exceptionless", AssemblyVersion);
-    internal static readonly Meter Meter = new("Exceptionless", AssemblyVersion);
+    public static readonly ActivitySource ActivitySource = new(AssemblyName.Name ?? "Exceptionless", AssemblyVersion);
+    public static readonly Meter Meter = new("Exceptionless", AssemblyVersion);
     private static readonly string _metricsPrefix = "ex.";
 
     private static readonly ConcurrentDictionary<string, Counter<int>> _counters = new();

src/Exceptionless.Job/Exceptionless.Job.csproj

@@ -28,6 +28,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\Exceptionless.Web\ApmExtensions.cs" Link="ApmExtensions.cs" />
+    <Compile Include="..\Exceptionless.Web\ServiceDefaults.cs" Link="ServiceDefaults.cs" />
   </ItemGroup>
 </Project>

src/Exceptionless.Job/Program.cs

@@ -49,6 +49,7 @@ public static IHostBuilder CreateHostBuilder(string[] args)
             .SetBasePath(Directory.GetCurrentDirectory())
             .AddYamlFile("appsettings.yml", optional: true, reloadOnChange: true)
             .AddYamlFile($"appsettings.{environment}.yml", optional: true, reloadOnChange: true)
+            .AddEnvironmentVariables()
             .AddEnvironmentVariables("EX_")
             .AddEnvironmentVariables("ASPNETCORE_")
             .AddCommandLine(args)
@@ -60,7 +61,7 @@ public static IHostBuilder CreateHostBuilder(string[] args)
             .ForContext<Program>();
 
         var options = AppOptions.ReadFromConfiguration(config);
-        var apmConfig = new ApmConfig(config, $"job-{jobOptions.JobName.ToLowerUnderscoredWords('-')}", options.InformationalVersion, options.CacheOptions.Provider == "redis");
+        var otelConfig = new OpenTelemetryConfig(config, $"job-{jobOptions.JobName.ToLowerUnderscoredWords('-')}", options.CacheOptions.Provider == "redis");
 
         var configDictionary = config.ToDictionary("Serilog");
         Log.Information("Bootstrapping Exceptionless {JobName} job(s) in {AppMode} mode ({InformationalVersion}) on {MachineName} with settings {@Settings}", jobOptions.JobName ?? "All", environment, options.InformationalVersion, Environment.MachineName, configDictionary);
@@ -100,8 +101,7 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                         if (!String.IsNullOrEmpty(options.ExceptionlessApiKey) && !String.IsNullOrEmpty(options.ExceptionlessServerUrl))
                             app.UseExceptionless(ExceptionlessClient.Default);
 
-                        if (apmConfig.EnableMetrics)
-                            app.UseOpenTelemetryPrometheusScrapingEndpoint();
+                        app.UseOpenTelemetryPrometheusScrapingEndpoint();
 
                         app.UseHealthChecks("/health", new HealthCheckOptions
                         {
@@ -128,7 +128,7 @@ public static IHostBuilder CreateHostBuilder(string[] args)
                 Bootstrapper.RegisterServices(services, options);
                 Insulation.Bootstrapper.RegisterServices(services, options, true);
             })
-            .AddApm(apmConfig);
+            .AddServiceDefaults(otelConfig);
 
         return builder;
     }