[Instrumentation.Owin] fix incorrect url.query attribute (#2732)

Author: Galad

src/OpenTelemetry.Instrumentation.Owin/CHANGELOG.md

@@ -5,6 +5,9 @@
 * Updated OpenTelemetry core component version(s) to `1.12.0`.
   ([#2725](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2725))
 
+* Fixed `url.query` value that was incorrectly always set to `Microsoft.Owin.ReadableStringCollection`.
+  ([#2732](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/2732))
+
 ## 1.11.0-beta.1
 
 Released 2025-Mar-05

src/OpenTelemetry.Instrumentation.Owin/Implementation/DiagnosticsMiddleware.cs

@@ -94,13 +94,17 @@ private static void BeginRequest(IOwinContext owinContext)
 
             if (activity.IsAllDataRequested)
             {
+                var queryString = OwinInstrumentationActivitySource.Options.DisableUrlQueryRedaction
+                    ? request.QueryString.Value
+                    : RedactionHelper.GetRedactedQueryString(request.QueryString.Value);
+
                 RequestDataHelper.SetHttpMethodTag(activity, request.Method);
                 activity.SetTag(SemanticConventions.AttributeServerAddress, request.Uri.Host);
                 activity.SetTag(SemanticConventions.AttributeServerPort, request.Uri.Port);
                 activity.SetTag(SemanticConventions.AttributeNetworkProtocolVersion, request.Protocol);
 
                 activity.SetTag(SemanticConventions.AttributeUrlPath, request.Uri.AbsolutePath);
-                activity.SetTag(SemanticConventions.AttributeUrlQuery, request.Query);
+                activity.SetTag(SemanticConventions.AttributeUrlQuery, queryString);
                 activity.SetTag(SemanticConventions.AttributeUrlScheme, owinContext.Request.Scheme);
 
                 if (request.Headers.TryGetValue("User-Agent", out var userAgent) && userAgent.Length > 0)

test/OpenTelemetry.Instrumentation.Owin.Tests/DiagnosticsMiddlewareTests.cs

@@ -345,7 +345,8 @@ Owin has finished to inspect the activity status. */
             Assert.Equal(requestUri.Host, activity.TagObjects.FirstOrDefault(t => t.Key == SemanticConventions.AttributeServerAddress).Value);
             Assert.Equal(requestUri.Port, activity.TagObjects.FirstOrDefault(t => t.Key == SemanticConventions.AttributeServerPort).Value);
             Assert.Equal("GET", activity.TagObjects.FirstOrDefault(t => t.Key == SemanticConventions.AttributeHttpRequestMethod).Value);
-            Assert.Equal(requestUri.AbsolutePath, activity.TagObjects.FirstOrDefault(t => t.Key == SemanticConventions.AttributeUrlPath).Value);
+            Assert.Equal(expectedRequestUri.AbsolutePath, activity.TagObjects.FirstOrDefault(t => t.Key == SemanticConventions.AttributeUrlPath).Value);
+            Assert.Equal(expectedRequestUri.Query.TrimStart('?'), activity.TagObjects.FirstOrDefault(t => t.Key == SemanticConventions.AttributeUrlQuery).Value);
         }
         finally
         {