From df9b56a9a1ec5c2aa5b13559118737c75a6c1777 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 9 Aug 2022 14:03:28 -0700 Subject: [PATCH 1/6] remove netstandard targets from asp.netcore --- .../Implementation/HttpInListener.cs | 27 ++----------------- .../Implementation/HttpInMetricsListener.cs | 15 ----------- ...elemetry.Instrumentation.AspNetCore.csproj | 12 +-------- test/Benchmarks/Benchmarks.csproj | 2 +- .../GrpcTests.client.cs | 2 ++ ...elemetry.Instrumentation.Grpc.Tests.csproj | 5 +++- 6 files changed, 10 insertions(+), 53 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs index 6f848651386..b85a7b993ac 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs @@ -19,15 +19,11 @@ using System.Diagnostics; using System.Linq; using System.Reflection; -#if !NETSTANDARD2_0 using System.Runtime.CompilerServices; -#endif using Microsoft.AspNetCore.Http; using OpenTelemetry.Context.Propagation; -using OpenTelemetry.Internal; -#if !NETSTANDARD2_0 using OpenTelemetry.Instrumentation.GrpcNetClient; -#endif +using OpenTelemetry.Internal; using OpenTelemetry.Trace; namespace OpenTelemetry.Instrumentation.AspNetCore.Implementation @@ -202,7 +198,6 @@ public override void OnStopActivity(Activity activity, object payload) activity.SetTag(SemanticConventions.AttributeHttpStatusCode, response.StatusCode); -#if !NETSTANDARD2_0 if (this.options.EnableGrpcAspNetCoreSupport && TryGetGrpcMethod(activity, out var grpcMethod)) { AddGrpcAttributes(activity, grpcMethod, context); @@ -211,12 +206,6 @@ public override void OnStopActivity(Activity activity, object payload) { activity.SetStatus(SpanHelper.ResolveSpanStatusForHttpStatusCode(activity.Kind, response.StatusCode)); } -#else - if (activity.GetStatus().StatusCode == StatusCode.Unset) - { - activity.SetStatus(SpanHelper.ResolveSpanStatusForHttpStatusCode(activity.Kind, response.StatusCode)); - } -#endif try { @@ -324,7 +313,7 @@ private static string GetUri(HttpRequest request) var queryString = request.QueryString.Value ?? string.Empty; var length = scheme.Length + Uri.SchemeDelimiter.Length + host.Length + pathBase.Length + path.Length + queryString.Length; -#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER + return string.Create(length, (scheme, host, pathBase, path, queryString), (span, parts) => { CopyTo(ref span, parts.scheme); @@ -343,19 +332,8 @@ static void CopyTo(ref Span buffer, ReadOnlySpan text) } } }); -#else - return new System.Text.StringBuilder(length) - .Append(scheme) - .Append(Uri.SchemeDelimiter) - .Append(host) - .Append(pathBase) - .Append(path) - .Append(queryString) - .ToString(); -#endif } -#if !NETSTANDARD2_0 [MethodImpl(MethodImplOptions.AggressiveInlining)] private static bool TryGetGrpcMethod(Activity activity, out string grpcMethod) { @@ -403,6 +381,5 @@ private static void AddGrpcAttributes(Activity activity, string grpcMethod, Http } } } -#endif } } diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInMetricsListener.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInMetricsListener.cs index 6d99477051f..5c5238baa91 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInMetricsListener.cs +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInMetricsListener.cs @@ -17,9 +17,7 @@ using System.Diagnostics; using System.Diagnostics.Metrics; using Microsoft.AspNetCore.Http; -#if NETCOREAPP using Microsoft.AspNetCore.Routing; -#endif using OpenTelemetry.Trace; namespace OpenTelemetry.Instrumentation.AspNetCore.Implementation @@ -67,9 +65,6 @@ public override void OnStopActivity(Activity activity, object payload) TagList tags; - // We need following directive as - // RouteEndpoint is not available in netstandard2.0 and netstandard2.1 -#if NETCOREAPP var target = (context.GetEndpoint() as RouteEndpoint)?.RoutePattern.RawText; // TODO: This is just a minimal set of attributes. See the spec for additional attributes: @@ -97,17 +92,7 @@ public override void OnStopActivity(Activity activity, object payload) { SemanticConventions.AttributeHttpStatusCode, context.Response.StatusCode.ToString() }, }; } -#else - tags = new TagList - { - { SemanticConventions.AttributeHttpFlavor, context.Request.Protocol }, - { SemanticConventions.AttributeHttpScheme, context.Request.Scheme }, - { SemanticConventions.AttributeHttpMethod, context.Request.Method }, - { SemanticConventions.AttributeHttpHost, host }, - { SemanticConventions.AttributeHttpStatusCode, context.Response.StatusCode.ToString() }, - }; -#endif this.httpServerDuration.Record(activity.Duration.TotalMilliseconds, tags); } } diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj index 39a74753890..71361bf191b 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj @@ -1,7 +1,7 @@ - net7.0;net6.0;netstandard2.1;netstandard2.0 + net7.0;net6.0 ASP.NET Core instrumentation for OpenTelemetry .NET $(PackageTags);distributed-tracing;AspNetCore true @@ -18,16 +18,6 @@ - - - - - - - - - - diff --git a/test/Benchmarks/Benchmarks.csproj b/test/Benchmarks/Benchmarks.csproj index 6cb7f6277f2..680cbf31012 100644 --- a/test/Benchmarks/Benchmarks.csproj +++ b/test/Benchmarks/Benchmarks.csproj @@ -19,6 +19,7 @@ + @@ -27,7 +28,6 @@ - diff --git a/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.client.cs b/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.client.cs index 05a071fd23a..5285cb0da43 100644 --- a/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.client.cs +++ b/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.client.cs @@ -23,7 +23,9 @@ using Greet; using Grpc.Core; using Grpc.Net.Client; +#if NET6_0_OR_GREATER using Microsoft.AspNetCore.Http; +#endif using Moq; using OpenTelemetry.Context.Propagation; using OpenTelemetry.Instrumentation.Grpc.Tests.GrpcTestHelpers; diff --git a/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj b/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj index f780997f340..120dfffde86 100644 --- a/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj @@ -30,10 +30,13 @@ + + + + - From 25594cde80257d7953c1f507ffc3370bbdb2010c Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 9 Aug 2022 14:14:54 -0700 Subject: [PATCH 2/6] update changelog --- src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md index 7dd26e20f5d..cc0b2f23751 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +* Removed `netstandard2.0` and `netstandard2.1` targets + ([#3576](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3567)) + ## 1.0.0-rc9.5 Released 2022-Aug-02 From 7f6d265f1bb103f8a5a2fde853cd772b44009c99 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 16 Aug 2022 13:54:49 -0700 Subject: [PATCH 3/6] fix merge issue --- .../Implementation/HttpInListener.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs index 4e7429f84e8..c8096f7cc31 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs @@ -206,7 +206,7 @@ public override void OnStopActivity(Activity activity, object payload) { activity.SetStatus(SpanHelper.ResolveSpanStatusForHttpStatusCode(activity.Kind, response.StatusCode)); } - if (activity.GetStatus().StatusCode == StatusCode.Unset) + if (activity.Status == ActivityStatusCode.Unset) { activity.SetStatus(SpanHelper.ResolveSpanStatusForHttpStatusCode(activity.Kind, response.StatusCode)); } From 23681c9e052e7ae7214c9f79f697fa6a6083c1f5 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 16 Aug 2022 13:56:31 -0700 Subject: [PATCH 4/6] fix merge issue --- .../Implementation/HttpInListener.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs index c8096f7cc31..2addd21c57c 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs @@ -206,10 +206,6 @@ public override void OnStopActivity(Activity activity, object payload) { activity.SetStatus(SpanHelper.ResolveSpanStatusForHttpStatusCode(activity.Kind, response.StatusCode)); } - if (activity.Status == ActivityStatusCode.Unset) - { - activity.SetStatus(SpanHelper.ResolveSpanStatusForHttpStatusCode(activity.Kind, response.StatusCode)); - } try { From 7c0b35dda8490e2c106b722d0aeab346b6c681fc Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 16 Aug 2022 13:57:47 -0700 Subject: [PATCH 5/6] Update test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj Co-authored-by: Alan West <3676547+alanwest@users.noreply.github.com> --- .../OpenTelemetry.Instrumentation.Grpc.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj b/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj index 120dfffde86..a9416a98a69 100644 --- a/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj @@ -30,7 +30,7 @@ - + From c5333bcb0baeeb9b12ba126ceb7248d33c7c1549 Mon Sep 17 00:00:00 2001 From: Vishwesh Bankwar Date: Tue, 16 Aug 2022 14:16:20 -0700 Subject: [PATCH 6/6] update conditional compilation --- .../GrpcTests.client.cs | 2 +- .../GrpcTests.server.cs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.client.cs b/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.client.cs index 5285cb0da43..5e7b244860f 100644 --- a/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.client.cs +++ b/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.client.cs @@ -119,7 +119,7 @@ public void GrpcClientCallsAreCollectedSuccessfully(string baseAddress, bool sho Assert.Equal(0, activity.GetTagValue(SemanticConventions.AttributeRpcGrpcStatusCode)); } -#if !NETFRAMEWORK +#if NET6_0_OR_GREATER [Theory] [InlineData(true)] [InlineData(false)] diff --git a/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.server.cs b/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.server.cs index 701694653ef..91db02187a9 100644 --- a/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.server.cs +++ b/test/OpenTelemetry.Instrumentation.Grpc.Tests/GrpcTests.server.cs @@ -14,7 +14,7 @@ // limitations under the License. // -#if !NETFRAMEWORK +#if NET6_0_OR_GREATER using System; using System.Collections.Generic; using System.Diagnostics; @@ -115,8 +115,6 @@ public void GrpcAspNetCoreInstrumentationAddsCorrectAttributes(bool? enableGrpcA #if NET6_0_OR_GREATER [Theory(Skip = "Skipping for .NET 6 and higher due to bug #3023")] -#else - [Theory] #endif [InlineData(null)] [InlineData(true)]