Asp.Net Core trace instrumentation to populate http schema tag (#3392)

open-telemetry · Jun 20, 2022 · cc5083e · cc5083e
1 parent d74ac9e
commit cc5083e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AspNetCore/CHANGELOG.md
@@ -5,17 +5,17 @@
 * Metrics instrumentation to correctly populate 'http.flavor' tag.
   (1.1 instead of HTTP/1.1 etc.)
   ([3379](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3379))
-
 * Tracing instrumentation to populate 'http.flavor' tag.
   ([3372](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3372))
+* Tracing instrumentation to populate 'http.schema' tag.
+([3392](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3392))
 
 ## 1.0.0-rc9.4
 
 Released 2022-Jun-03
 
 * Added additional metric dimensions.
   ([3247](https://github.com/open-telemetry/opentelemetry-dotnet/pull/3247))
-
 * Removes net5.0 target as .NET 5.0 is going out
   of support. The package keeps netstandard2.1 target, so it
   can still be used with .NET5.0 apps.

diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs b/src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInListener.cs
@@ -153,6 +153,7 @@ public override void OnStartActivity(Activity activity, object payload)
                 }
 
                 activity.SetTag(SemanticConventions.AttributeHttpMethod, request.Method);
+                activity.SetTag(SemanticConventions.AttributeHttpScheme, request.Scheme);
                 activity.SetTag(SemanticConventions.AttributeHttpTarget, path);
                 activity.SetTag(SemanticConventions.AttributeHttpUrl, GetUri(request));
                 activity.SetTag(SemanticConventions.AttributeHttpFlavor, HttpTagHelper.GetFlavorTagValueFromProtocol(request.Protocol));

diff --git a/....Instrumentation.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs b/....Instrumentation.AspNetCore.Tests/IncomingRequestsCollectionsIsAccordingToTheSpecTests.cs
@@ -113,6 +113,7 @@ public async Task SuccessfulTemplateControllerCallGeneratesASpan(
             Assert.Equal("localhost", activity.GetTagValue(SemanticConventions.AttributeHttpHost));
             Assert.Equal("GET", activity.GetTagValue(SemanticConventions.AttributeHttpMethod));
             Assert.Equal("1.1", activity.GetTagValue(SemanticConventions.AttributeHttpFlavor));
+            Assert.Equal("http", activity.GetTagValue(SemanticConventions.AttributeHttpScheme));
             Assert.Equal(urlPath, activity.GetTagValue(SemanticConventions.AttributeHttpTarget));
             Assert.Equal($"http://localhost{urlPath}{query}", activity.GetTagValue(SemanticConventions.AttributeHttpUrl));
             Assert.Equal(statusCode, activity.GetTagValue(SemanticConventions.AttributeHttpStatusCode));

diff --git a/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/InProcessServer.cs b/test/OpenTelemetry.Instrumentation.W3cTraceContext.Tests/InProcessServer.cs
@@ -23,9 +23,6 @@
 #if NETCOREAPP3_1
 using TestApp.AspNetCore._3._1;
 #endif
-#if NET5_0
-using TestApp.AspNetCore._5._0;
-#endif
 #if NET6_0
 using TestApp.AspNetCore._6._0;
 #endif