Merge c11bc1c into 32f1546

Author: adinauer

CHANGELOG.md

@@ -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))

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

@@ -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());
@@ -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());

sentry/src/main/java/io/sentry/Scopes.java

@@ -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()