[Instrumentation.Http] fall back in case of NET9. update unit tests

.github/workflows/ci.yml

@@ -324,6 +324,7 @@ jobs:
     with:
       project-name: Component[OpenTelemetry.Instrumentation.Http]
       code-cov-name: Instrumentation.Http
+      tfm-list: '[ "net462", "net8.0", "net9.0" ]'
 
   build-test-instrumentation-owin:
     needs: detect-changes

src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerDiagnosticListener.cs

@@ -35,6 +35,8 @@ internal sealed class HttpHandlerDiagnosticListener : ListenerHandler
     private static readonly PropertyFetcher<HttpResponseMessage> StopResponseFetcher = new("Response");
     private static readonly PropertyFetcher<Exception> StopExceptionFetcher = new("Exception");
     private static readonly PropertyFetcher<TaskStatus> StopRequestStatusFetcher = new("RequestTaskStatus");
+    private static readonly bool Net9orGreater = Environment.Version.Major >= 9;
+
     private readonly HttpClientTraceInstrumentationOptions options;
 
     public HttpHandlerDiagnosticListener(HttpClientTraceInstrumentationOptions options)
@@ -135,10 +137,13 @@ public void OnStartActivity(Activity activity, object? payload)
                 ActivityInstrumentationHelper.SetKindProperty(activity, ActivityKind.Client);
             }
 
-            // see the spec https://github.com/open-telemetry/semantic-conventions/blob/v1.23.0/docs/http/http-spans.md
-            HttpTagHelper.RequestDataHelper.SetHttpMethodTag(activity, request.Method.Method);
+            if (!Net9orGreater)
+            {
+                // see the spec https://github.com/open-telemetry/semantic-conventions/blob/v1.23.0/docs/http/http-spans.md
+                HttpTagHelper.RequestDataHelper.SetHttpMethodTag(activity, request.Method.Method);
+            }
 
-            if (request.RequestUri != null)
+            if (!Net9orGreater && request.RequestUri != null)
             {
                 activity.SetTag(SemanticConventions.AttributeServerAddress, request.RequestUri.Host);
                 activity.SetTag(SemanticConventions.AttributeServerPort, request.RequestUri.Port);
@@ -199,16 +204,19 @@ public void OnStopActivity(Activity activity, object? payload)
 
             if (TryFetchResponse(payload, out var response))
             {
-                if (currentStatusCode == ActivityStatusCode.Unset)
+                if (!Net9orGreater)
                 {
-                    activity.SetStatus(SpanHelper.ResolveActivityStatusForHttpStatusCode(activity.Kind, (int)response.StatusCode));
-                }
+                    if (currentStatusCode == ActivityStatusCode.Unset)
+                    {
+                        activity.SetStatus(SpanHelper.ResolveActivityStatusForHttpStatusCode(activity.Kind, (int)response.StatusCode));
+                    }
 
-                activity.SetTag(SemanticConventions.AttributeNetworkProtocolVersion, RequestDataHelper.GetHttpProtocolVersion(response.Version));
-                activity.SetTag(SemanticConventions.AttributeHttpResponseStatusCode, TelemetryHelper.GetBoxedStatusCode(response.StatusCode));
-                if (activity.Status == ActivityStatusCode.Error)
-                {
-                    activity.SetTag(SemanticConventions.AttributeErrorType, TelemetryHelper.GetStatusCodeString(response.StatusCode));
+                    activity.SetTag(SemanticConventions.AttributeNetworkProtocolVersion, RequestDataHelper.GetHttpProtocolVersion(response.Version));
+                    activity.SetTag(SemanticConventions.AttributeHttpResponseStatusCode, TelemetryHelper.GetBoxedStatusCode(response.StatusCode));
+                    if (activity.Status == ActivityStatusCode.Error)
+                    {
+                        activity.SetTag(SemanticConventions.AttributeErrorType, TelemetryHelper.GetStatusCodeString(response.StatusCode));
+                    }
                 }
 
                 try
@@ -317,6 +325,7 @@ static bool TryFetchException(object? payload, [NotNullWhen(true)] out Exception
                 HttpRequestError.ConfigurationLimitExceeded => "configuration_limit_exceeded",
 
                 // Fall back to the exception type name in case of HttpRequestError.Unknown
+                HttpRequestError.Unknown => exc.GetType().FullName,
                 _ => exc.GetType().FullName,
             };
         }

src/OpenTelemetry.Instrumentation.Http/Implementation/HttpHandlerMetricsDiagnosticListener.cs

@@ -28,6 +28,7 @@ internal sealed class HttpHandlerMetricsDiagnosticListener : ListenerHandler
     private static readonly PropertyFetcher<HttpResponseMessage> StopResponseFetcher = new("Response");
     private static readonly PropertyFetcher<Exception> StopExceptionFetcher = new("Exception");
     private static readonly PropertyFetcher<HttpRequestMessage> RequestFetcher = new("Request");
+    private static readonly bool Net9orGreater = Environment.Version.Major >= 9;
 #if NET
     private static readonly HttpRequestOptionsKey<string?> HttpRequestOptionsErrorKey = new(SemanticConventions.AttributeErrorType);
 #endif
@@ -39,7 +40,7 @@ public HttpHandlerMetricsDiagnosticListener(string name)
 
     public static void OnStopEventWritten(Activity activity, object? payload)
     {
-        if (TryFetchRequest(payload, out var request))
+        if (!Net9orGreater && TryFetchRequest(payload, out var request))
         {
             // see the spec https://github.com/open-telemetry/semantic-conventions/blob/v1.23.0/docs/http/http-metrics.md
             TagList tags = default;

test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.Basic.cs

@@ -425,6 +425,18 @@ public async Task HttpRequestMethodIsSetOnActivityAsPerSpec(string originalMetho
         }
 
         Assert.Equal(expectedMethod, activity.GetTagValue(SemanticConventions.AttributeHttpRequestMethod));
+
+#if NET9_0_OR_GREATER
+        if (expectedOriginalMethod is not null and not "CUSTOM")
+        {
+            // TODO: NEED TO REVIEW THE SPEC.
+            // "http.request.method_original" is only set when the HTTP Method is not a standard HTTP method.
+
+            // Our implementation expects HTTP Methods to be in uppercase. "GET" is known but "Get" is unknown.
+            // In contrast, NET9 is case-insensitive. "GET" and "Get" are both known.
+            expectedOriginalMethod = null;
+        }
+#endif
         Assert.Equal(expectedOriginalMethod, activity.GetTagValue(SemanticConventions.AttributeHttpRequestMethodOriginal));
     }
 
@@ -727,7 +739,16 @@ public async Task ValidateUrlQueryRedaction(string urlQuery, string expectedUrlQ
         var activity = exportedItems[0];
 
         var expectedUrl = $"{this.url}path{expectedUrlQuery}";
+
+#if NET9_0_OR_GREATER
+        // TODO: NEED TO UPDATE THIS TEST TO USE .NET'S SETTING TO DISABLE REDACTION.
+        // CURRENTLY THIS DOESN'T WORK WITH OUR TESTS WHICH RUN IN PARALLEL.
+        // https://github.com/dotnet/docs/issues/42792
+        expectedUrl = $"{this.url}path?*";
+        Assert.Equal(expectedUrl, activity.GetTagValue(SemanticConventions.AttributeUrlFull));
+#else
         Assert.Equal(expectedUrl, activity.GetTagValue(SemanticConventions.AttributeUrlFull));
+#endif
     }
 
     [Theory]

test/OpenTelemetry.Instrumentation.Http.Tests/HttpClientTests.cs

@@ -340,7 +340,22 @@ private static async Task HttpOutCallsAreCollectedSuccessfullyBodyAsync(
             Assert.Contains(normalizedAttributes, kvp => kvp.Key == SemanticConventions.AttributeHttpRequestMethod && kvp.Value?.ToString() == normalizedAttributesTestCase[SemanticConventions.AttributeHttpRequestMethod]);
             Assert.Contains(normalizedAttributes, kvp => kvp.Key == SemanticConventions.AttributeServerAddress && kvp.Value?.ToString() == normalizedAttributesTestCase[SemanticConventions.AttributeServerAddress]);
             Assert.Contains(normalizedAttributes, kvp => kvp.Key == SemanticConventions.AttributeServerPort && kvp.Value?.ToString() == normalizedAttributesTestCase[SemanticConventions.AttributeServerPort]);
+
+#if NET9_0_OR_GREATER
+            // TODO: NEED TO REVIEW THE SPEC
+            // NET9 does not record the URL Fragment Identifier.
+            var expected = normalizedAttributesTestCase[SemanticConventions.AttributeUrlFull];
+            if (expected.EndsWith("#fragment", StringComparison.Ordinal))
+            {
+                // remove fragment from expected value
+                expected = expected.Substring(0, expected.Length - "#fragment".Length);
+            }
+
+            Assert.Contains(normalizedAttributes, kvp => kvp.Key == SemanticConventions.AttributeUrlFull && kvp.Value?.ToString() == expected);
+#else
             Assert.Contains(normalizedAttributes, kvp => kvp.Key == SemanticConventions.AttributeUrlFull && kvp.Value?.ToString() == normalizedAttributesTestCase[SemanticConventions.AttributeUrlFull]);
+#endif
+
             if (tc.ResponseExpected)
             {
                 Assert.Contains(normalizedAttributes, kvp => kvp.Key == SemanticConventions.AttributeNetworkProtocolVersion && kvp.Value?.ToString() == normalizedAttributesTestCase[SemanticConventions.AttributeNetworkProtocolVersion]);

test/OpenTelemetry.Instrumentation.Http.Tests/HttpWebRequestTests.cs

@@ -122,6 +122,16 @@ public void HttpOutCallsAreCollectedSuccessfully(HttpOutTestCase tc)
                 Assert.Fail($"Tag {tag.Key} was not found in test data.");
             }
 
+#if NET9_0_OR_GREATER
+            // TODO: NEED TO REVIEW THE SPEC
+            // NET9 does not record the URL Fragment Identifier.
+            if (value.EndsWith("#fragment", StringComparison.Ordinal))
+            {
+                // remove fragment from expected value
+                value = value.Substring(0, value.Length - "#fragment".Length);
+            }
+#endif
+
             Assert.Equal(value, tagValue);
         }
 

test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>$(SupportedNetTargets)</TargetFrameworks>
+    <TargetFrameworks>net9.0;$(SupportedNetTargets)</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion)</TargetFrameworks>
     <Description>Unit test project for OpenTelemetry HTTP instrumentations.</Description>
   </PropertyGroup>