From db79dba2a395914b23c4e2254c99669211ce3598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Tue, 2 Aug 2022 06:53:41 +0200 Subject: [PATCH 1/3] [Instrumentation.Http] Change Activity Source Name for HttpWebRequests from OpenTelemetry.HttpWebRequest to OpenTelemetry.Instrumentation.HttpWebRequest --- src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md | 3 +++ .../Implementation/HttpWebRequestActivitySource.netfx.cs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md index 1a5041471bc..9be702add54 100644 --- a/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md @@ -84,6 +84,9 @@ Released 2021-Apr-23 * Update `AddHttpClientInstrumentation` extension method for .NET Framework to use only use `HttpWebRequestInstrumentationOptions` ([#1982](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1982)) +* Changed activity source name from `OpenTelemetry.HttpWebRequest` + to `OpenTelemetry.Instrumentation.HttpWebRequest` for `HttpWebRequest`s. + ([#3515](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3515)) ## 1.0.0-rc3 diff --git a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs index f9c9e303b59..19108c23048 100644 --- a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs +++ b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs @@ -36,7 +36,7 @@ namespace OpenTelemetry.Instrumentation.Http.Implementation /// internal static class HttpWebRequestActivitySource { - public const string ActivitySourceName = "OpenTelemetry.HttpWebRequest"; + public const string ActivitySourceName = "OpenTelemetry.Instrumentation.HttpWebRequest"; public const string ActivityName = ActivitySourceName + ".HttpRequestOut"; internal static readonly Func> HttpWebRequestHeaderValuesGetter = (request, name) => request.Headers.GetValues(name); From b4d308b33a38c8394a662c11635f66dddc2760ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Thu, 4 Aug 2022 07:14:45 +0200 Subject: [PATCH 2/3] code review feedback --- src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md | 9 ++++++--- .../Implementation/HttpHandlerDiagnosticListener.cs | 2 +- .../Implementation/HttpWebRequestActivitySource.netfx.cs | 7 ++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.Http/CHANGELOG.md index 945781c7085..51919bb3e00 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 @@ -88,9 +94,6 @@ Released 2021-Apr-23 * Update `AddHttpClientInstrumentation` extension method for .NET Framework to use only use `HttpWebRequestInstrumentationOptions` ([#1982](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1982)) -* Changed activity source name from `OpenTelemetry.HttpWebRequest` - to `OpenTelemetry.Instrumentation.HttpWebRequest` for `HttpWebRequest`s. - ([#3515](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3515)) ## 1.0.0-rc3 diff --git a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs index 549537080f9..55048d5d980 100644 --- a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs +++ b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs @@ -28,7 +28,7 @@ namespace OpenTelemetry.Instrumentation.Http.Implementation internal sealed class HttpHandlerDiagnosticListener : ListenerHandler { internal static readonly AssemblyName AssemblyName = typeof(HttpHandlerDiagnosticListener).Assembly.GetName(); - 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 19108c23048..a429ac5540c 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.Instrumentation.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 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 From daba9ab71870c1f5879399d1d7df6e1162fcde9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Thu, 4 Aug 2022 07:35:50 +0200 Subject: [PATCH 3/3] fix build issue --- .../Implementation/HttpWebRequestActivitySource.netfx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs index a429ac5540c..48a2b584c04 100644 --- a/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs +++ b/src/OpenTelemetry.Instrumentation.Http/Implementation/HttpWebRequestActivitySource.netfx.cs @@ -38,7 +38,7 @@ internal static class HttpWebRequestActivitySource { internal static readonly AssemblyName AssemblyName = typeof(HttpWebRequestActivitySource).Assembly.GetName(); internal static readonly string ActivitySourceName = AssemblyName.Name + ".HttpWebRequest"; - internal static string ActivityName = ActivitySourceName + ".HttpRequestOut"; + 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);