Enabled zipkin configuration

deploy/k8s/helm/basket-api/templates/configmap.yaml

@@ -1,4 +1,5 @@
 {{- $name := include "basket-api.fullname" . -}}
+{{- $zipkin := include "url-of" (list .Values.app.ingress.entries.zipkin .) -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -15,3 +16,4 @@ data:
   all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
   all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
   all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
+  urls__Otel__ExporterEndpoint: http://{{ .Values.app.svc.zipkin }}:9411/api/v2/spans

deploy/k8s/helm/basket-api/values.yaml

@@ -36,6 +36,8 @@ env:
       key: all__UseAzureServiceBus
     - name: IdentityUrl
       key: urls__IdentityUrl
+    - name: OTEL_EXPORTER_TOOL_ENDPOINT
+      key: urls__Otel__ExporterEndpoint
   # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
   values:
     - name: OrchestratorType
@@ -44,6 +46,8 @@ env:
       value: "80"
     - name: GRPC_PORT
       value: "81"
+    - name: OTEL_USE_EXPORTER
+      value: 'zipkin' 
 probes:
   liveness:
     path: /liveness

deploy/k8s/helm/catalog-api/templates/configmap.yaml

@@ -2,6 +2,7 @@
 {{- $sqlsrv := include "sql-name" . -}}
 {{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
 {{- $protocol := include "protocol" . -}}
+{{- $zipkin := include "url-of" (list .Values.app.ingress.entries.zipkin .) -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -19,3 +20,4 @@ data:
   all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
   all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
   all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
+  urls__Otel__ExporterEndpoint: http://{{ .Values.app.svc.zipkin }}:9411/api/v2/spans

deploy/k8s/helm/catalog-api/values.yaml

@@ -38,6 +38,8 @@ env:
       key: all__EventBusConnection
     - name: AzureServiceBusEnabled
       key: all__UseAzureServiceBus
+    - name: OTEL_EXPORTER_TOOL_ENDPOINT
+      key: urls__Otel__ExporterEndpoint
       # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
   values:
     - name: ASPNETCORE_ENVIRONMENT
@@ -48,6 +50,8 @@ env:
       value: "80"
     - name: GRPC_PORT
       value: "81"
+    - name: OTEL_USE_EXPORTER
+      value: 'zipkin'
 probes:
   liveness:
     path: /liveness

deploy/k8s/helm/identity-api/templates/configmap.yaml

@@ -9,6 +9,7 @@
 {{- $xamarincallback := include "url-of" (list "xamarincallback" .) -}}
 {{- $webhooks_url := include "url-of" (list .Values.app.ingress.entries.webhooks .) -}}
 {{- $webhooksweb_url := include "url-of" (list .Values.app.ingress.entries.webhooksweb .) -}}
+{{- $zipkin := include "url-of" (list .Values.app.ingress.entries.zipkin .) -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -33,3 +34,4 @@ data:
   webhooksapi_e:  http://{{ $webhooks_url }}
   webhooksweb_e: http://{{ $webhooksweb_url }}
   enableDevspaces: "{{ .Values.enableDevspaces }}"
+  urls__Otel__ExporterEndpoint: http://{{ .Values.app.svc.zipkin }}:9411/api/v2/spans

deploy/k8s/helm/identity-api/values.yaml

@@ -56,6 +56,8 @@ env:
       key: webhooksweb_e
     - name: EnableDevspaces
       key: enableDevspaces
+    - name: OTEL_EXPORTER_TOOL_ENDPOINT
+      key: urls__Otel__ExporterEndpoint
   values:
     - name: ASPNETCORE_ENVIRONMENT
       value: Development
@@ -63,7 +65,8 @@ env:
       value: 'K8S'
     - name: IsClusterEnv
       value: 'True'
-
+    - name: OTEL_USE_EXPORTER
+      value: 'zipkin'
 probes:
   liveness:
     path: /liveness

deploy/k8s/helm/mobileshoppingagg/templates/configmap.yaml

@@ -1,6 +1,7 @@
 {{- $name := include "mobileshoppingagg.fullname" . -}}
 {{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
 {{- $protocol := include "protocol" . -}}
+{{- $zipkin := include "url-of" (list .Values.app.ingress.entries.zipkin .) -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -27,3 +28,4 @@ data:
   internalurls__grpcCatalog: "http://{{ .Values.app.svc.catalog }}:{{ .Values.service.grpcPort }}"
   internalurls__grpcOrdering: "http://{{ .Values.app.svc.ordering }}:{{ .Values.service.grpcPort }}"
   urls__IdentityUrlExternal: {{ $protocol }}://{{ $identity }}
+  urls__Otel__ExporterEndpoint: http://{{ .Values.app.svc.zipkin }}:9411/api/v2/spans

deploy/k8s/helm/mobileshoppingagg/values.yaml

@@ -59,6 +59,8 @@ env:
       key: internalurls__grpcOrdering      
     - name: IdentityUrlExternal
       key: urls__IdentityUrlExternal
+    - name: OTEL_EXPORTER_TOOL_ENDPOINT
+      key: urls__Otel__ExporterEndpoint
       # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
   values:
     - name: ASPNETCORE_ENVIRONMENT
@@ -69,6 +71,8 @@ env:
       value: 'K8S'
     - name: IsClusterEnv
       value: 'True'
+    - name: OTEL_USE_EXPORTER
+      value: 'zipkin'
 probes:
   liveness:
     path: /liveness

deploy/k8s/helm/ordering-api/templates/configmap.yaml

@@ -1,5 +1,6 @@
 {{- $name := include "ordering-api.fullname" . -}}
 {{- $sqlsrv := include "sql-name" . -}}
+{{- $zipkin := include "url-of" (list .Values.app.ingress.entries.zipkin .) -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -16,3 +17,4 @@ data:
   all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
   all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
   all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
+  urls__Otel__ExporterEndpoint: http://{{ .Values.app.svc.zipkin }}:9411/api/v2/spans

deploy/k8s/helm/ordering-api/values.yaml

@@ -43,6 +43,8 @@ env:
       key: all__UseAzureServiceBus
     - name: IdentityUrl
       key: urls__IdentityUrl
+    - name: OTEL_EXPORTER_TOOL_ENDPOINT
+      key: urls__Otel__ExporterEndpoint
       # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
   values:
     - name: ASPNETCORE_ENVIRONMENT
@@ -53,6 +55,8 @@ env:
       value: "80"
     - name: GRPC_PORT
       value: "81"
+    - name: OTEL_USE_EXPORTER
+      value: 'zipkin'   
 probes:
   liveness:
     path: /liveness

deploy/k8s/helm/ordering-backgroundtasks/templates/configmap.yaml

@@ -1,6 +1,7 @@
 {{- $name := include "ordering-backgroundtasks.fullname" . -}}
 {{- $sqlsrv := include "sql-name" . -}}
 {{- $cfgname :=  printf "cfg-%s" $name | trunc 63  }}
+{{- $zipkin := include "url-of" (list .Values.app.ingress.entries.zipkin .) -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -19,3 +20,4 @@ data:
   all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
   graceperiodmanager__CheckUpdateTime: "{{ .Values.cfg.checkUpdateTime }}"
   graceperiodmanager__GracePeriodTime: "{{ .Values.cfg.gracePeriodTime }}"
+  urls__Otel__ExporterEndpoint: http://{{ .Values.app.svc.zipkin }}:9411/api/v2/spans

deploy/k8s/helm/ordering-backgroundtasks/values.yaml

@@ -48,12 +48,16 @@ env:
       key: graceperiodmanager__CheckUpdateTime
     - name: GracePeriodTime
       key: graceperiodmanager__GracePeriodTime
+    - name: OTEL_EXPORTER_TOOL_ENDPOINT
+      key: urls__Otel__ExporterEndpoint
       # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
   values:
     - name: ASPNETCORE_ENVIRONMENT
       value: Development
     - name: OrchestratorType
       value: 'K8S'
+    - name: OTEL_USE_EXPORTER
+      value: 'zipkin'
 probes:
   liveness:
     path: /liveness

deploy/k8s/helm/ordering-signalrhub/templates/configmap.yaml

@@ -1,5 +1,6 @@
 {{- $name := include "ordering-signalrhub.fullname" . -}}
 {{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
+{{- $zipkin := include "url-of" (list .Values.app.ingress.entries.zipkin .) -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -16,3 +17,4 @@ data:
   all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
   signalr__StoreConnectionString: {{ .Values.inf.redis.keystore.constr }}
   urls__IdentityUrl: http://identity-api
+  urls__Otel__ExporterEndpoint: http://{{ .Values.app.svc.zipkin }}:9411/api/v2/spans

deploy/k8s/helm/ordering-signalrhub/values.yaml

@@ -46,6 +46,8 @@ env:
       key: urls__IdentityUrl
     - name: SignalrStoreConnectionString
       key: signalr__StoreConnectionString
+    - name: OTEL_EXPORTER_TOOL_ENDPOINT
+      key: urls__Otel__ExporterEndpoint
       # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
   values:
     - name: ASPNETCORE_ENVIRONMENT
@@ -54,4 +56,6 @@ env:
       value: 'K8S'
     - name: IsClusterEnv
       values: 'True'
+    - name: OTEL_USE_EXPORTER
+      value: 'zipkin'
 

deploy/k8s/helm/payment-api/templates/configmap.yaml

@@ -1,4 +1,5 @@
 {{- $name := include "payment-api.fullname" . -}}
+{{- $zipkin := include "url-of" (list .Values.app.ingress.entries.zipkin .) -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -13,3 +14,4 @@ data:
   all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
   all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
   all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
+  urls__Otel__ExporterEndpoint: http://{{ .Values.app.svc.zipkin }}:9411/api/v2/spans

deploy/k8s/helm/payment-api/values.yaml

@@ -36,12 +36,16 @@ env:
       key: all__EventBusConnection
     - name: AzureServiceBusEnabled
       key: all__UseAzureServiceBus
+    - name: OTEL_EXPORTER_TOOL_ENDPOINT
+      key: urls__Otel__ExporterEndpoint
       # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
   values:
     - name: ASPNETCORE_ENVIRONMENT
       value: Development
     - name: OrchestratorType
       value: 'K8S'
+    - name: OTEL_USE_EXPORTER
+      value: 'zipkin'
 probes:
   liveness:
     path: /liveness

deploy/k8s/helm/webhooks-api/templates/configmap.yaml

@@ -2,6 +2,7 @@
 {{- $sqlsrv := include "sql-name" . -}}
 {{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
 {{- $protocol := include "protocol" . -}}
+{{- $zipkin := include "url-of" (list .Values.app.ingress.entries.zipkin .) -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -19,3 +20,4 @@ data:
   all__EventBusConnection: {{ .Values.inf.eventbus.constr }}
   all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}"
   all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}"
+  urls__Otel__ExporterEndpoint: http://{{ .Values.app.svc.zipkin }}:9411/api/v2/spans

deploy/k8s/helm/webhooks-api/values.yaml

@@ -44,10 +44,14 @@ env:
       key: urls__IdentityUrl
     - name: IdentityUrlExternal
       key: urls__IdentityUrlExternal
+    - name: OTEL_EXPORTER_TOOL_ENDPOINT
+      key: urls__Otel__ExporterEndpoint
       # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
   values:
     - name: ASPNETCORE_ENVIRONMENT
       value: Development
     - name: OrchestratorType
       value: 'K8S'
+    - name: OTEL_USE_EXPORTER
+      value: 'zipkin'
 

deploy/k8s/helm/webhooks-web/templates/configmap.yaml

@@ -3,6 +3,7 @@
 {{- $webhooksweb := include "url-of" (list .Values.app.ingress.entries.webhooksweb .) -}}
 {{- $webhooks := include "url-of" (list .Values.app.ingress.entries.webhooks .) -}}
 {{- $protocol := include "protocol" . -}}
+{{- $zipkin := include "url-of" (list .Values.app.ingress.entries.zipkin .) -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -18,3 +19,4 @@ data:
   identity_e: {{ $protocol }}://{{ $identity }}
   webhooksweb_e: {{ $protocol }}://{{ $webhooksweb }}
   urls_webhooksweb: http://{{ .Values.app.svc.webhooksweb }}
+  urls__Otel__ExporterEndpoint: http://{{ .Values.app.svc.zipkin }}:9411/api/v2/spans

deploy/k8s/helm/webhooks-web/values.yaml

@@ -40,6 +40,8 @@ env:
       key: webhooksweb_e
     - name: SelfUrl
       key: webhooksweb_e
+    - name: OTEL_EXPORTER_TOOL_ENDPOINT
+      key: urls__Otel__ExporterEndpoint
       # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
   values:
     - name: ASPNETCORE_ENVIRONMENT
@@ -48,5 +50,7 @@ env:
       value: 'K8S'
     - name: Token
       value: "WebHooks-Demo-Web"       # Can use whatever you want
+    - name: OTEL_USE_EXPORTER
+      value: 'zipkin'
 
 

deploy/k8s/helm/webshoppingagg/templates/configmap.yaml

@@ -1,6 +1,7 @@
 {{- $name := include "webshoppingagg.fullname" . -}}
 {{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
 {{- $protocol := include "protocol" . -}}
+{{- $zipkin := include "url-of" (list .Values.app.ingress.entries.zipkin .) -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -27,3 +28,4 @@ data:
   internalurls__grpcCatalog: "http://{{ .Values.app.svc.catalog }}:{{ .Values.service.grpcPort }}"
   internalurls__grpcOrdering: "http://{{ .Values.app.svc.ordering }}:{{ .Values.service.grpcPort }}"
   urls__IdentityUrlExternal: {{ $protocol }}://{{ $identity }}
+  urls__Otel__ExporterEndpoint: http://{{ .Values.app.svc.zipkin }}:9411/api/v2/spans

deploy/k8s/helm/webshoppingagg/values.yaml

@@ -59,7 +59,8 @@ env:
       key: internalurls__grpcOrdering
     - name: IdentityUrlExternal
       key: urls__IdentityUrlExternal
-
+    - name: OTEL_EXPORTER_TOOL_ENDPOINT
+      key: urls__Otel__ExporterEndpoint
       # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
   values:
     - name: ASPNETCORE_ENVIRONMENT
@@ -70,6 +71,8 @@ env:
       value: 'K8S'
     - name: IsClusterEnv
       value: 'True'
+    - name: OTEL_USE_EXPORTER
+      value: 'zipkin'
 probes:
   liveness:
     path: /liveness

deploy/k8s/helm/webspa/templates/configmap.yaml

@@ -4,6 +4,7 @@
 {{- $spa := include "url-of" (list .Values.app.ingress.entries.spa .) -}}
 {{- $mongo := include "mongo-name" . -}}
 {{- $protocol := include "protocol" . -}}
+{{- $zipkin := include "url-of" (list .Values.app.ingress.entries.zipkin .) -}}
 
 apiVersion: v1
 kind: ConfigMap
@@ -22,3 +23,4 @@ data:
   urls__apigwws: {{ $protocol }}://{{ $webshoppingapigw }}
   urls__spa: {{ $protocol }}://{{ $spa }}
   urls__IdentityUrl: {{ $protocol }}://{{ $identity }}
+  urls__Otel__ExporterEndpoint: http://{{ .Values.app.svc.zipkin }}:9411/api/v2/spans

deploy/k8s/helm/webspa/values.yaml

@@ -44,6 +44,8 @@ env:
       key: internalurls__identity__hc      
     - name: SignalrHubUrl
       key: urls__apigwws
+    - name: OTEL_EXPORTER_TOOL_ENDPOINT
+      key: urls__Otel__ExporterEndpoint
       # values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
   values:
     - name: ASPNETCORE_ENVIRONMENT
@@ -54,4 +56,6 @@ env:
       value: 'K8S'
     - name: IsClusterEnv
       value: 'True'
+    - name: OTEL_USE_EXPORTER
+      value: 'zipkin'
 

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Mobile.Shopping.HttpAggregator.csproj

@@ -33,6 +33,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\BuildingBlocks\Devspaces.Support\Devspaces.Support.csproj" />
+    <ProjectReference Include="..\..\..\OpenTelemetry\OpenTelemetry.Customization.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/ApiGateways/Mobile.Bff.Shopping/aggregator/Startup.cs

@@ -22,6 +22,8 @@ using Microsoft.OpenApi.Models;
 using System;
 using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
+using OpenTelemetry.Customization.Extensions;
+using OpenTelemetry.Customization;
 
 namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
 {
@@ -50,6 +52,14 @@ namespace Microsoft.eShopOnContainers.Mobile.Shopping.HttpAggregator
                  .AddDevspaces()
                  .AddHttpServices()
                  .AddGrpcServices();
+
+            // Add Telemetry
+            services.AddOpenTelemetry(new OpenTelemetryConfig()
+            {
+                ServiceName = "mobileshoppingagg",
+                ExportType = Configuration.GetValue<string>("OTEL_USE_EXPORTER"),
+                ExportToolEndpoint = Configuration.GetValue<string>("OTEL_EXPORTER_TOOL_ENDPOINT")
+            });
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs

@@ -19,9 +19,11 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
+using OpenTelemetry.Customization;
 using System;
 using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
+using OpenTelemetry.Customization.Extensions;
 
 namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
 {
@@ -50,6 +52,14 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
                 .AddDevspaces()
                 .AddApplicationServices()
                 .AddGrpcServices();
+
+            // Add Telemetry
+            services.AddOpenTelemetry(new OpenTelemetryConfig()
+            {
+                ServiceName = "webshoppingagg",
+                ExportType = Configuration.GetValue<string>("OTEL_USE_EXPORTER"),
+                ExportToolEndpoint = Configuration.GetValue<string>("OTEL_EXPORTER_TOOL_ENDPOINT")
+            });
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

src/ApiGateways/Web.Bff.Shopping/aggregator/Web.Shopping.HttpAggregator.csproj

@@ -35,6 +35,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\BuildingBlocks\Devspaces.Support\Devspaces.Support.csproj" />
+    <ProjectReference Include="..\..\..\OpenTelemetry\OpenTelemetry.Customization.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/Services/Basket/Basket.API/Basket.API.csproj

@@ -49,18 +49,6 @@
     <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.StackExchangeRedis" Version="1.0.0-rc2" />
-  </ItemGroup>
-
   <ItemGroup>
     <Protobuf Include="Proto\basket.proto" GrpcServices="Server" Generator="MSBuild:Compile" />
     <Content Include="@(Protobuf)" />

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

@@ -55,6 +55,14 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
                 options.EnableDetailedErrors = true;
             });
 
+            // Add Telemetry
+            services.AddOpenTelemetry(new OpenTelemetryConfig()
+            {
+                ServiceName = "Basket.API",
+                ExportType = Configuration.GetValue<string>("OTEL_USE_EXPORTER"),
+                ExportToolEndpoint = Configuration.GetValue<string>("OTEL_EXPORTER_TOOL_ENDPOINT")
+            });
+
             RegisterAppInsights(services);
 
             services.AddControllers(options =>
@@ -189,14 +197,6 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerFactory loggerFactory, ConnectionMultiplexer connectionMultiplexer)
         {                                   
-            
-            OpenTelemetryExtensions.AddOpenTelemetry(connectionMultiplexer,new OpenTelemetryConfig()
-            {
-                ServiceName = "Basket.API",
-                ExportType = Configuration.GetValue<string>("OTEL_USE_EXPORTER"),
-                ExportToolEndpoint = Configuration.GetValue<string>("OTEL_EXPORTER_TOOL_ENDPOINT")
-            });
-
             //loggerFactory.AddAzureWebAppDiagnostics();
             //loggerFactory.AddApplicationInsights(app.ApplicationServices, LogLevel.Trace);
 

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

@@ -74,18 +74,6 @@
 		<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/Web/WebMVC/Startup.cs

@@ -44,6 +44,7 @@ namespace Microsoft.eShopOnContainers.WebMVC
                 .AddDevspaces()
                 .AddHttpClientServices(Configuration);
 
+            // Add Telemetry
             services.AddOpenTelemetry(new OpenTelemetryConfig()
             {
                 ServiceName = "WebMVC",

src/Web/WebMVC/WebMVC.csproj

@@ -48,17 +48,6 @@
     <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>
     <None Include="ViewModels\CampaignItem.cs" />
   </ItemGroup>

src/docker-compose.opentelemetry.zipkin.yml

@@ -41,6 +41,16 @@ services:
       - OTEL_USE_EXPORTER=zipkin
       - OTEL_EXPORTER_TOOL_ENDPOINT=${OTEL_EXPORTER_TOOL_ENDPOINT:-http://zipkin:9411/api/v2/spans}
   
+  webshoppingagg:
+    environment:
+      - OTEL_USE_EXPORTER=zipkin
+      - OTEL_EXPORTER_TOOL_ENDPOINT=${OTEL_EXPORTER_TOOL_ENDPOINT:-http://zipkin:9411/api/v2/spans}
+  
+  mobileshoppingagg:
+    environment:
+      - OTEL_USE_EXPORTER=zipkin
+      - OTEL_EXPORTER_TOOL_ENDPOINT=${OTEL_EXPORTER_TOOL_ENDPOINT:-http://zipkin:9411/api/v2/spans}
+
   webmvc:
     environment:
       - OTEL_USE_EXPORTER=zipkin