From 69d11bbfb2ef281affeda7e096a3198c9d03564c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Fri, 5 Aug 2022 19:31:31 +0200 Subject: [PATCH] =?UTF-8?q?[Instrumentation.Http]=20Change=20Activity=20So?= =?UTF-8?q?urce=20Name=20for=20HttpWebRequest=E2=80=A6=20(#3515)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md | 6 ++++++ .../Implementation/HttpHandlerDiagnosticListener.cs | 2 +- .../Implementation/HttpWebRequestActivitySource.netfx.cs | 7 ++++--- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md index 20fb945c2..51919bb3e 100644 --- a/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md @@ -2,6 +2,12 @@ ## Unreleased +* Changed activity source name from `OpenTelemetry.HttpWebRequest` + to `OpenTelemetry.Instrumentation.Http.HttpWebRequest` for `HttpWebRequest`s + and from `OpenTelemetry.Instrumentation.Http` + to `OpenTelemetry.Instrumentation.Http.HttpClient` for `HttpClient`. + ([#3515](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3515)) + ## 1.0.0-rc9.5 Released 2022-Aug-02 diff --git a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs index 9f42f7a54..3ba894e0f 100644 --- a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs +++ b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs @@ -32,7 +32,7 @@ namespace OpenTelemetry.Instrumentation.Http.Implementation // https://github.com/dotnet/runtime/blob/7d034ddbbbe1f2f40c264b323b3ed3d6b3d45e9a/src/libraries/System.Net.Http/src/System/Net/Http/DiagnosticsHandler.cs#L19 internal static readonly string HttpClientActivitySourceName = "System.Net.Http"; - internal static readonly string ActivitySourceName = AssemblyName.Name; + internal static readonly string ActivitySourceName = AssemblyName.Name + ".HttpClient"; internal static readonly Version Version = AssemblyName.Version; internal static readonly ActivitySource ActivitySource = new(ActivitySourceName, Version.ToString()); diff --git a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs index f9c9e303b..48a2b584c 100644 --- a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs +++ b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs @@ -36,15 +36,16 @@ namespace OpenTelemetry.Instrumentation.Http.Implementation /// internal static class HttpWebRequestActivitySource { - public const string ActivitySourceName = "OpenTelemetry.HttpWebRequest"; - public const string ActivityName = ActivitySourceName + ".HttpRequestOut"; + internal static readonly AssemblyName AssemblyName = typeof(HttpWebRequestActivitySource).Assembly.GetName(); + internal static readonly string ActivitySourceName = AssemblyName.Name + ".HttpWebRequest"; + internal static readonly string ActivityName = ActivitySourceName + ".HttpRequestOut"; internal static readonly Func> HttpWebRequestHeaderValuesGetter = (request, name) => request.Headers.GetValues(name); internal static readonly Action HttpWebRequestHeaderValuesSetter = (request, name, value) => request.Headers.Add(name, value); internal static HttpWebRequestInstrumentationOptions Options = new HttpWebRequestInstrumentationOptions(); - private static readonly Version Version = typeof(HttpWebRequestActivitySource).Assembly.GetName().Version; + private static readonly Version Version = AssemblyName.Version; private static readonly ActivitySource WebRequestActivitySource = new ActivitySource(ActivitySourceName, Version.ToString()); // Fields for reflection