Enabled Instrumentations with OpenTelemetry

src/Services/Basket/Basket.API/Extensions/OpenTelemetryExtensions.cs

@@ -1,28 +1,33 @@
 using Microsoft.Extensions.DependencyInjection;
+using OpenTelemetry;
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
+using StackExchange.Redis;
 using System;
 
-static class OpenTelemetryExtensions
+namespace Basket.API.Extensions
 {
-    public static IServiceCollection AddOpenTelemetry(this IServiceCollection services)
+    static class OpenTelemetryExtensions
+    {
+        public static void AddOpenTelemetry(ConnectionMultiplexer connectionMultiplexer)
         {
             var exportType = Environment.GetEnvironmentVariable("OTEL_USE_EXPORTER")?.ToLower();
             if (exportType == null)
             {
-            return services;
+                return;
             }
 
-        return services.AddOpenTelemetryTracing((serviceProvider, tracerProviderBuilder) =>
+            var tracerProviderBuilder = Sdk.CreateTracerProviderBuilder();
-        {
+
             // Configure resource
             tracerProviderBuilder
-                .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("WebMVC"));
+                .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("Basket.API"));
 
             // Configure instrumentation
             tracerProviderBuilder
                 .AddAspNetCoreInstrumentation()
-                .AddHttpClientInstrumentation();
+                .AddHttpClientInstrumentation()
+                .AddRedisInstrumentation(connectionMultiplexer);
 
             // Configure exporter
             switch (exportType)
@@ -57,6 +62,8 @@ static class OpenTelemetryExtensions
                     tracerProviderBuilder.AddConsoleExporter();
                     break;
             }
-        });
+
+            tracerProviderBuilder.Build();
+        }
     }
 }

src/Services/Basket/Basket.API/OpenTelemetry.cs

@@ -1,66 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using OpenTelemetry;
-using OpenTelemetry.Resources;
-using OpenTelemetry.Trace;
-using StackExchange.Redis;
-using System;
-
-static class OpenTelemetryExtensions
-{
-    public static void AddOpenTelemetry(ConnectionMultiplexer connectionMultiplexer)
-    {
-        var exportType = Environment.GetEnvironmentVariable("OTEL_USE_EXPORTER")?.ToLower();
-        if (exportType == null)
-        {
-            return;
-        }
-
-        var tracerProviderBuilder = Sdk.CreateTracerProviderBuilder();
-
-        // Configure resource
-        tracerProviderBuilder
-            .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("Basket.API"));
-
-        // Configure instrumentation
-        tracerProviderBuilder
-            .AddAspNetCoreInstrumentation()
-            .AddHttpClientInstrumentation()
-            .AddRedisInstrumentation(connectionMultiplexer);
-
-        // Configure exporter
-        switch (exportType)
-        {
-            case "jaeger":
-                tracerProviderBuilder.AddJaegerExporter(options =>
-                {
-                    var agentHost = Environment.GetEnvironmentVariable("OTEL_EXPORTER_JAEGER_AGENTHOST");
-                    options.AgentHost = agentHost;
-                });
-                break;
-            case "otlp":
-                tracerProviderBuilder.AddOtlpExporter(options =>
-                {
-                    var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT")
-                        ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_ENDPOINT");
-                    options.Endpoint = new Uri(endpoint);
-
-                    var headers = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_HEADERS")
-                        ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_HEADERS");
-                    options.Headers = headers;
-                });
-                break;
-            case "zipkin":
-                tracerProviderBuilder.AddZipkinExporter(options =>
-                {
-                    var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_ZIPKIN_ENDPOINT");
-                    options.Endpoint = new Uri(endpoint);
-                });
-                break;
-            default:
-                tracerProviderBuilder.AddConsoleExporter();
-                break;
-        }
-
-        tracerProviderBuilder.Build();
-    }
-}

src/Services/Basket/Basket.API/Startup.cs

@@ -1,5 +1,6 @@
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
+using Basket.API.Extensions;
 using Basket.API.Infrastructure.Filters;
 using Basket.API.IntegrationEvents.EventHandling;
 using Basket.API.IntegrationEvents.Events;
@@ -188,6 +189,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory, ConnectionMultiplexer connectionMultiplexer)
         {
             OpenTelemetryExtensions.AddOpenTelemetry(connectionMultiplexer);
+
             //loggerFactory.AddAzureWebAppDiagnostics();
             //loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 

src/Services/Catalog/Catalog.API/Catalog.API.csproj

@@ -68,6 +68,19 @@
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="OpenTelemetry" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc2" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc2" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc2" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.0.0-rc2" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc2" />	
+	</ItemGroup>
+	
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" />
 		<ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" />

src/Services/Catalog/Catalog.API/Extensions/OpenTelemetryExtensions.cs

@@ -0,0 +1,68 @@
+using Microsoft.Extensions.DependencyInjection;
+using OpenTelemetry;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+using System;
+
+namespace Catalog.API.Extensions
+{
+    static class OpenTelemetryExtensions
+    {
+        public static IServiceCollection AddOpenTelemetry(this IServiceCollection services)
+        {
+            var exportType = Environment.GetEnvironmentVariable("OTEL_USE_EXPORTER")?.ToLower();
+            if (exportType == null)
+            {
+                return services;
+            }
+
+            return services.AddOpenTelemetryTracing((serviceProvider, tracerProviderBuilder) =>
+            {
+                // Configure resource
+                tracerProviderBuilder
+                    .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("Catalog.API"));
+
+                // Configure instrumentation
+                tracerProviderBuilder
+                    .AddAspNetCoreInstrumentation()
+                    .AddHttpClientInstrumentation()
+                    .AddGrpcClientInstrumentation()
+                    .AddSqlClientInstrumentation();
+
+                // Configure exporter
+                switch (exportType)
+                {
+                    case "jaeger":
+                        tracerProviderBuilder.AddJaegerExporter(options =>
+                        {
+                            var agentHost = Environment.GetEnvironmentVariable("OTEL_EXPORTER_JAEGER_AGENTHOST");
+                            options.AgentHost = agentHost;
+                        });
+                        break;
+                    case "otlp":
+                        tracerProviderBuilder.AddOtlpExporter(options =>
+                        {
+                            var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT")
+                                ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_ENDPOINT");
+                            options.Endpoint = new Uri(endpoint);
+
+                            var headers = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_HEADERS")
+                                ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_HEADERS");
+                            options.Headers = headers;
+                        });
+                        break;
+                    case "zipkin":
+                        tracerProviderBuilder.AddZipkinExporter(options =>
+                        {
+                            var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_ZIPKIN_ENDPOINT");
+                            options.Endpoint = new Uri(endpoint);
+                        });
+                        break;
+                    default:
+                        tracerProviderBuilder.AddConsoleExporter();
+                        break;
+                }
+            });
+        }
+    }
+}

src/Services/Catalog/Catalog.API/Startup.cs

@@ -31,6 +31,7 @@ using System;
 using System.Data.Common;
 using System.IO;
 using System.Reflection;
+using Catalog.API.Extensions;
 
 namespace Microsoft.eShopOnContainers.Services.Catalog.API
 {
@@ -53,7 +54,8 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
                 .AddIntegrationServices(Configuration)
                 .AddEventBus(Configuration)
                 .AddSwagger(Configuration)
-                .AddCustomHealthCheck(Configuration);
+                .AddCustomHealthCheck(Configuration)
+                .AddOpenTelemetry();
 
             var container = new ContainerBuilder();
             container.Populate(services);

src/Services/Identity/Identity.API/Extensions/OpenTelemetryExtensions.cs

@@ -0,0 +1,70 @@
+using Microsoft.Extensions.DependencyInjection;
+using OpenTelemetry;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Identity.API.Extensions
+{
+    static class OpenTelemetryExtensions
+    {
+        public static IServiceCollection AddOpenTelemetry(this IServiceCollection services)
+        {
+            var exportType = Environment.GetEnvironmentVariable("OTEL_USE_EXPORTER")?.ToLower();
+            if (exportType == null)
+            {
+                return services;
+            }
+
+            return services.AddOpenTelemetryTracing((serviceProvider, tracerProviderBuilder) =>
+            {
+                // Configure resource
+                tracerProviderBuilder
+                    .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("Identity.API"));
+
+                // Configure instrumentation
+                tracerProviderBuilder
+                    .AddAspNetCoreInstrumentation()
+                    .AddHttpClientInstrumentation()                    
+                    .AddSqlClientInstrumentation();
+
+                // Configure exporter
+                switch (exportType)
+                {
+                    case "jaeger":
+                        tracerProviderBuilder.AddJaegerExporter(options =>
+                        {
+                            var agentHost = Environment.GetEnvironmentVariable("OTEL_EXPORTER_JAEGER_AGENTHOST");
+                            options.AgentHost = agentHost;
+                        });
+                        break;
+                    case "otlp":
+                        tracerProviderBuilder.AddOtlpExporter(options =>
+                        {
+                            var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT")
+                                ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_ENDPOINT");
+                            options.Endpoint = new Uri(endpoint);
+
+                            var headers = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_HEADERS")
+                                ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_HEADERS");
+                            options.Headers = headers;
+                        });
+                        break;
+                    case "zipkin":
+                        tracerProviderBuilder.AddZipkinExporter(options =>
+                        {
+                            var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_ZIPKIN_ENDPOINT");
+                            options.Endpoint = new Uri(endpoint);
+                        });
+                        break;
+                    default:
+                        tracerProviderBuilder.AddConsoleExporter();
+                        break;
+                }
+            });
+        }
+    }
+}

src/Services/Identity/Identity.API/Identity.API.csproj

@@ -52,6 +52,18 @@
 		<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="OpenTelemetry" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc2" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc2" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc2" />		
+		<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc2" />
+	</ItemGroup>
+	
 	<ItemGroup>
 		<EmbeddedResource Include="Certificate\idsrv3test.pfx" />
 	</ItemGroup>
@@ -62,8 +74,4 @@
 		</None>
 	</ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Extensions\" />
-  </ItemGroup>
-
 </Project>

src/Services/Identity/Identity.API/Startup.cs

@@ -1,6 +1,7 @@
 using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using HealthChecks.UI.Client;
+using Identity.API.Extensions;
 using IdentityServer4.Services;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.DataProtection;
@@ -38,6 +39,8 @@ namespace Microsoft.eShopOnContainers.Services.Identity.API
         {
             RegisterAppInsights(services);
 
+            services.AddOpenTelemetry();
+
             // Add framework services.
             services.AddDbContext<ApplicationDbContext>(options =>
                     options.UseSqlServer(Configuration["ConnectionString"],

src/Services/Ordering/Ordering.API/Extensions/OpenTelemetryExtensions.cs

@@ -0,0 +1,70 @@
+using Microsoft.Extensions.DependencyInjection;
+using OpenTelemetry;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Ordering.API.Extensions
+{
+    static class OpenTelemetryExtensions
+    {
+        public static IServiceCollection AddOpenTelemetry(this IServiceCollection services)
+        {
+            var exportType = Environment.GetEnvironmentVariable("OTEL_USE_EXPORTER")?.ToLower();
+            if (exportType == null)
+            {
+                return services;
+            }
+
+            return services.AddOpenTelemetryTracing((serviceProvider, tracerProviderBuilder) =>
+            {
+                // Configure resource
+                tracerProviderBuilder
+                    .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("Order.API"));
+
+                // Configure instrumentation
+                tracerProviderBuilder
+                    .AddAspNetCoreInstrumentation()
+                    .AddHttpClientInstrumentation()                    
+                    .AddSqlClientInstrumentation();
+
+                // Configure exporter
+                switch (exportType)
+                {
+                    case "jaeger":
+                        tracerProviderBuilder.AddJaegerExporter(options =>
+                        {
+                            var agentHost = Environment.GetEnvironmentVariable("OTEL_EXPORTER_JAEGER_AGENTHOST");
+                            options.AgentHost = agentHost;
+                        });
+                        break;
+                    case "otlp":
+                        tracerProviderBuilder.AddOtlpExporter(options =>
+                        {
+                            var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT")
+                                ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_ENDPOINT");
+                            options.Endpoint = new Uri(endpoint);
+
+                            var headers = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_HEADERS")
+                                ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_HEADERS");
+                            options.Headers = headers;
+                        });
+                        break;
+                    case "zipkin":
+                        tracerProviderBuilder.AddZipkinExporter(options =>
+                        {
+                            var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_ZIPKIN_ENDPOINT");
+                            options.Endpoint = new Uri(endpoint);
+                        });
+                        break;
+                    default:
+                        tracerProviderBuilder.AddConsoleExporter();
+                        break;
+                }
+            });
+        }
+    }
+}

src/Services/Ordering/Ordering.API/Ordering.API.csproj

@@ -69,6 +69,18 @@
 		<PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="OpenTelemetry" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc2" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc2" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc2" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc2" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<None Update="Setup\*">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/Services/Ordering/Ordering.API/Startup.cs

@@ -37,6 +37,7 @@
     using System.IdentityModel.Tokens.Jwt;
     using System.IO;
     using System.Reflection;    
+    using global::Ordering.API.Extensions;
 
     public class Startup
     {
@@ -49,12 +50,14 @@
 
         public virtual IServiceProvider ConfigureServices(IServiceCollection services)
         {
+
             services
                 .AddGrpc(options =>
                 {
                     options.EnableDetailedErrors = true;
                 })
                 .Services
+                .AddOpenTelemetry()
                 .AddApplicationInsights(Configuration)
                 .AddCustomMvc()
                 .AddHealthChecks(Configuration)
@@ -64,8 +67,8 @@
                 .AddCustomConfiguration(Configuration)
                 .AddEventBus(Configuration)
                 .AddCustomAuthentication(Configuration);
-            //configure autofac
             
+            //configure autofac
             var container = new ContainerBuilder();
             container.Populate(services);
 

src/Services/Payment/Payment.API/Extensions/OpenTelemetryExtensions.cs

@@ -0,0 +1,69 @@
+using Microsoft.Extensions.DependencyInjection;
+using OpenTelemetry;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Payment.API.Extensions
+{
+    static class OpenTelemetryExtensions
+    {
+        public static IServiceCollection AddOpenTelemetry(this IServiceCollection services)
+        {
+            var exportType = Environment.GetEnvironmentVariable("OTEL_USE_EXPORTER")?.ToLower();
+            if (exportType == null)
+            {
+                return services;
+            }
+
+            return services.AddOpenTelemetryTracing((serviceProvider, tracerProviderBuilder) =>
+            {
+                // Configure resource
+                tracerProviderBuilder
+                    .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("Payment.API"));
+
+                // Configure instrumentation
+                tracerProviderBuilder
+                    .AddAspNetCoreInstrumentation()
+                    .AddHttpClientInstrumentation();
+
+                // Configure exporter
+                switch (exportType)
+                {
+                    case "jaeger":
+                        tracerProviderBuilder.AddJaegerExporter(options =>
+                        {
+                            var agentHost = Environment.GetEnvironmentVariable("OTEL_EXPORTER_JAEGER_AGENTHOST");
+                            options.AgentHost = agentHost;
+                        });
+                        break;
+                    case "otlp":
+                        tracerProviderBuilder.AddOtlpExporter(options =>
+                        {
+                            var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT")
+                                ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_ENDPOINT");
+                            options.Endpoint = new Uri(endpoint);
+
+                            var headers = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_HEADERS")
+                                ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_HEADERS");
+                            options.Headers = headers;
+                        });
+                        break;
+                    case "zipkin":
+                        tracerProviderBuilder.AddZipkinExporter(options =>
+                        {
+                            var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_ZIPKIN_ENDPOINT");
+                            options.Endpoint = new Uri(endpoint);
+                        });
+                        break;
+                    default:
+                        tracerProviderBuilder.AddConsoleExporter();
+                        break;
+                }
+            });
+        }
+    }
+}

src/Services/Payment/Payment.API/Payment.API.csproj

@@ -28,6 +28,17 @@
 		<PackageReference Include="Serilog.Sinks.Seq" Version="4.1.0-dev-00166" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="OpenTelemetry" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc2" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc2" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc2" />		
+	</ItemGroup>
+
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" />
 		<ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" />

src/Services/Payment/Payment.API/Startup.cs

@@ -12,6 +12,7 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Logging;
+using Payment.API.Extensions;
 using Payment.API.IntegrationEvents.EventHandling;
 using Payment.API.IntegrationEvents.Events;
 using RabbitMQ.Client;
@@ -31,6 +32,7 @@ namespace Payment.API
         // This method gets called by the runtime. Use this method to add services to the container.
         public IServiceProvider ConfigureServices(IServiceCollection services)
         {
+            services.AddOpenTelemetry();
             services.AddCustomHealthCheck(Configuration);
             services.Configure<PaymentSettings>(Configuration);
 

src/Web/WebMVC/Extensions/OpenTelemetryExtensions.cs

@@ -0,0 +1,65 @@
+using Microsoft.Extensions.DependencyInjection;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+using System;
+
+namespace Microsoft.eShopOnContainers.WebMVC.Extensions
+{
+    static class OpenTelemetryExtensions
+    {
+        public static IServiceCollection AddOpenTelemetry(this IServiceCollection services)
+        {
+            var exportType = Environment.GetEnvironmentVariable("OTEL_USE_EXPORTER")?.ToLower();
+            if (exportType == null)
+            {
+                return services;
+            }
+
+            return services.AddOpenTelemetryTracing((serviceProvider, tracerProviderBuilder) =>
+            {
+                // Configure resource
+                tracerProviderBuilder
+                        .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("WebMVC"));
+
+                // Configure instrumentation
+                tracerProviderBuilder
+                        .AddAspNetCoreInstrumentation()
+                        .AddHttpClientInstrumentation();
+
+                // Configure exporter
+                switch (exportType)
+                {
+                    case "jaeger":
+                        tracerProviderBuilder.AddJaegerExporter(options =>
+                        {
+                            var agentHost = Environment.GetEnvironmentVariable("OTEL_EXPORTER_JAEGER_AGENTHOST");
+                            options.AgentHost = agentHost;
+                        });
+                        break;
+                    case "otlp":
+                        tracerProviderBuilder.AddOtlpExporter(options =>
+                        {
+                            var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT")
+                                ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_ENDPOINT");
+                            options.Endpoint = new Uri(endpoint);
+
+                            var headers = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_HEADERS")
+                                ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_HEADERS");
+                            options.Headers = headers;
+                        });
+                        break;
+                    case "zipkin":
+                        tracerProviderBuilder.AddZipkinExporter(options =>
+                        {
+                            var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_ZIPKIN_ENDPOINT");
+                            options.Endpoint = new Uri(endpoint);
+                        });
+                        break;
+                    default:
+                        tracerProviderBuilder.AddConsoleExporter();
+                        break;
+                }
+            });
+        }
+    }
+}

src/Web/WebMVC/Startup.cs

@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.DataProtection;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
+using Microsoft.eShopOnContainers.WebMVC.Extensions;
 using Microsoft.eShopOnContainers.WebMVC.Services;
 using Microsoft.eShopOnContainers.WebMVC.ViewModels;
 using Microsoft.Extensions.Configuration;

src/Web/WebSPA/Extensions/OpenTelemetryExtensions.cs

@@ -0,0 +1,69 @@
+using Microsoft.Extensions.DependencyInjection;
+using OpenTelemetry;
+using OpenTelemetry.Resources;
+using OpenTelemetry.Trace;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace WebSPA.Extensions
+{
+    static class OpenTelemetryExtensions
+    {
+        public static IServiceCollection AddOpenTelemetry(this IServiceCollection services)
+        {
+            var exportType = Environment.GetEnvironmentVariable("OTEL_USE_EXPORTER")?.ToLower();
+            if (exportType == null)
+            {
+                return services;
+            }
+
+            return services.AddOpenTelemetryTracing((serviceProvider, tracerProviderBuilder) =>
+            {
+                // Configure resource
+                tracerProviderBuilder
+                    .SetResourceBuilder(ResourceBuilder.CreateDefault().AddService("WebSPA"));
+
+                // Configure instrumentation
+                tracerProviderBuilder
+                    .AddAspNetCoreInstrumentation()
+                    .AddHttpClientInstrumentation();
+
+                // Configure exporter
+                switch (exportType)
+                {
+                    case "jaeger":
+                        tracerProviderBuilder.AddJaegerExporter(options =>
+                        {
+                            var agentHost = Environment.GetEnvironmentVariable("OTEL_EXPORTER_JAEGER_AGENTHOST");
+                            options.AgentHost = agentHost;
+                        });
+                        break;
+                    case "otlp":
+                        tracerProviderBuilder.AddOtlpExporter(options =>
+                        {
+                            var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT")
+                                ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_ENDPOINT");
+                            options.Endpoint = new Uri(endpoint);
+
+                            var headers = Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_TRACES_HEADERS")
+                                ?? Environment.GetEnvironmentVariable("OTEL_EXPORTER_OTLP_HEADERS");
+                            options.Headers = headers;
+                        });
+                        break;
+                    case "zipkin":
+                        tracerProviderBuilder.AddZipkinExporter(options =>
+                        {
+                            var endpoint = Environment.GetEnvironmentVariable("OTEL_EXPORTER_ZIPKIN_ENDPOINT");
+                            options.Endpoint = new Uri(endpoint);
+                        });
+                        break;
+                    default:
+                        tracerProviderBuilder.AddConsoleExporter();
+                        break;
+                }
+            });
+        }
+    }
+}

src/Web/WebSPA/Startup.cs

@@ -13,6 +13,7 @@ using Microsoft.Extensions.Logging;
 using StackExchange.Redis;
 using System;
 using System.IO;
+using WebSPA.Extensions;
 using WebSPA.Infrastructure;
 
 namespace eShopConContainers.WebSPA
@@ -38,6 +39,7 @@ namespace eShopConContainers.WebSPA
         {
             RegisterAppInsights(services);
 
+            services.AddOpenTelemetry();
             services.AddHealthChecks()
                 .AddCheck("self", () => HealthCheckResult.Healthy())
                 .AddUrlGroup(new Uri(Configuration["IdentityUrlHC"]), name: "identityapi-check", tags: new string[] { "identityapi" });

src/Web/WebSPA/WebSPA.csproj

@@ -100,6 +100,17 @@
 		<PackageReference Include="Serilog.Sinks.Console" Version="4.0.0-dev-00834" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="OpenTelemetry" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.0.1" />
+		<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc2" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc2" />
+		<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc2" />
+
+	</ItemGroup>
 	<ItemGroup>
 		<Folder Include="wwwroot\assets\" />
 	</ItemGroup>
@@ -165,7 +176,9 @@
 	</ItemGroup>
 
 	<ProjectExtensions>
-    <VisualStudio><UserProperties package_1json__JSONSchema="http://json.schemastore.org/project-1.0.0-beta4" /></VisualStudio>
+		<VisualStudio>
+			<UserProperties package_1json__JSONSchema="http://json.schemastore.org/project-1.0.0-beta4" />
+		</VisualStudio>
 	</ProjectExtensions>
 
 </Project>

src/docker-compose.opentelemetry.console.yml

@@ -6,10 +6,31 @@ version: '3.4'
 # docker-compose -f docker-compose.yml -f docker-compose.override.yml -f docker-compose.opentelemetry.console.yml up
 
 services:
+
+  identity-api:
+    environment:
+      - OTEL_USE_EXPORTER=console
+  
   basket-api:
     environment:
       - OTEL_USE_EXPORTER=console
   
+  catalog-api:
+    environment:
+      - OTEL_USE_EXPORTER=console
+ 
+  ordering-api:
+    environment:
+      - OTEL_USE_EXPORTER=console
+  
+  payment-api:
+    environment:
+      - OTEL_USE_EXPORTER=console
+
   webmvc:
     environment:
       - OTEL_USE_EXPORTER=console
+  
+  webspa:
+    environment:
+      - OTEL_USE_EXPORTER=console

src/docker-compose.opentelemetry.jaeger.yml

@@ -18,12 +18,37 @@ services:
       - "14250:14250"
       - "9411:9411"
   
+  identity-api:
+    environment:
+      - OTEL_USE_EXPORTER=jaeger
+      - OTEL_EXPORTER_JAEGER_AGENTHOST=${OTEL_EXPORTER_JAEGER_AGENTHOST:-jaeger-all-in-one}
+
   basket-api:
     environment:
       - OTEL_USE_EXPORTER=jaeger
       - OTEL_EXPORTER_JAEGER_AGENTHOST=${OTEL_EXPORTER_JAEGER_AGENTHOST:-jaeger-all-in-one}
   
+  catalog-api:
+    environment:
+      - OTEL_USE_EXPORTER=jaeger
+      - OTEL_EXPORTER_JAEGER_AGENTHOST=${OTEL_EXPORTER_JAEGER_AGENTHOST:-jaeger-all-in-one}
+  
+  ordering-api:
+    environment:
+      - OTEL_USE_EXPORTER=jaeger
+      - OTEL_EXPORTER_JAEGER_AGENTHOST=${OTEL_EXPORTER_JAEGER_AGENTHOST:-jaeger-all-in-one}
+  
+  payment-api:
+    environment:
+      - OTEL_USE_EXPORTER=jaeger
+      - OTEL_EXPORTER_JAEGER_AGENTHOST=${OTEL_EXPORTER_JAEGER_AGENTHOST:-jaeger-all-in-one}    
+  
   webmvc:
     environment:
       - OTEL_USE_EXPORTER=jaeger
       - OTEL_EXPORTER_JAEGER_AGENTHOST=${OTEL_EXPORTER_JAEGER_AGENTHOST:-jaeger-all-in-one}
+  
+  webspa:
+    environment:
+      - OTEL_USE_EXPORTER=jaeger
+      - OTEL_EXPORTER_JAEGER_AGENTHOST=${OTEL_EXPORTER_JAEGER_AGENTHOST:-jaeger-all-in-one}

src/docker-compose.opentelemetry.otlp.yml

@@ -20,6 +20,12 @@ services:
       - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:-http://otel-collector:4317}
       - OTEL_EXPORTER_OTLP_HEADERS=${OTEL_EXPORTER_OTLP_HEADERS}
   
+  catalog-api:
+    environment:
+      - OTEL_USE_EXPORTER=otlp
+      - OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT:-http://otel-collector:4317}
+      - OTEL_EXPORTER_OTLP_HEADERS=${OTEL_EXPORTER_OTLP_HEADERS}
+
   webmvc:
     environment:
       - OTEL_USE_EXPORTER=otlp

src/docker-compose.opentelemetry.zipkin.yml

@@ -11,12 +11,37 @@ services:
     ports:
       - "9411:9411"
 
+  identity-api:
+    environment:
+      - OTEL_USE_EXPORTER=zipkin
+      - OTEL_EXPORTER_ZIPKIN_ENDPOINT=${OTEL_EXPORTER_ZIPKIN_ENDPOINT:-http://zipkin:9411/api/v2/spans}
+          
   basket-api:
     environment:
       - OTEL_USE_EXPORTER=zipkin
       - OTEL_EXPORTER_ZIPKIN_ENDPOINT=${OTEL_EXPORTER_ZIPKIN_ENDPOINT:-http://zipkin:9411/api/v2/spans}
   
+  catalog-api:
+    environment:
+      - OTEL_USE_EXPORTER=zipkin
+      - OTEL_EXPORTER_ZIPKIN_ENDPOINT=${OTEL_EXPORTER_ZIPKIN_ENDPOINT:-http://zipkin:9411/api/v2/spans}
+  
+  ordering-api:
+    environment:
+      - OTEL_USE_EXPORTER=zipkin
+      - OTEL_EXPORTER_ZIPKIN_ENDPOINT=${OTEL_EXPORTER_ZIPKIN_ENDPOINT:-http://zipkin:9411/api/v2/spans}
+  
+  payment-api:
+    environment:
+      - OTEL_USE_EXPORTER=zipkin
+      - OTEL_EXPORTER_ZIPKIN_ENDPOINT=${OTEL_EXPORTER_ZIPKIN_ENDPOINT:-http://zipkin:9411/api/v2/spans}
+
   webmvc:
     environment:
       - OTEL_USE_EXPORTER=zipkin
       - OTEL_EXPORTER_ZIPKIN_ENDPOINT=${OTEL_EXPORTER_ZIPKIN_ENDPOINT:-http://zipkin:9411/api/v2/spans}
+  
+  webspa:
+    environment:
+      - OTEL_USE_EXPORTER=zipkin
+      - OTEL_EXPORTER_ZIPKIN_ENDPOINT=${OTEL_EXPORTER_ZIPKIN_ENDPOINT:-http://zipkin:9411/api/v2/spans}