Work in progress

starsky/starsky.foundation.webtelemetry/Extensions/OpenTelemetryExtension.cs

@@ -1,5 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using Microsoft.Extensions.DependencyInjection;
+using OpenTelemetry.Exporter;
+using OpenTelemetry.Metrics;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
 using starsky.foundation.platform.Models;
 
 [assembly: InternalsVisibleTo("starskytest")]
@@ -15,28 +22,48 @@ public static class OpenTelemetryExtension
 	public static void AddOpenTelemetryMonitoring(
 		this IServiceCollection services, AppSettings appSettings)
 	{
-		if ( string.IsNullOrWhiteSpace(appSettings.ApplicationInsightsConnectionString) )
+		if ( string.IsNullOrWhiteSpace(appSettings.OpenTelemetryEndpoint) )
 		{
 			return;
 		}
-
-		const string serviceName = "roll-dice";
 
-		services.builder.Logging.AddOpenTelemetry(options =>
-		{
-			options
-				.SetResourceBuilder(
-					ResourceBuilder.CreateDefault()
-						.AddService(serviceName))
-				.AddConsoleExporter();
-		});
-		builder.Services.AddOpenTelemetry()
-			.ConfigureResource(resource => resource.AddService(serviceName))
-			.WithTracing(tracing => tracing
-				.AddAspNetCoreInstrumentation()
-				.AddConsoleExporter())
-			.WithMetrics(metrics => metrics
-				.AddAspNetCoreInstrumentation()
-				.AddConsoleExporter());
+		services.AddOpenTelemetry()
+			.ConfigureResource(resource => resource.AddService(
+				serviceNamespace: appSettings.Name,
+				serviceName: appSettings.Name,
+				serviceVersion: Assembly.GetEntryAssembly()?.GetName().Version
+					?.ToString(),
+				serviceInstanceId: Environment.MachineName
+			).AddAttributes(new Dictionary<string, object>
+			{
+				{
+					"deployment.environment",
+					Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")
+					!
+				}
+			}))
+			.WithTracing(tracing => tracing.AddAspNetCoreInstrumentation()
+				.AddConsoleExporter()
+				.AddOtlpExporter(
+					o =>
+					{
+						o.Endpoint = new Uri(appSettings.OpenTelemetryEndpoint);
+						o.Protocol = OtlpExportProtocol.HttpProtobuf;
+						o.Headers = appSettings.OpenTelemetryHeader;
+					}
+				)
+			)
+			.WithMetrics(metrics =>
+				metrics.AddAspNetCoreInstrumentation()
+					.AddRuntimeInstrumentation()
+					.AddConsoleExporter()
+					.AddOtlpExporter(	
+						o =>
+					{
+						o.Endpoint = new Uri(appSettings.OpenTelemetryEndpoint);
+						o.Protocol = OtlpExportProtocol.HttpProtobuf;
+						o.Headers = appSettings.OpenTelemetryHeader;
+					})
+				);
 	}
 }

starsky/starsky.foundation.webtelemetry/Helpers/SetupLogging.cs

@@ -1,6 +1,9 @@
+using System;
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using OpenTelemetry.Exporter;
+using OpenTelemetry.Logs;
 using starsky.foundation.platform.Interfaces;
 using starsky.foundation.platform.Models;
 using starsky.foundation.platform.Services;
@@ -10,14 +13,26 @@ namespace starsky.foundation.webtelemetry.Helpers
 	public static class SetupLogging
 	{
 		[SuppressMessage("Usage", "S4792:Make sure that this logger's configuration is safe.")]
-		public static void AddApplicationInsightsLogging(this IServiceCollection services, AppSettings appSettings)
+		public static void AddTelemetryLogging(this IServiceCollection services, AppSettings appSettings)
 		{
 			services.AddLogging(logging =>
 			{
 				logging.ClearProviders();
 				logging.AddConsole();
-	            
-				// Skip when is Development
+
+				if ( !string.IsNullOrEmpty(appSettings.OpenTelemetryEndpoint) )
+				{
+					logging.AddOpenTelemetry(builder => builder.AddOtlpExporter(
+						"logging",
+						options =>
+						{
+							options.Protocol = OtlpExportProtocol.HttpProtobuf;
+							options.Headers = appSettings.OpenTelemetryHeader;
+							options.Endpoint = new Uri(appSettings.OpenTelemetryEndpoint);
+						}));
+				}
+				
+				// Remove when ApplicationInsights is phased out
 				if (appSettings.ApplicationInsightsLog != true || 
 				    string.IsNullOrWhiteSpace(appSettings.ApplicationInsightsConnectionString)) return;
 	            
@@ -27,6 +42,8 @@ public static void AddApplicationInsightsLogging(this IServiceCollection service
 						telemetryConfiguration.ConnectionString = appSettings.ApplicationInsightsConnectionString;
 					},
 					_ => { });
+				// End Remove when ApplicationInsights is phased out
+
 			});
 
 			services.AddScoped<IWebLogger, WebLogger>();

starsky/starsky.foundation.webtelemetry/starsky.foundation.webtelemetry.csproj

@@ -25,9 +25,11 @@
       <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
       <PackageReference Include="OpenTelemetry" Version="1.7.0" />
       <PackageReference Include="OpenTelemetry.Api" Version="1.7.0" />
+      <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.7.0" />
       <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
-      <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
-      <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
+      <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.6.0" />
+      <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.6.0" />
+      <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.5.1" />
       <PackageReference Include="System.Text.Json" Version="6.0.7" />
     </ItemGroup>
 

starsky/starsky/Properties/default-init-launchSettings.json

@@ -27,7 +27,9 @@
           "app__DemoUnsafeDeleteStorageFolder": "false",
           "app__useSystemTrash": "true",
           "[email protected]": "Administrator",
-          "app__ThumbnailGenerationIntervalInMinutes": "15"
+          "app__ThumbnailGenerationIntervalInMinutes": "15",
+          "_app__OpenTelemetryEndpoint": "http://localhost:9411/api/v2/spans",
+          "app__OpenTelemetryHeader": "api-key=test"  
         }
     }
   }

starsky/starsky/Startup.cs

@@ -71,9 +71,10 @@ public void ConfigureServices(IServiceCollection services)
 
             // Detect Application Insights (used in next SetupDatabaseTypes)
             services.AddMonitoring(_appSettings);
+            services.AddOpenTelemetryMonitoring(_appSettings);
 
             // LoggerFactory
-            services.AddApplicationInsightsLogging(_appSettings);
+            services.AddTelemetryLogging(_appSettings);
 
             var foundationDatabaseName = typeof(ApplicationDbContext).Assembly.FullName?.Split(",").FirstOrDefault();
             new SetupDatabaseTypes(_appSettings,services).BuilderDb(foundationDatabaseName);

starsky/starskyadmincli/Program.cs

@@ -38,7 +38,7 @@ internal static async Task Main(string[] args)
 			var appSettings = serviceProvider.GetRequiredService<AppSettings>();
 
 			services.AddMonitoringWorkerService(appSettings, AppSettings.StarskyAppType.Geo);
-			services.AddApplicationInsightsLogging(appSettings);
+			services.AddTelemetryLogging(appSettings);
 
 			var webLogger = serviceProvider.GetRequiredService<IWebLogger>();
 

starsky/starskydemoseedcli/Program.cs

@@ -33,7 +33,7 @@ public static async Task Main(string[] args)
 			var appSettings = serviceProvider.GetRequiredService<AppSettings>();
 
 			services.AddMonitoringWorkerService(appSettings, AppSettings.StarskyAppType.DemoSeed);
-			services.AddApplicationInsightsLogging(appSettings);
+			services.AddTelemetryLogging(appSettings);
 
 			new SetupDatabaseTypes(appSettings,services).BuilderDb();
 			serviceProvider = services.BuildServiceProvider();

starsky/starskygeocli/Program.cs

@@ -33,7 +33,7 @@ public static async Task Main(string[] args)
 			var appSettings = serviceProvider.GetRequiredService<AppSettings>();
 
 			services.AddMonitoringWorkerService(appSettings, AppSettings.StarskyAppType.Geo);
-			services.AddApplicationInsightsLogging(appSettings);
+			services.AddTelemetryLogging(appSettings);
 
 			new SetupDatabaseTypes(appSettings,services).BuilderDb();
 			serviceProvider = services.BuildServiceProvider();

starsky/starskyimportercli/Program.cs

@@ -32,7 +32,7 @@ public static async Task Main(string[] args)
             var appSettings = serviceProvider.GetRequiredService<AppSettings>();
 
             services.AddMonitoringWorkerService(appSettings, AppSettings.StarskyAppType.Importer);
-            services.AddApplicationInsightsLogging(appSettings);
+            services.AddTelemetryLogging(appSettings);
 
             new SetupDatabaseTypes(appSettings,services).BuilderDb();
             serviceProvider = services.BuildServiceProvider();

starsky/starskysynchronizecli/Program.cs

@@ -32,7 +32,7 @@ public static async Task Main(string[] args)
 			var appSettings = serviceProvider.GetRequiredService<AppSettings>();
 
 			services.AddMonitoringWorkerService(appSettings, AppSettings.StarskyAppType.Sync);
-			services.AddApplicationInsightsLogging(appSettings);
+			services.AddTelemetryLogging(appSettings);
 
 			new SetupDatabaseTypes(appSettings,services).BuilderDb();
 			serviceProvider = services.BuildServiceProvider();

starsky/starskytest/starsky.foundation.webtelemetry/Helpers/SetupLoggingTest.cs

@@ -16,7 +16,7 @@ public void AddApplicationInsightsLoggingTest()
 	{
 		var testGuid = Guid.NewGuid().ToString();
 		IServiceCollection services = new ServiceCollection();
-		services.AddApplicationInsightsLogging(new AppSettings
+		services.AddTelemetryLogging(new AppSettings
 		{
 			ApplicationInsightsLog = true,
 			ApplicationInsightsConnectionString = $"InstrumentationKey={testGuid}"

starsky/starskythumbnailcli/Program.cs

@@ -31,7 +31,7 @@ public static async Task Main(string[] args)
 			var appSettings = serviceProvider.GetRequiredService<AppSettings>();
 
 			services.AddMonitoringWorkerService(appSettings, AppSettings.StarskyAppType.Thumbnail);
-			services.AddApplicationInsightsLogging(appSettings);
+			services.AddTelemetryLogging(appSettings);
 
 			new SetupDatabaseTypes(appSettings,services).BuilderDb();
 			serviceProvider = services.BuildServiceProvider();

starsky/starskythumbnailmetacli/Program.cs

@@ -32,7 +32,7 @@ public static async Task Main(string[] args)
 			var appSettings = serviceProvider.GetRequiredService<AppSettings>();
 
 			services.AddMonitoringWorkerService(appSettings, AppSettings.StarskyAppType.MetaThumbnail);
-			services.AddApplicationInsightsLogging(appSettings);
+			services.AddTelemetryLogging(appSettings);
 
 			new SetupDatabaseTypes(appSettings,services).BuilderDb();
 			serviceProvider = services.BuildServiceProvider();