From 0e486a5929752b3cda263c3f4661dfbffbb97172 Mon Sep 17 00:00:00 2001 From: Ratan Sunder Parai Date: Fri, 20 Nov 2020 00:18:55 +0600 Subject: [PATCH 1/2] update open telemetry to latest rc version --- src/Libraries/OpenTelemetry/Extensions.cs | 48 +++++++++++-------- .../OpenTelemetry/OpenTelemetry.csproj | 10 ++-- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/src/Libraries/OpenTelemetry/Extensions.cs b/src/Libraries/OpenTelemetry/Extensions.cs index 9df3910c..74707ec9 100644 --- a/src/Libraries/OpenTelemetry/Extensions.cs +++ b/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( 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() { - 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(); } } diff --git a/src/Libraries/OpenTelemetry/OpenTelemetry.csproj b/src/Libraries/OpenTelemetry/OpenTelemetry.csproj index 06448586..60abc322 100644 --- a/src/Libraries/OpenTelemetry/OpenTelemetry.csproj +++ b/src/Libraries/OpenTelemetry/OpenTelemetry.csproj @@ -15,11 +15,11 @@ - - - - - + + + + + From de639ee9208fbfaab0035ea88111f90ca4a1d182 Mon Sep 17 00:00:00 2001 From: Ratan Sunder Parai Date: Fri, 20 Nov 2020 00:57:48 +0600 Subject: [PATCH 2/2] fix functional test error How I can forget including appsettings.json file in functional test and it was working till now! --- .../Enrolling.FunctionalTests.csproj | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Services/Enrolling/Enrolling.FunctionalTests/Enrolling.FunctionalTests.csproj b/src/Services/Enrolling/Enrolling.FunctionalTests/Enrolling.FunctionalTests.csproj index 8eb662d9..37707415 100644 --- a/src/Services/Enrolling/Enrolling.FunctionalTests/Enrolling.FunctionalTests.csproj +++ b/src/Services/Enrolling/Enrolling.FunctionalTests/Enrolling.FunctionalTests.csproj @@ -23,4 +23,10 @@ + + + Always + + +