Merge 4e7e0c3 into a1f394c

getsentry · Apr 4, 2024 · d00b75d · d00b75d
2 parents a1f394c + 4e7e0c3
commit d00b75d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- Add description to OkHttp spans ([#3320](https://github.com/getsentry/sentry-java/pull/3320))
 - Add support for Spring Rest Client ([#3199](https://github.com/getsentry/sentry-java/pull/3199))
 
 ## 7.6.0

diff --git a/sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpEvent.kt b/sentry-okhttp/src/main/java/io/sentry/okhttp/SentryOkHttpEvent.kt
@@ -113,7 +113,7 @@ internal class SentryOkHttpEvent(private val hub: IHub, private val request: Req
     fun startSpan(event: String) {
         // Find the parent of the span being created. E.g. secureConnect is child of connect
         val parentSpan = findParentSpan(event)
-        val span = parentSpan?.startChild("http.client.$event") ?: return
+        val span = parentSpan?.startChild("http.client.$event", "http.client.$event") ?: return
         if (event == RESPONSE_BODY_EVENT) {
             // We save this event is reading the response body, so that it will not be auto-finished
             isReadingResponseBody.set(true)

diff --git a/sentry-okhttp/src/test/java/io/sentry/okhttp/SentryOkHttpEventListenerTest.kt b/sentry-okhttp/src/test/java/io/sentry/okhttp/SentryOkHttpEventListenerTest.kt
@@ -168,28 +168,35 @@ class SentryOkHttpEventListenerTest {
                 }
                 1 -> {
                     assertEquals("http.client.proxy_select", span.operation)
+                    assertEquals("http.client.proxy_select", span.description)
                     assertNotNull(span.data["proxies"])
                 }
                 2 -> {
                     assertEquals("http.client.dns", span.operation)
+                    assertEquals("http.client.dns", span.description)
                     assertNotNull(span.data["domain_name"])
                     assertNotNull(span.data["dns_addresses"])
                 }
                 3 -> {
                     assertEquals("http.client.connect", span.operation)
+                    assertEquals("http.client.connect", span.description)
                 }
                 4 -> {
                     assertEquals("http.client.connection", span.operation)
+                    assertEquals("http.client.connection", span.description)
                 }
                 5 -> {
                     assertEquals("http.client.request_headers", span.operation)
+                    assertEquals("http.client.request_headers", span.description)
                 }
                 6 -> {
                     assertEquals("http.client.response_headers", span.operation)
+                    assertEquals("http.client.response_headers", span.description)
                     assertEquals(201, span.data[SpanDataConvention.HTTP_STATUS_CODE_KEY])
                 }
                 7 -> {
                     assertEquals("http.client.response_body", span.operation)
+                    assertEquals("http.client.response_body", span.description)
                 }
             }
         }

diff --git a/sentry-okhttp/src/test/java/io/sentry/okhttp/SentryOkHttpEventTest.kt b/sentry-okhttp/src/test/java/io/sentry/okhttp/SentryOkHttpEventTest.kt
@@ -158,6 +158,7 @@ class SentryOkHttpEventTest {
         assertNotNull(span)
         assertTrue(spans.containsKey("span"))
         assertEquals("http.client.span", span.operation)
+        assertEquals("http.client.span", span.description)
         assertFalse(span.isFinished)
     }
 
@@ -196,6 +197,7 @@ class SentryOkHttpEventTest {
         sut.finishSpan("span") {
             if (called == 0) {
                 assertEquals("http.client.span", it.operation)
+                assertEquals("http.client.span", it.description)
             } else {
                 assertEquals(sut.callRootSpan, it)
             }