Merge branch 'main' into feat/report-discarded-log-bytes

Author: adinauer

CHANGELOG.md

@@ -10,6 +10,7 @@
 - Only set `DefaultReplayBreadcrumbConverter` if replay is available ([#4888](https://github.com/getsentry/sentry-java/pull/4888))
 - Session Replay: Cache connection status instead of using blocking calls ([#4891](https://github.com/getsentry/sentry-java/pull/4891))
 - Fix log count in client reports ([#4869](https://github.com/getsentry/sentry-java/pull/4869))
+- Fix profilerId propagation ([#4833](https://github.com/getsentry/sentry-java/pull/4833))
 
 ### Improvements
 

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java

@@ -297,6 +297,7 @@ private void transferSpanDetails(
     @NotNull TransactionNameSource transactionNameSource = spanInfo.getTransactionNameSource();
     @Nullable SpanId parentSpanId = null;
     @Nullable Baggage baggage = null;
+    @NotNull SentryId profilerId = SentryId.EMPTY_ID;
 
     if (sentrySpanMaybe != null) {
       final @NotNull IOtelSpanWrapper sentrySpan = sentrySpanMaybe;
@@ -312,6 +313,7 @@ private void transferSpanDetails(
       final @NotNull SpanContext spanContext = sentrySpan.getSpanContext();
       parentSpanId = spanContext.getParentSpanId();
       baggage = spanContext.getBaggage();
+      profilerId = spanContext.getProfilerId();
     }
 
     final @NotNull TransactionContext transactionContext =
@@ -324,6 +326,7 @@ private void transferSpanDetails(
     transactionContext.setTransactionNameSource(transactionNameSource);
     transactionContext.setOperation(spanInfo.getOp());
     transactionContext.setInstrumenter(Instrumenter.SENTRY);
+    transactionContext.setProfilerId(profilerId);
     if (sentrySpanMaybe != null) {
       transactionContext.setSamplingDecision(sentrySpanMaybe.getSamplingDecision());
       transactionOptions.setOrigin(sentrySpanMaybe.getSpanContext().getOrigin());