Merge branch 'potel-base' of github.com:getsentry/sentry-python into potel-base

Author: antonpirker

requirements-aws-lambda-layer.txt

@@ -5,6 +5,6 @@ urllib3
 # https://github.com/boto/botocore/blob/develop/setup.cfg
 # So we pin this here to make our Lambda layer work with
 # Lambda Function using Python 3.7+
-urllib3<1.27
+urllib3<1.27; python_version < "3.10"
 
 opentelemetry-distro>=0.35b0

sentry_sdk/opentelemetry/consts.py

@@ -21,6 +21,13 @@
 OTEL_SENTRY_CONTEXT = "otel"
 SPAN_ORIGIN = "auto.otel"
 
+# resource semconv attributes
+# Not all of these are stable yet, so defining them here rather than importing.
+# https://github.com/open-telemetry/semantic-conventions/blob/main/docs/resource/README.md#service
+RESOURCE_SERVICE_NAME = "service.name"
+RESOURCE_SERVICE_NAMESPACE = "service.namespace"
+RESOURCE_SERVICE_VERSION = "service.version"
+
 
 class SentrySpanAttribute:
     DESCRIPTION = "sentry.description"

sentry_sdk/opentelemetry/tracing.py

@@ -1,13 +1,20 @@
 from __future__ import annotations
 from opentelemetry import trace
 from opentelemetry.propagate import set_global_textmap
+from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider, Span, ReadableSpan
 
+from sentry_sdk.consts import VERSION
 from sentry_sdk.opentelemetry import (
     SentryPropagator,
     SentrySampler,
     SentrySpanProcessor,
 )
+from sentry_sdk.opentelemetry.consts import (
+    RESOURCE_SERVICE_NAME,
+    RESOURCE_SERVICE_NAMESPACE,
+    RESOURCE_SERVICE_VERSION,
+)
 from sentry_sdk.utils import logger
 
 
@@ -38,7 +45,16 @@ def setup_sentry_tracing() -> None:
 
     else:
         logger.debug("[Tracing] No TracerProvider set, creating a new one")
-        tracer_provider = TracerProvider(sampler=SentrySampler())
+        tracer_provider = TracerProvider(
+            sampler=SentrySampler(),
+            resource=Resource.create(
+                {
+                    RESOURCE_SERVICE_NAME: "sentry-python",
+                    RESOURCE_SERVICE_VERSION: VERSION,
+                    RESOURCE_SERVICE_NAMESPACE: "sentry",
+                }
+            ),
+        )
         trace.set_tracer_provider(tracer_provider)
 
     try:

tests/opentelemetry/test_potel.py

@@ -2,7 +2,7 @@
 from opentelemetry import trace
 
 import sentry_sdk
-from sentry_sdk.consts import SPANSTATUS
+from sentry_sdk.consts import SPANSTATUS, VERSION
 from tests.conftest import ApproxDict
 
 
@@ -361,3 +361,13 @@ def test_potel_span_status(status_in, status_out):
         span.set_status(status_in)
 
     assert span.status == status_out
+
+
+def test_otel_resource(sentry_init):
+    sentry_init()
+
+    tracer_provider = trace.get_tracer_provider()
+    resource_attrs = tracer_provider.resource.attributes
+    assert resource_attrs["service.name"] == "sentry-python"
+    assert resource_attrs["service.namespace"] == "sentry"
+    assert resource_attrs["service.version"] == VERSION

tox.ini

@@ -144,7 +144,7 @@ envlist =
     {py3.8,py3.10,py3.11}-huggingface_hub-v0.22.2
     {py3.8,py3.11,py3.12}-huggingface_hub-v0.26.5
     {py3.8,py3.12,py3.13}-huggingface_hub-v0.30.2
-    {py3.8,py3.12,py3.13}-huggingface_hub-v0.33.1
+    {py3.8,py3.12,py3.13}-huggingface_hub-v0.33.2
 
 
     # ~~~ DBs ~~~
@@ -505,7 +505,7 @@ deps =
     huggingface_hub-v0.22.2: huggingface_hub==0.22.2
     huggingface_hub-v0.26.5: huggingface_hub==0.26.5
     huggingface_hub-v0.30.2: huggingface_hub==0.30.2
-    huggingface_hub-v0.33.1: huggingface_hub==0.33.1
+    huggingface_hub-v0.33.2: huggingface_hub==0.33.2
 
 
     # ~~~ DBs ~~~
@@ -616,7 +616,7 @@ deps =
     django-v3.2.25: django==3.2.25
     django-v4.2.23: django==4.2.23
     django-v5.0.14: django==5.0.14
-    django-v5.2.3: django==5.2.3
+    django-v5.2.4: django==5.2.4
     django: channels[daphne]
     django: psycopg2-binary
     django: djangorestframework
@@ -632,7 +632,7 @@ deps =
     django-v3.2.25: pytest-asyncio
     django-v4.2.23: pytest-asyncio
     django-v5.0.14: pytest-asyncio
-    django-v5.2.3: pytest-asyncio
+    django-v5.2.4: pytest-asyncio
     django-v2.0.13: djangorestframework>=3.0,<4.0
     django-v2.0.13: Werkzeug<2.1.0
     django-v2.2.28: djangorestframework>=3.0,<4.0