Merge branch '8.x.x' into feat/agentless-spring-module

Author: adinauer

sentry-opentelemetry/sentry-opentelemetry-agentcustomization/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java

@@ -8,7 +8,6 @@
 import io.sentry.InitPriority;
 import io.sentry.Sentry;
 import io.sentry.SentryIntegrationPackageStorage;
-import io.sentry.SentryOpenTelemetryMode;
 import io.sentry.SentryOptions;
 import io.sentry.protocol.SdkVersion;
 import io.sentry.protocol.SentryPackage;
@@ -39,7 +38,6 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
           options -> {
             options.setEnableExternalConfiguration(true);
             options.setInitPriority(InitPriority.HIGH);
-            options.setOpenTelemetryMode(SentryOpenTelemetryMode.AGENT);
             final @Nullable SdkVersion sdkVersion = createSdkVersion(options, versionInfoHolder);
             if (sdkVersion != null) {
               options.setSdkVersion(sdkVersion);

sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/OtelStrongRefSpanWrapper.java

@@ -47,7 +47,7 @@ public final class OtelStrongRefSpanWrapper implements IOtelSpanWrapper {
 
   private final @NotNull IOtelSpanWrapper delegate;
 
-  public OtelStrongRefSpanWrapper(@NotNull Span otelSpan, IOtelSpanWrapper delegate) {
+  public OtelStrongRefSpanWrapper(@NotNull Span otelSpan, @NotNull IOtelSpanWrapper delegate) {
     this.otelSpan = otelSpan;
     this.delegate = delegate;
   }

sentry/src/main/java/io/sentry/Sentry.java

@@ -369,7 +369,6 @@ private static void initForOpenTelemetryMaybe(SentryOptions options) {
     OpenTelemetryUtil.applyIgnoredSpanOrigins(options, new LoadClass());
   }
 
-  @SuppressWarnings("UnusedMethod")
   private static void initScopesStorage(SentryOptions options) {
     getScopesStorage().close();
     if (SentryOpenTelemetryMode.OFF == options.getOpenTelemetryMode()) {
@@ -513,6 +512,8 @@ private static void initConfigurations(final @NotNull SentryOptions options) {
     }
     logger.log(SentryLevel.INFO, "Initializing SDK with DSN: '%s'", options.getDsn());
 
+    OpenTelemetryUtil.applyIgnoredSpanOrigins(options, new LoadClass());
+
     // TODO: read values from conf file, Build conf or system envs
     // eg release, distinctId, sentryClientName