Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 4a585ad

Browse filesBrowse files
authored
Merge branch 'main' into feat/report-discarded-log-bytes
2 parents 8aa945e + e990937 commit 4a585ad
Copy full SHA for 4a585ad

2 files changed

+4Lines changed: 4 additions & 0 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎CHANGELOG.md‎

Copy file name to clipboardExpand all lines: CHANGELOG.md
+1Lines changed: 1 addition & 0 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
- Only set `DefaultReplayBreadcrumbConverter` if replay is available ([#4888](https://github.com/getsentry/sentry-java/pull/4888))
1111
- Session Replay: Cache connection status instead of using blocking calls ([#4891](https://github.com/getsentry/sentry-java/pull/4891))
1212
- Fix log count in client reports ([#4869](https://github.com/getsentry/sentry-java/pull/4869))
13+
- Fix profilerId propagation ([#4833](https://github.com/getsentry/sentry-java/pull/4833))
1314

1415
### Improvements
1516

Collapse file

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

Copy file name to clipboardExpand all lines: sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ private void transferSpanDetails(
297297
@NotNull TransactionNameSource transactionNameSource = spanInfo.getTransactionNameSource();
298298
@Nullable SpanId parentSpanId = null;
299299
@Nullable Baggage baggage = null;
300+
@NotNull SentryId profilerId = SentryId.EMPTY_ID;
300301

301302
if (sentrySpanMaybe != null) {
302303
final @NotNull IOtelSpanWrapper sentrySpan = sentrySpanMaybe;
@@ -312,6 +313,7 @@ private void transferSpanDetails(
312313
final @NotNull SpanContext spanContext = sentrySpan.getSpanContext();
313314
parentSpanId = spanContext.getParentSpanId();
314315
baggage = spanContext.getBaggage();
316+
profilerId = spanContext.getProfilerId();
315317
}
316318

317319
final @NotNull TransactionContext transactionContext =
@@ -324,6 +326,7 @@ private void transferSpanDetails(
324326
transactionContext.setTransactionNameSource(transactionNameSource);
325327
transactionContext.setOperation(spanInfo.getOp());
326328
transactionContext.setInstrumenter(Instrumenter.SENTRY);
329+
transactionContext.setProfilerId(profilerId);
327330
if (sentrySpanMaybe != null) {
328331
transactionContext.setSamplingDecision(sentrySpanMaybe.getSamplingDecision());
329332
transactionOptions.setOrigin(sentrySpanMaybe.getSpanContext().getOrigin());

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.