Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

POTEL 43 - No longer set Instrumenter to OTEL for the new Java Agent #3697

Merged
merged 6 commits into from
Sep 23, 2024
Merged

POTEL 43 - No longer set Instrumenter to OTEL for the new Java Agent #3697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
938923d
merge
adinauer Sep 17, 2024
32f1546
move from hub to scopes
adinauer Sep 18, 2024
852af00
restore instrumenter code, do not use otel as instrumenter for potel
adinauer Sep 18, 2024
414c519
changelog
adinauer Sep 18, 2024
c11bc1c
reword changelog
adinauer Sep 18, 2024
d0601df
Merge branch '8.x.x' into feat/restore-instrumenter-code
adinauer Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- Remove `PROCESS_COMMAND_ARGS` (`process.command_args`) OpenTelemetry span attribute as it can be very large ([#3664](https://github.com/getsentry/sentry-java/pull/3664))
- Use RECORD_ONLY sampling decision if performance is disabled ([#3659](https://github.com/getsentry/sentry-java/pull/3659))
- Also fix check whether Performance is enabled when making a sampling decision in the OpenTelemetry sampler
- Sentry OpenTelemetry Java Agent now sets Instrumenter to SENTRY (used to be OTEL) ([#3697](https://github.com/getsentry/sentry-java/pull/3697))
- Avoid stopping appStartProfiler after application creation ([#3630](https://github.com/getsentry/sentry-java/pull/3630))
- Session Replay: Correctly detect dominant color for `TextView`s with Spans ([#3682](https://github.com/getsentry/sentry-java/pull/3682))
- Session Replay: Add options to selectively redact/ignore views from being captured. The following options are available: ([#3689](https://github.com/getsentry/sentry-java/pull/3689))
Expand Down
4 changes: 2 additions & 2 deletions ...y/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySpanExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ private void createAndFinishSpanForOtelSpan(
parentSentrySpan.getSpanContext().getSpanId(),
new SpanId(spanId));
spanContext.setDescription(spanInfo.getDescription());
spanContext.setInstrumenter(Instrumenter.OTEL);
spanContext.setInstrumenter(Instrumenter.SENTRY);
if (sentrySpanMaybe != null) {
spanContext.setSamplingDecision(sentrySpanMaybe.getSamplingDecision());
spanOptions.setOrigin(sentrySpanMaybe.getSpanContext().getOrigin());
Expand Down Expand Up @@ -329,7 +329,7 @@ private void transferSpanDetails(
transactionName == null ? DEFAULT_TRANSACTION_NAME : transactionName);
transactionContext.setTransactionNameSource(transactionNameSource);
transactionContext.setOperation(spanInfo.getOp());
transactionContext.setInstrumenter(Instrumenter.OTEL);
transactionContext.setInstrumenter(Instrumenter.SENTRY);
if (sentrySpanMaybe != null) {
transactionContext.setSamplingDecision(sentrySpanMaybe.getSamplingDecision());
transactionOptions.setOrigin(sentrySpanMaybe.getSpanContext().getOrigin());
Expand Down
20 changes: 9 additions & 11 deletions sentry/src/main/java/io/sentry/Scopes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -850,17 +850,15 @@ public void flush(long timeoutMillis) {
transactionContext.getOrigin());
transaction = NoOpTransaction.getInstance();

// } else if (!getOptions().getInstrumenter().equals(transactionContext.getInstrumenter()))
// {
// getOptions()
// .getLogger()
// .log(
// SentryLevel.DEBUG,
// "Returning no-op for instrumenter %s as the SDK has been configured to use
// instrumenter %s",
// transactionContext.getInstrumenter(),
// getOptions().getInstrumenter());
// transaction = NoOpTransaction.getInstance();
} else if (!getOptions().getInstrumenter().equals(transactionContext.getInstrumenter())) {
getOptions()
.getLogger()
.log(
SentryLevel.DEBUG,
"Returning no-op for instrumenter %s as the SDK has been configured to use instrumenter %s",
transactionContext.getInstrumenter(),
getOptions().getInstrumenter());
transaction = NoOpTransaction.getInstance();
} else if (!getOptions().isTracingEnabled()) {
getOptions()
.getLogger()
Expand Down
Loading