Add starfish v1 attributes to span data/breadcrumbs (#1581)

getsentry · Aug 10, 2023 · 95d3d3a · 95d3d3a
1 parent 51fb4c7
commit 95d3d3a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/src/Tracing/GuzzleTracingMiddleware.php b/src/Tracing/GuzzleTracingMiddleware.php
@@ -50,6 +50,7 @@ public static function trace(?HubInterface $hub = null): Closure
                 $spanContext->setOp('http.client');
                 $spanContext->setDescription($request->getMethod() . ' ' . (string) $partialUri);
                 $spanContext->setData([
+                    'http.request.method' => $request->getMethod(),
                     'http.query' => $request->getUri()->getQuery(),
                     'http.fragment' => $request->getUri()->getFragment(),
                 ]);
@@ -78,8 +79,8 @@ public static function trace(?HubInterface $hub = null): Closure
 
                     $breadcrumbData = [
                         'url' => (string) $partialUri,
-                        'method' => $request->getMethod(),
-                        'request_body_size' => $request->getBody()->getSize(),
+                        'http.request.method' => $request->getMethod(),
+                        'http.request.body.size' => $request->getBody()->getSize(),
                     ];
                     if ('' !== $request->getUri()->getQuery()) {
                         $breadcrumbData['http.query'] = $request->getUri()->getQuery();
@@ -91,8 +92,8 @@ public static function trace(?HubInterface $hub = null): Closure
                     if (null !== $response) {
                         $childSpan->setStatus(SpanStatus::createFromHttpStatusCode($response->getStatusCode()));
 
-                        $breadcrumbData['status_code'] = $response->getStatusCode();
-                        $breadcrumbData['response_body_size'] = $response->getBody()->getSize();
+                        $breadcrumbData['http.response.status_code'] = $response->getStatusCode();
+                        $breadcrumbData['http.response.body.size'] = $response->getBody()->getSize();
                     } else {
                         $childSpan->setStatus(SpanStatus::internalError());
                     }

diff --git a/tests/Tracing/GuzzleTracingMiddlewareTest.php b/tests/Tracing/GuzzleTracingMiddlewareTest.php
@@ -270,10 +270,10 @@ public static function traceDataProvider(): iterable
             new Response(),
             [
                 'url' => 'https://www.example.com',
-                'method' => 'GET',
-                'request_body_size' => 0,
-                'status_code' => 200,
-                'response_body_size' => 0,
+                'http.request.method' => 'GET',
+                'http.request.body.size' => 0,
+                'http.response.status_code' => 200,
+                'http.response.body.size' => 0,
             ],
         ];
 
@@ -282,12 +282,12 @@ public static function traceDataProvider(): iterable
             new Response(),
             [
                 'url' => 'https://www.example.com',
-                'method' => 'GET',
-                'request_body_size' => 0,
+                'http.request.method' => 'GET',
+                'http.request.body.size' => 0,
                 'http.query' => 'query=string',
                 'http.fragment' => 'fragment=1',
-                'status_code' => 200,
-                'response_body_size' => 0,
+                'http.response.status_code' => 200,
+                'http.response.body.size' => 0,
             ],
         ];
 
@@ -296,10 +296,10 @@ public static function traceDataProvider(): iterable
             new Response(403, [], 'sentry'),
             [
                 'url' => 'https://www.example.com',
-                'method' => 'POST',
-                'request_body_size' => 10,
-                'status_code' => 403,
-                'response_body_size' => 6,
+                'http.request.method' => 'POST',
+                'http.request.body.size' => 10,
+                'http.response.status_code' => 403,
+                'http.response.body.size' => 6,
             ],
         ];
 
@@ -308,8 +308,8 @@ public static function traceDataProvider(): iterable
             new \Exception(),
             [
                 'url' => 'https://www.example.com',
-                'method' => 'GET',
-                'request_body_size' => 0,
+                'http.request.method' => 'GET',
+                'http.request.body.size' => 0,
             ],
         ];
     }