tests

Author: sentrivana

sentry_sdk/traces.py

@@ -580,17 +580,23 @@ def _set_segment_attributes(self) -> None:
             SPANDATA.SENTRY_SDK_INTEGRATIONS, sorted(client.integrations.keys())
         )
 
-        if client.options.get("release"):
+        if (
+            client.options.get("release")
+            and SPANDATA.SENTRY_RELEASE not in self._attributes
+        ):
             self.set_attribute(
                 SPANDATA.SENTRY_RELEASE, client.options["release"].strip()
             )
 
-        if client.options.get("environment"):
+        if (
+            client.options.get("environment")
+            and SPANDATA.SENTRY_ENVIRONMENT not in self._attributes
+        ):
             self.set_attribute(
                 SPANDATA.SENTRY_ENVIRONMENT, client.options["environment"].strip()
             )
 
-        if client.options.get("dist"):
+        if client.options.get("dist") and SPANDATA.SENTRY_DIST not in self._attributes:
             self.set_attribute(SPANDATA.SENTRY_DIST, client.options["dist"].strip())
 
     def _to_json(self) -> "SpanJSON":

tests/tracing/test_span_streaming.py

@@ -1622,6 +1622,7 @@ def test_default_attributes(sentry_init, capture_envelopes):
     sentry_init(
         server_name="test-server",
         release="1.0.0",
+        dist="1.0",
         traces_sample_rate=1.0,
         _experiments={"trace_lifecycle": "stream"},
     )
@@ -1653,6 +1654,9 @@ def test_default_attributes(sentry_init, capture_envelopes):
         "sentry.sdk.version": {"value": mock.ANY, "type": "string"},
         "server.address": {"value": "test-server", "type": "string"},
         "sentry.environment": {"value": "production", "type": "string"},
+        "sentry.platform": {"value": "python", "type": "string"},
         "sentry.release": {"value": "1.0.0", "type": "string"},
+        "sentry.dist": {"value": "1.0", "type": "string"},
         "sentry.origin": {"value": "manual", "type": "string"},
+        "sentry.sdk.integrations": {"value": mock.ANY, "type": "array"},
     }