expose get_attribute

Author: sentrivana

sentry_sdk/integrations/clickhouse_driver.py

@@ -118,7 +118,7 @@ def _inner_end(*args: P.args, **kwargs: P.kwargs) -> T:
                 span.set_data("db.result", res)
 
             with capture_internal_exceptions():
-                query = span._get_attribute("db.query.text")
+                query = span.get_attribute("db.query.text")
                 data = {}
                 for attr in (
                     "db.query_id",
@@ -129,8 +129,8 @@ def _inner_end(*args: P.args, **kwargs: P.kwargs) -> T:
                     "server.address",
                     "server.port",
                 ):
-                    if span._get_attribute(attr):
-                        data[attr] = span._get_attribute(attr)
+                    if span.get_attribute(attr):
+                        data[attr] = span.get_attribute(attr)
 
                 if query:
                     sentry_sdk.add_breadcrumb(
@@ -154,7 +154,7 @@ def _inner_send_data(*args: P.args, **kwargs: P.kwargs) -> T:
             _set_db_data(span, instance.connection)
 
             if should_send_default_pii():
-                db_params = span._get_attribute("db.params") or []
+                db_params = span.get_attribute("db.params") or []
                 db_params.extend(data)
                 span.set_data("db.params", db_params)
 

sentry_sdk/tracing.py

@@ -1277,18 +1277,12 @@ def __exit__(self, ty, value, tb):
         # XXX set status to error if unset and an exception occurred?
         context.detach(self._ctx_token)
 
-    def _get_attribute(self, name):
-        # type: (str) -> Optional[Any]
-        if not isinstance(self._otel_span, ReadableSpan):
-            return None
-        return self._otel_span.attributes.get(name)
-
     @property
     def description(self):
         # type: () -> Optional[str]
         from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
 
-        return self._get_attribute(SentrySpanAttribute.DESCRIPTION)
+        return self.get_attribute(SentrySpanAttribute.DESCRIPTION)
 
     @description.setter
     def description(self, value):
@@ -1303,7 +1297,7 @@ def origin(self):
         # type: () -> Optional[str]
         from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
 
-        return self._get_attribute(SentrySpanAttribute.ORIGIN)
+        return self.get_attribute(SentrySpanAttribute.ORIGIN)
 
     @origin.setter
     def origin(self, value):
@@ -1376,7 +1370,7 @@ def op(self):
         # type: () -> Optional[str]
         from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
 
-        return self._get_attribute(SentrySpanAttribute.OP)
+        return self.get_attribute(SentrySpanAttribute.OP)
 
     @op.setter
     def op(self, value):
@@ -1391,7 +1385,7 @@ def name(self):
         # type: () -> Optional[str]
         from sentry_sdk.integrations.opentelemetry.consts import SentrySpanAttribute
 
-        return self._get_attribute(SentrySpanAttribute.NAME)
+        return self.get_attribute(SentrySpanAttribute.NAME)
 
     @name.setter
     def name(self, value):
@@ -1507,6 +1501,12 @@ def set_data(self, key, value):
         # TODO-neel-potel we cannot add dicts here
         self.set_attribute(key, value)
 
+    def get_attribute(self, name):
+        # type: (str) -> Optional[Any]
+        if not isinstance(self._otel_span, ReadableSpan):
+            return None
+        return self._otel_span.attributes.get(name)
+
     def set_attribute(self, key, value):
         # type: (str, Any) -> None
         self._otel_span.set_attribute(key, value)