Set instance id

Particular · Feb 2, 2025 · 7616151 · 7616151
1 parent 7f37e53
commit 7616151
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -50,7 +50,6 @@
     <PackageVersion Include="NUnit" Version="4.3.2" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.6.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
     <PackageVersion Include="Particular.Approvals" Version="2.0.1" />

diff --git a/src/ServiceControl.Audit/HostApplicationBuilderExtensions.cs b/src/ServiceControl.Audit/HostApplicationBuilderExtensions.cs
@@ -29,10 +29,11 @@ public static void AddServiceControlAudit(this IHostApplicationBuilder builder,
         Settings settings,
         EndpointConfiguration configuration)
     {
+        var version = FileVersionInfo.GetVersionInfo(typeof(HostApplicationBuilderExtensions).Assembly.Location).ProductVersion;
         var persistenceConfiguration = PersistenceConfigurationFactory.LoadPersistenceConfiguration(settings);
         var persistenceSettings = persistenceConfiguration.BuildPersistenceSettings(settings);
 
-        RecordStartup(settings, configuration, persistenceConfiguration);
+        RecordStartup(version, settings, configuration, persistenceConfiguration);
 
         builder.Logging.ClearProviders();
         builder.Logging.AddNLog();
@@ -69,18 +70,22 @@ public static void AddServiceControlAudit(this IHostApplicationBuilder builder,
 
         if (!string.IsNullOrEmpty(settings.OtelMetricsUrl))
         {
+            if (!Uri.TryCreate(settings.OtelMetricsUrl, UriKind.Absolute, out var otelMetricsUri))
+            {
+                throw new UriFormatException($"Invalid OtelMetricsUrl: {settings.OtelMetricsUrl}");
+            }
             builder.Services.AddOpenTelemetry()
-                .ConfigureResource(b => b.AddService(serviceName: settings.InstanceName))
+                .ConfigureResource(b => b.AddService(
+                    serviceName: "Particular.ServiceControl.Audit",
+                    serviceVersion: version,
+                    serviceInstanceId: settings.InstanceName))
                 .WithMetrics(b =>
                 {
                     b.AddMeter("ServiceControl");
-
                     b.AddOtlpExporter(e =>
                     {
-                        e.Endpoint = new Uri(settings.OtelMetricsUrl);
+                        e.Endpoint = otelMetricsUri;
                     });
-
-                    b.AddConsoleExporter();
                 });
         }
 
@@ -100,10 +105,8 @@ public static void AddServiceControlAuditInstallers(this IHostApplicationBuilder
         builder.Services.AddInstaller(persistenceSettings, persistenceConfiguration);
     }
 
-    static void RecordStartup(Settings settings, EndpointConfiguration endpointConfiguration, IPersistenceConfiguration persistenceConfiguration)
+    static void RecordStartup(string version, Settings settings, EndpointConfiguration endpointConfiguration, IPersistenceConfiguration persistenceConfiguration)
     {
-        var version = FileVersionInfo.GetVersionInfo(typeof(HostApplicationBuilderExtensions).Assembly.Location).ProductVersion;
-
         var startupMessage = $@"
 -------------------------------------------------------------
 ServiceControl Audit Version:       {version}

diff --git a/src/ServiceControl.Audit/ServiceControl.Audit.csproj b/src/ServiceControl.Audit/ServiceControl.Audit.csproj
@@ -28,7 +28,6 @@
     <PackageReference Include="NServiceBus.CustomChecks" />
     <PackageReference Include="NServiceBus.Extensions.Hosting" />
     <PackageReference Include="NServiceBus.Extensions.Logging" />
-    <PackageReference Include="OpenTelemetry.Exporter.Console" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
   </ItemGroup>