Merge branch '8.x.x' into feat/potel-30-child-span-make-current-by-de…

…fault
getsentry · Jul 3, 2024 · bcae360 · bcae360
2 parents 2c16bad + afff380
commit bcae360
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,9 @@
 - Parse and use `send-default-pii` and `max-request-body-size` from `sentry.properties` ([#3534](https://github.com/getsentry/sentry-java/pull/3534))
 - `span.startChild` now uses `.makeCurrent()` by default ([#3544](https://github.com/getsentry/sentry-java/pull/3544))
   - This caused an issue where the span tree wasn't correct because some spans were not added to their direct parent 
+- Partially fix bootstrap class loading ([#3543](https://github.com/getsentry/sentry-java/pull/3543))
+  - There was a problem with two separate Sentry `Scopes` being active inside each OpenTelemetry `Context` due to using context keys from more than one class loader.
+
 ## 8.0.0-alpha.2
 
 ### Behavioural Changes