change attributes

alexander-alderman-webb · alexander-alderman-webb · commit 42e65e7d9dd6 · 2026-05-05T17:54:58.000+02:00
diff --git a/sentry_sdk/integrations/grpc/aio/client.py b/sentry_sdk/integrations/grpc/aio/client.py
@@ -1,7 +1,7 @@
 from typing import Callable, Union, AsyncIterable, Any
 
 import sentry_sdk
-from sentry_sdk.consts import OP
+from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable
 from sentry_sdk.integrations.grpc.consts import SPAN_ORIGIN
 from sentry_sdk.tracing_utils import has_span_streaming_enabled
@@ -61,7 +61,6 @@ async def intercept_unary_unary(
                     "sentry.origin": SPAN_ORIGIN,
                 },
             ) as span:
-                span.set_attribute("type", "unary unary")
                 span.set_attribute("rpc.method", method.decode())
 
                 client_call_details = (
@@ -72,7 +71,7 @@ async def intercept_unary_unary(
 
                 response = await continuation(client_call_details, request)
                 status_code = await response.code()
-                span.set_attribute("code", status_code.name)
+                span.set_attribute(SPANDATA.RPC_RESPONSE_STATUS_CODE, status_code.name)
 
                 return response
         else:
@@ -120,8 +119,7 @@ async def intercept_unary_stream(
                     "sentry.origin": SPAN_ORIGIN,
                 },
             ) as span:
-                span.set_attribute("type", "unary stream")
-                span.set_attribute("rpc.method", method.decode())
+                span.set_attribute(SPANDATA.RPC_METHOD, method.decode())
 
                 client_call_details = (
                     self._update_client_call_details_metadata_from_scope(
@@ -130,8 +128,6 @@ async def intercept_unary_stream(
                 )
 
                 response = await continuation(client_call_details, request)
-                # status_code = await response.code()
-                # span.set_data("code", status_code)
 
                 return response
         else:
diff --git a/sentry_sdk/integrations/grpc/client.py b/sentry_sdk/integrations/grpc/client.py
@@ -1,5 +1,5 @@
 import sentry_sdk
-from sentry_sdk.consts import OP
+from sentry_sdk.consts import OP, SPANDATA
 from sentry_sdk.integrations import DidNotEnable
 from sentry_sdk.integrations.grpc.consts import SPAN_ORIGIN
 from sentry_sdk.tracing_utils import has_span_streaming_enabled
@@ -41,8 +41,7 @@ def intercept_unary_unary(
                     "sentry.origin": SPAN_ORIGIN,
                 },
             ) as span:
-                span.set_attribute("type", "unary unary")
-                span.set_attribute("method", method)
+                span.set_attribute(SPANDATA.RPC_METHOD, method)
 
                 client_call_details = (
                     self._update_client_call_details_metadata_from_scope(
@@ -51,7 +50,9 @@ def intercept_unary_unary(
                 )
 
                 response = continuation(client_call_details, request)
-                span.set_attribute("code", response.code().name)
+                span.set_attribute(
+                    SPANDATA.RPC_RESPONSE_STATUS_CODE, response.code().name
+                )
 
                 return response
         else:
@@ -93,8 +94,7 @@ def intercept_unary_stream(
                     "sentry.origin": SPAN_ORIGIN,
                 },
             ) as span:
-                span.set_attribute("type", "unary stream")
-                span.set_attribute("method", method)
+                span.set_attribute(SPANDATA.RPC_METHOD, method)
 
                 client_call_details = (
                     self._update_client_call_details_metadata_from_scope(
diff --git a/tests/integrations/grpc/test_grpc.py b/tests/integrations/grpc/test_grpc.py
@@ -308,8 +308,7 @@ def test_grpc_client_starts_span(
         )
         assert span["attributes"] == ApproxDict(
             {
-                "type": "unary unary",
-                "method": "/grpc_test_server.gRPCTestService/TestServe",
+                "rpc.method": "/grpc_test_server.gRPCTestService/TestServe",
                 "sentry.environment": mock.ANY,
                 "sentry.op": "grpc.client",
                 "sentry.origin": "auto.grpc.grpc",
@@ -321,7 +320,7 @@ def test_grpc_client_starts_span(
                 "server.address": mock.ANY,
                 "thread.id": mock.ANY,
                 "thread.name": mock.ANY,
-                "code": "OK",
+                "rpc.response.status_code": "OK",
             }
         )
     else:
@@ -393,8 +392,7 @@ def test_grpc_client_unary_stream_starts_span(
         )
         assert span["attributes"] == ApproxDict(
             {
-                "type": "unary stream",
-                "method": "/grpc_test_server.gRPCTestService/TestUnaryStream",
+                "rpc.method": "/grpc_test_server.gRPCTestService/TestUnaryStream",
                 "sentry.environment": mock.ANY,
                 "sentry.op": "grpc.client",
                 "sentry.origin": "auto.grpc.grpc",
@@ -488,8 +486,7 @@ def test_grpc_client_other_interceptor(
         )
         assert span["attributes"] == ApproxDict(
             {
-                "type": "unary unary",
-                "method": "/grpc_test_server.gRPCTestService/TestServe",
+                "rpc.method": "/grpc_test_server.gRPCTestService/TestServe",
                 "sentry.environment": mock.ANY,
                 "sentry.op": "grpc.client",
                 "sentry.origin": "auto.grpc.grpc",
@@ -501,7 +498,7 @@ def test_grpc_client_other_interceptor(
                 "server.address": mock.ANY,
                 "thread.id": mock.ANY,
                 "thread.name": mock.ANY,
-                "code": "OK",
+                "rpc.response.status_code": "OK",
             }
         )
     else:
@@ -576,9 +573,8 @@ def test_prevent_dual_client_interceptor(
         )
         assert span["attributes"] == ApproxDict(
             {
-                "type": "unary unary",
-                "method": "/grpc_test_server.gRPCTestService/TestServe",
-                "code": "OK",
+                "rpc.method": "/grpc_test_server.gRPCTestService/TestServe",
+                "rpc.response.status_code": "OK",
             }
         )
     else:
diff --git a/tests/integrations/grpc/test_grpc_aio.py b/tests/integrations/grpc/test_grpc_aio.py
@@ -333,7 +333,6 @@ async def test_grpc_client_starts_span(
         )
         assert span["attributes"] == ApproxDict(
             {
-                "type": "unary unary",
                 "rpc.method": "/grpc_test_server.gRPCTestService/TestServe",
                 "sentry.environment": mock.ANY,
                 "sentry.op": "grpc.client",
@@ -346,7 +345,7 @@ async def test_grpc_client_starts_span(
                 "server.address": mock.ANY,
                 "thread.id": mock.ANY,
                 "thread.name": mock.ANY,
-                "code": "OK",
+                "rpc.response.status_code": "OK",
             }
         )
     else:
@@ -409,7 +408,6 @@ async def test_grpc_client_unary_stream_starts_span(
         )
         assert span["attributes"] == ApproxDict(
             {
-                "type": "unary stream",
                 "rpc.method": "/grpc_test_server.gRPCTestService/TestUnaryStream",
                 "sentry.environment": mock.ANY,
                 "sentry.op": "grpc.client",

Original file line number	Diff line number	Diff line change
`@@ -308,8 +308,7 @@ def test_grpc_client_starts_span(`
`308`	`308`	`)`
`309`	`309`	`assert span["attributes"] == ApproxDict(`
`310`	`310`	`{`
`311`		`- "type": "unary unary",`
`312`		`- "method": "/grpc_test_server.gRPCTestService/TestServe",`
	`311`	`+ "rpc.method": "/grpc_test_server.gRPCTestService/TestServe",`
`313`	`312`	`"sentry.environment": mock.ANY,`
`314`	`313`	`"sentry.op": "grpc.client",`
`315`	`314`	`"sentry.origin": "auto.grpc.grpc",`
`@@ -321,7 +320,7 @@ def test_grpc_client_starts_span(`
`321`	`320`	`"server.address": mock.ANY,`
`322`	`321`	`"thread.id": mock.ANY,`
`323`	`322`	`"thread.name": mock.ANY,`
`324`		`- "code": "OK",`
	`323`	`+ "rpc.response.status_code": "OK",`
`325`	`324`	`}`
`326`	`325`	`)`
`327`	`326`	`else:`
`@@ -393,8 +392,7 @@ def test_grpc_client_unary_stream_starts_span(`
`393`	`392`	`)`
`394`	`393`	`assert span["attributes"] == ApproxDict(`
`395`	`394`	`{`
`396`		`- "type": "unary stream",`
`397`		`- "method": "/grpc_test_server.gRPCTestService/TestUnaryStream",`
	`395`	`+ "rpc.method": "/grpc_test_server.gRPCTestService/TestUnaryStream",`
`398`	`396`	`"sentry.environment": mock.ANY,`
`399`	`397`	`"sentry.op": "grpc.client",`
`400`	`398`	`"sentry.origin": "auto.grpc.grpc",`
`@@ -488,8 +486,7 @@ def test_grpc_client_other_interceptor(`
`488`	`486`	`)`
`489`	`487`	`assert span["attributes"] == ApproxDict(`
`490`	`488`	`{`
`491`		`- "type": "unary unary",`
`492`		`- "method": "/grpc_test_server.gRPCTestService/TestServe",`
	`489`	`+ "rpc.method": "/grpc_test_server.gRPCTestService/TestServe",`
`493`	`490`	`"sentry.environment": mock.ANY,`
`494`	`491`	`"sentry.op": "grpc.client",`
`495`	`492`	`"sentry.origin": "auto.grpc.grpc",`
`@@ -501,7 +498,7 @@ def test_grpc_client_other_interceptor(`
`501`	`498`	`"server.address": mock.ANY,`
`502`	`499`	`"thread.id": mock.ANY,`
`503`	`500`	`"thread.name": mock.ANY,`
`504`		`- "code": "OK",`
	`501`	`+ "rpc.response.status_code": "OK",`
`505`	`502`	`}`
`506`	`503`	`)`
`507`	`504`	`else:`
`@@ -576,9 +573,8 @@ def test_prevent_dual_client_interceptor(`
`576`	`573`	`)`
`577`	`574`	`assert span["attributes"] == ApproxDict(`
`578`	`575`	`{`
`579`		`- "type": "unary unary",`
`580`		`- "method": "/grpc_test_server.gRPCTestService/TestServe",`
`581`		`- "code": "OK",`
	`576`	`+ "rpc.method": "/grpc_test_server.gRPCTestService/TestServe",`
	`577`	`+ "rpc.response.status_code": "OK",`
`582`	`578`	`}`
`583`	`579`	`)`
`584`	`580`	`else:`
Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,6 @@ async def test_grpc_client_starts_span(`
`333`	`333`	`)`
`334`	`334`	`assert span["attributes"] == ApproxDict(`
`335`	`335`	`{`
`336`		`- "type": "unary unary",`
`337`	`336`	`"rpc.method": "/grpc_test_server.gRPCTestService/TestServe",`
`338`	`337`	`"sentry.environment": mock.ANY,`
`339`	`338`	`"sentry.op": "grpc.client",`
`@@ -346,7 +345,7 @@ async def test_grpc_client_starts_span(`
`346`	`345`	`"server.address": mock.ANY,`
`347`	`346`	`"thread.id": mock.ANY,`
`348`	`347`	`"thread.name": mock.ANY,`
`349`		`- "code": "OK",`
	`348`	`+ "rpc.response.status_code": "OK",`
`350`	`349`	`}`
`351`	`350`	`)`
`352`	`351`	`else:`
`@@ -409,7 +408,6 @@ async def test_grpc_client_unary_stream_starts_span(`
`409`	`408`	`)`
`410`	`409`	`assert span["attributes"] == ApproxDict(`
`411`	`410`	`{`
`412`		`- "type": "unary stream",`
`413`	`411`	`"rpc.method": "/grpc_test_server.gRPCTestService/TestUnaryStream",`
`414`	`412`	`"sentry.environment": mock.ANY,`
`415`	`413`	`"sentry.op": "grpc.client",`