Merge 2def353 into d533746

adinauer · web-flow · commit 33c64d6b42ca · 2025-07-03T08:32:29.000Z
diff --git a/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java b/sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java
@@ -14,17 +14,23 @@
 import io.sentry.protocol.SentryPackage;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public final class SentryAutoConfigurationCustomizerProvider
     implements AutoConfigurationCustomizerProvider {
 
+  private static final Logger logger =
+      Logger.getLogger(SentryAutoConfigurationCustomizerProvider.class.getName());
+
   public static volatile boolean skipInit = false;
 
   @Override
   public void customize(AutoConfigurationCustomizer autoConfiguration) {
     ensureSentryOtelStorageIsInitialized();
+    customizeOpenTelemetryDefaults();
     final @Nullable ManifestVersionReader.VersionInfoHolder versionInfoHolder =
         ManifestVersionReader.getInstance().readOpenTelemetryVersion();
 
@@ -63,6 +69,18 @@ private static void ensureSentryOtelStorageIsInitialized() {
     Sentry.getGlobalScope();
   }
 
+  private void customizeOpenTelemetryDefaults() {
+    try {
+      if (System.getProperty("otel.instrumentation.graphql.add-operation-name-to-span-name.enabled")
+          == null) {
+        System.setProperty(
+            "otel.instrumentation.graphql.add-operation-name-to-span-name.enabled", "true");
+      }
+    } catch (Exception e) {
+      logger.log(Level.WARNING, "Unable to change OpenTelemetry defaults for use with Sentry.", e);
+    }
+  }
+
   private boolean isSentryAutoInitEnabled() {
     if (skipInit) {
       return false;
