feat(lib): update open telemetry to latest RC version (#238)

* update open telemetry to latest RC version

* fix functional test error

How I can forget including appsettings.json file in functional test and
it was working till now!

Author: ratanparai

src/Libraries/OpenTelemetry/Extensions.cs

@@ -1,9 +1,11 @@
 using System;
+using System.Collections.Generic;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using OpenTelemetry;
 using OpenTelemetry.Context.Propagation;
+using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
-using OpenTelemetry.Trace.Samplers;
 
 namespace OpenCodeFoundation.OpenTelemetry
 {
@@ -46,10 +48,10 @@ public static T GetOptions<T>(
 
         private static void ConfigureOpenTelemetry(IServiceCollection services, OpenTelemetryOptions openTelemetryOptions)
         {
-            services.AddOpenTelemetry(configure =>
+            services.AddOpenTelemetryTracing(configure =>
             {
                 ConfigureSampler(openTelemetryOptions, configure);
-                ConfigureInstrumentations(openTelemetryOptions, configure);
+                ConfigureInstrumentation(openTelemetryOptions, configure);
                 ConfigureExporters(openTelemetryOptions, configure);
             });
         }
@@ -66,34 +68,42 @@ private static void ConfigureExporters(OpenTelemetryOptions openTelemetryOptions
         {
             if (openTelemetryOptions.Jaeger.Enabled)
             {
-                configure.UseJaegerExporter(config =>
-                {
-                    config.ServiceName = openTelemetryOptions.Jaeger.ServiceName;
+                configure.SetResourceBuilder(ResourceBuilder.CreateDefault()
+                    .AddService(openTelemetryOptions.Jaeger.ServiceName));
 
+                configure.AddJaegerExporter(config =>
+                {
                     config.AgentHost = openTelemetryOptions.Jaeger.Host;
                     config.AgentPort = openTelemetryOptions.Jaeger.Port;
                 });
             }
         }
 
-        private static void ConfigureInstrumentations(OpenTelemetryOptions openTelemetryOptions, TracerProviderBuilder configure)
+        private static void ConfigureInstrumentation(OpenTelemetryOptions openTelemetryOptions, TracerProviderBuilder configure)
+        {
+            Sdk.SetDefaultTextMapPropagator(GetPropagator(openTelemetryOptions));
+
+            configure.AddAspNetCoreInstrumentation();
+
+            configure.AddHttpClientInstrumentation();
+
+            configure.AddSqlClientInstrumentation();
+        }
+
+        private static TextMapPropagator GetPropagator(OpenTelemetryOptions openTelemetryOptions)
         {
-            configure.AddAspNetCoreInstrumentation(config =>
+            var propagators = new List<TextMapPropagator>()
             {
-                config.TextFormat = GetTextFormat(openTelemetryOptions);
-            });
+                new TraceContextPropagator(),
+                new BaggagePropagator(),
+            };
 
-            configure.AddHttpClientInstrumentation(config =>
+            if (openTelemetryOptions.Istio)
             {
-                config.TextFormat = GetTextFormat(openTelemetryOptions);
-            });
+                propagators.Add(new B3Propagator());
+            }
 
-            configure.AddSqlClientDependencyInstrumentation();
+            return new CompositeTextMapPropagator(propagators);
         }
-
-        private static ITextFormat GetTextFormat(OpenTelemetryOptions openTelemetryOptions)
-            => openTelemetryOptions.Istio
-                ? new B3Format()
-                : (ITextFormat)new TraceContextFormat();
     }
 }

src/Libraries/OpenTelemetry/OpenTelemetry.csproj

@@ -15,11 +15,11 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
 
     <!-- OpenTelemetry -->
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="0.4.0-beta.2" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="0.4.0-beta.2" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="0.4.0-beta.2" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="0.4.0-beta.2" />
-    <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="0.4.0-beta.2" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc1.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.0.0-rc1.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc1.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" Version="1.0.0-rc1.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.Jaeger" Version="1.0.0-rc1.1" />
 
     <!-- Analyzers -->
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />

src/Services/Enrolling/Enrolling.FunctionalTests/Enrolling.FunctionalTests.csproj

@@ -23,4 +23,10 @@
     <ProjectReference Include="..\Enrolling.Infrastructure\Enrolling.Infrastructure.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="appsettings.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>