Set server.address for HttpRequest spans

getsentry · May 9, 2024 · 043cb5f · 043cb5f
1 parent f8e84bb
commit 043cb5f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/src/Sentry/SentryGraphQLHttpMessageHandler.cs b/src/Sentry/SentryGraphQLHttpMessageHandler.cs
@@ -55,6 +55,10 @@ internal SentryGraphQLHttpMessageHandler(IHub? hub, SentryOptions? options,
             $"{method} {url}" // e.g. "GET https://example.com"
         );
         span?.SetExtra(OtelSemanticConventions.AttributeHttpRequestMethod, method);
+        if (!string.IsNullOrWhiteSpace(request.RequestUri?.Host))
+        {
+            span?.SetExtra(OtelSemanticConventions.AttributeServerAddress, request.RequestUri!.Host);
+        }
         return span;
     }
 

diff --git a/src/Sentry/SentryHttpMessageHandler.cs b/src/Sentry/SentryHttpMessageHandler.cs
@@ -68,6 +68,10 @@ internal SentryHttpMessageHandler(IHub? hub, SentryOptions? options, HttpMessage
             $"{method} {url}" // e.g. "GET https://example.com"
             );
         span?.SetExtra(OtelSemanticConventions.AttributeHttpRequestMethod, method);
+        if (!string.IsNullOrWhiteSpace(request.RequestUri?.Host))
+        {
+            span?.SetExtra(OtelSemanticConventions.AttributeServerAddress, request.RequestUri!.Host);
+        }
         return span;
     }
 

diff --git a/test/Sentry.Tests/SentryGraphQlHttpMessageHandlerTests.cs b/test/Sentry.Tests/SentryGraphQlHttpMessageHandlerTests.cs
@@ -57,9 +57,10 @@ public void ProcessRequest_SetsSpanData()
         var sut = new SentryGraphQLHttpMessageHandler(hub, null);
 
         var method = "POST";
-        var url = "http://example.com/graphql";
+        var host = "example.com";
+        var url = $"https://{host}/graphql";
         var query = ValidQuery;
-        var request = SentryGraphQlTestHelpers.GetRequestQuery(query);
+        var request = SentryGraphQlTestHelpers.GetRequestQuery(query, url);
 
         // Act
         var returnedSpan = sut.ProcessRequest(request, method, url);
@@ -69,6 +70,7 @@ public void ProcessRequest_SetsSpanData()
         returnedSpan!.Operation.Should().Be("http.client");
         returnedSpan.Description.Should().Be($"{method} {url}");
         returnedSpan.Received(1).SetExtra(OtelSemanticConventions.AttributeHttpRequestMethod, method);
+        returnedSpan.Received(1).SetExtra(OtelSemanticConventions.AttributeServerAddress, host);
     }
 
     // [Theory]

diff --git a/test/Sentry.Tests/SentryGraphQlTestHelpers.cs b/test/Sentry.Tests/SentryGraphQlTestHelpers.cs
@@ -22,7 +22,7 @@ public static HttpRequestMessage GetRequestQuery(string query, string url = "htt
         return GetRequest(content, url);
     }
 
-    public static HttpRequestMessage GetRequest(HttpContent content, string url = "http://foo") => new(HttpMethod.Post, url)
+    public static HttpRequestMessage GetRequest(HttpContent content, string url = "http://foo") => new(HttpMethod.Post, new Uri(url))
     {
         Content = content
     };

diff --git a/test/Sentry.Tests/SentryHttpMessageHandlerTests.cs b/test/Sentry.Tests/SentryHttpMessageHandlerTests.cs
@@ -253,8 +253,10 @@ public void ProcessRequest_SetsSpanData()
         var sut = new SentryHttpMessageHandler(hub, null);
 
         var method = "GET";
-        var url = "http://example.com/graphql";
-        var request = new HttpRequestMessage(HttpMethod.Get, url);
+        var host = "example.com";
+        var url = $"https://{host}/graphql";
+        var uri = new Uri(url);
+        var request = new HttpRequestMessage(HttpMethod.Get, uri);
 
         // Act
         var returnedSpan = sut.ProcessRequest(request, method, url);
@@ -264,6 +266,7 @@ public void ProcessRequest_SetsSpanData()
         returnedSpan!.Operation.Should().Be("http.client");
         returnedSpan.Description.Should().Be($"{method} {url}");
         returnedSpan.Received(1).SetExtra(OtelSemanticConventions.AttributeHttpRequestMethod, method);
+        returnedSpan.Received(1).SetExtra(OtelSemanticConventions.AttributeServerAddress, host);
     }
 
     [Fact]