Merge branch 'master' into feat/set-trace-id

getsentry · Feb 6, 2025 · 50f6910 · 50f6910
2 parents 1dbb867 + 03143a8
commit 50f6910
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## 0.7.20
 
 **Features**:
 

diff --git a/include/sentry.h b/include/sentry.h
@@ -30,7 +30,7 @@ extern "C" {
 #        define SENTRY_SDK_NAME "sentry.native"
 #    endif
 #endif
-#define SENTRY_SDK_VERSION "0.7.19"
+#define SENTRY_SDK_VERSION "0.7.20"
 #define SENTRY_SDK_USER_AGENT SENTRY_SDK_NAME "/" SENTRY_SDK_VERSION
 
 /* common platform detection */
@@ -1835,7 +1835,7 @@ SENTRY_EXPERIMENTAL_API void sentry_set_span(sentry_span_t *span);
  * Starts a new Span.
  *
  * The return value of `sentry_transaction_start` should be passed in as
- * `parent`.
+ * `parent`. This value can't be null, since we don't allow for orphan spans.
  *
  * Both `operation` and `description` can be null, but it is recommended to
  * supply the former. See
@@ -1887,7 +1887,9 @@ SENTRY_EXPERIMENTAL_API sentry_span_t *sentry_transaction_start_child_ts_n(
 /**
  * Starts a new Span.
  *
- * The return value of `sentry_span_start_child` may be passed in as `parent`.
+ * The return value of either `sentry_transaction_start_child` or
+ * `sentry_span_start_child` should be passed in as `parent`. This value can't
+ * be null, since we don't allow for orphan spans.
  *
  * Both `operation` and `description` can be null, but it is recommended to
  * supply the former. See

diff --git a/ndk/gradle.properties b/ndk/gradle.properties
@@ -10,7 +10,7 @@ android.useAndroidX=true
 android.defaults.buildfeatures.buildconfig=true
 
 # Release information, used for maven publishing
-versionName=0.8.2
+versionName=0.7.20
 
 # disable renderscript, it's enabled by default
 android.defaults.buildfeatures.renderscript=false

diff --git a/tests/assertions.py b/tests/assertions.py
@@ -90,9 +90,9 @@ def assert_event_meta(
     }
     expected_sdk = {
         "name": "sentry.native",
-        "version": "0.7.19",
+        "version": "0.7.20",
         "packages": [
-            {"name": "github:getsentry/sentry-native", "version": "0.7.19"},
+            {"name": "github:getsentry/sentry-native", "version": "0.7.20"},
         ],
     }
     if is_android:

diff --git a/tests/test_integration_http.py b/tests/test_integration_http.py
@@ -31,7 +31,7 @@
 
 # fmt: off
 auth_header = (
-    "Sentry sentry_key=uiaeosnrtdy, sentry_version=7, sentry_client=sentry.native/0.7.19"
+    "Sentry sentry_key=uiaeosnrtdy, sentry_version=7, sentry_client=sentry.native/0.7.20"
 )
 # fmt: on
 

diff --git a/tests/win_utils.py b/tests/win_utils.py
@@ -1,7 +1,7 @@
 import pathlib
 import win32api
 
-sentry_version = "0.7.19"
+sentry_version = "0.7.20"
 
 
 def check_binary_version(binary_path: pathlib.Path):