Merge remote-tracking branch 'origin/master' into potel-base

Author: sl0thentr0py

.tool-versions

@@ -1,5 +1,26 @@
 # Changelog
 
+## 2.8.0
+
+### Various fixes & improvements
+
+- `profiler_id` uses underscore (#3249) by @Zylphrex
+- Don't send full env to subprocess (#3251) by @kmichel-aiven
+- Stop using `Hub` in `HttpTransport` (#3247) by @szokeasaurusrex
+- Remove `ipdb` from test requirements (#3237) by @rominf
+- Avoid propagation of empty baggage (#2968) by @hartungstenio
+- Add entry point for `SentryPropagator` (#3086) by @mender
+- Bump checkouts/data-schemas from `8c13457` to `88273a9` (#3225) by @dependabot
+
+## 2.7.1
+
+### Various fixes & improvements
+
+- fix(otel): Fix missing baggage (#3218) by @sentrivana
+- This is the config file of asdf-vm which we do not use. (#3215) by @antonpirker
+- Added option to disable middleware spans in Starlette (#3052) by @antonpirker
+- build: Update tornado version in setup.py to match code check. (#3206) by @aclemons
+
 ## 2.7.0
 
 - Add `origin` to spans and transactions (#3133) by @antonpirker

CHANGELOG.md

@@ -28,7 +28,7 @@
 copyright = "2019-{}, Sentry Team and Contributors".format(datetime.now().year)
 author = "Sentry Team and Contributors"
 
-release = "2.7.0"
+release = "2.8.0"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

checkouts/data-schemas

@@ -10,5 +10,4 @@ executing
 asttokens
 responses
 pysocks
-ipdb
 setuptools

docs/conf.py

@@ -379,7 +379,7 @@ class SPANDATA:
     Example: "MainThread"
     """
 
-    PROFILER_ID = "profiler.id"
+    PROFILER_ID = "profiler_id"
     """
     Label identifying the profiler id that the span occurred in. This should be a string.
     Example: "5249fbada8d5416482c2f6e47e337372"
@@ -529,4 +529,4 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "2.7.0"
+VERSION = "2.8.0"

requirements-testing.txt

@@ -17,24 +17,23 @@
     SpanContext,
     TraceFlags,
 )
+
+from sentry_sdk._types import TYPE_CHECKING
 from sentry_sdk.integrations.opentelemetry.consts import (
     SENTRY_BAGGAGE_KEY,
     SENTRY_TRACE_KEY,
 )
 from sentry_sdk.integrations.opentelemetry.span_processor import (
     SentrySpanProcessor,
 )
-
 from sentry_sdk.tracing import (
     BAGGAGE_HEADER_NAME,
     SENTRY_TRACE_HEADER_NAME,
 )
 from sentry_sdk.tracing_utils import Baggage, extract_sentrytrace_data
-from sentry_sdk._types import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from typing import Optional
-    from typing import Set
+    from typing import Optional, Set
 
 
 class SentryPropagator(TextMapPropagator):
@@ -107,7 +106,9 @@ def inject(self, carrier, context=None, setter=default_setter):
         if sentry_span.containing_transaction:
             baggage = sentry_span.containing_transaction.get_baggage()
             if baggage:
-                setter.set(carrier, BAGGAGE_HEADER_NAME, baggage.serialize())
+                baggage_data = baggage.serialize()
+                if baggage_data:
+                    setter.set(carrier, BAGGAGE_HEADER_NAME, baggage_data)
 
     @property
     def fields(self):

sentry_sdk/consts.py

@@ -253,17 +253,14 @@ def _get_trace_data(self, otel_span, parent_context):
         )
         trace_data["parent_span_id"] = parent_span_id
 
-        if parent_context is not None:
-            sentry_trace_data = get_value(SENTRY_TRACE_KEY, parent_context)
-            sentry_trace_data = cast(
-                "dict[str, Union[str, bool, None]]", sentry_trace_data
-            )
-            trace_data["parent_sampled"] = (
-                sentry_trace_data["parent_sampled"] if sentry_trace_data else None
-            )
+        sentry_trace_data = get_value(SENTRY_TRACE_KEY, parent_context)
+        sentry_trace_data = cast("dict[str, Union[str, bool, None]]", sentry_trace_data)
+        trace_data["parent_sampled"] = (
+            sentry_trace_data["parent_sampled"] if sentry_trace_data else None
+        )
 
-            baggage = get_value(SENTRY_BAGGAGE_KEY, parent_context)
-            trace_data["baggage"] = baggage
+        baggage = get_value(SENTRY_BAGGAGE_KEY, parent_context)
+        trace_data["baggage"] = baggage
 
         return trace_data
 

sentry_sdk/integrations/opentelemetry/propagator.py

@@ -207,7 +207,11 @@ def sentry_patched_popen_init(self, *a, **kw):
             ):
                 if env is None:
                     env = _init_argument(
-                        a, kw, "env", 10, lambda x: dict(x or os.environ)
+                        a,
+                        kw,
+                        "env",
+                        10,
+                        lambda x: dict(x if x is not None else os.environ),
                     )
                 env["SUBPROCESS_" + k.upper().replace("-", "_")] = v
 

sentry_sdk/integrations/opentelemetry/span_processor.py

@@ -115,7 +115,7 @@ class TransactionKwargs(SpanKwargs, total=False):
     ProfileContext = TypedDict(
         "ProfileContext",
         {
-            "profiler.id": str,
+            "profiler_id": str,
         },
     )
 
@@ -693,7 +693,7 @@ def get_profile_context(self):
             return None
 
         return {
-            "profiler.id": profiler_id,
+            "profiler_id": profiler_id,
         }