Merge branch 'master' into antonpirker/1489-transaction-source

Author: antonpirker

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.7.1
+
+### Various fixes & improvements
+
+- Skip malformed baggage items (#1491) by @robyoung
+
 ## 1.7.0
 
 ### Various fixes & improvements

docs/conf.py

@@ -29,7 +29,7 @@
 copyright = "2019, Sentry Team and Contributors"
 author = "Sentry Team and Contributors"
 
-release = "1.7.0"
+release = "1.7.1"
 version = ".".join(release.split(".")[:2])  # The short X.Y version.
 
 

sentry_sdk/consts.py

@@ -102,7 +102,7 @@ def _get_default_options():
 del _get_default_options
 
 
-VERSION = "1.7.0"
+VERSION = "1.7.1"
 SDK_INFO = {
     "name": "sentry.python",
     "version": VERSION,

sentry_sdk/tracing_utils.py

@@ -457,6 +457,8 @@ def from_incoming_header(cls, header):
 
         if header:
             for item in header.split(","):
+                if "=" not in item:
+                    continue
                 item = item.strip()
                 key, val = item.split("=")
                 if Baggage.SENTRY_PREFIX_REGEX.match(key):

setup.py

@@ -21,7 +21,7 @@ def get_file_text(file_name):
 
 setup(
     name="sentry-sdk",
-    version="1.7.0",
+    version="1.7.1",
     author="Sentry Team and Contributors",
     author_email="hello@sentry.io",
     url="https://github.com/getsentry/sentry-python",

tests/tracing/test_baggage.py

@@ -65,3 +65,13 @@ def test_mixed_baggage():
             "other-vendor-value-1=foo;bar;baz,other-vendor-value-2=foo;bar;"
         ).split(",")
     )
+
+
+def test_malformed_baggage():
+    header = ","
+
+    baggage = Baggage.from_incoming_header(header)
+
+    assert baggage.sentry_items == {}
+    assert baggage.third_party_items == ""
+    assert baggage.mutable