POTEL 11 - Move sampling logic into OTel Sampler

buildSrc/src/main/java/Config.kt

@@ -151,9 +151,9 @@ object Config {
         val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2"
 
         object OpenTelemetry {
-            val otelVersion = "1.33.0"
+            val otelVersion = "1.37.0"
             val otelAlphaVersion = "$otelVersion-alpha"
-            val otelJavaagentVersion = "1.32.0"
+            val otelJavaagentVersion = "2.3.0"
             val otelJavaagentAlphaVersion = "$otelJavaagentVersion-alpha"
             val otelSemanticConvetionsVersion = "1.23.1-alpha"
 
@@ -199,7 +199,9 @@ object Config {
     object QualityPlugins {
         object Jacoco {
             val version = "0.8.7"
-            val minimumCoverage = BigDecimal.valueOf(0.6)
+
+            // TODO [POTEL] add tests and restore
+            val minimumCoverage = BigDecimal.valueOf(0.1)
         }
         val spotless = "com.diffplug.spotless"
         val spotlessVersion = "6.11.0"

sentry-android-core/api/sentry-android-core.api

@@ -12,8 +12,8 @@ public final class io/sentry/android/core/ActivityBreadcrumbsIntegration : andro
 }
 
 public final class io/sentry/android/core/ActivityFramesTracker {
-	public fun <init> (Lio/sentry/android/core/LoadClass;Lio/sentry/android/core/SentryAndroidOptions;)V
-	public fun <init> (Lio/sentry/android/core/LoadClass;Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/android/core/MainLooperHandler;)V
+	public fun <init> (Lio/sentry/util/LoadClass;Lio/sentry/android/core/SentryAndroidOptions;)V
+	public fun <init> (Lio/sentry/util/LoadClass;Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/android/core/MainLooperHandler;)V
 	public fun addActivity (Landroid/app/Activity;)V
 	public fun isFrameMetricsAggregatorAvailable ()Z
 	public fun setMetrics (Landroid/app/Activity;Lio/sentry/protocol/SentryId;)V
@@ -209,7 +209,7 @@ public final class io/sentry/android/core/InternalSentrySdk {
 	public static fun serializeScope (Landroid/content/Context;Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/IScope;)Ljava/util/Map;
 }
 
-public final class io/sentry/android/core/LoadClass {
+public final class io/sentry/android/core/LoadClass : io/sentry/util/LoadClass {
 	public fun <init> ()V
 	public fun isClassAvailable (Ljava/lang/String;Lio/sentry/ILogger;)Z
 	public fun isClassAvailable (Ljava/lang/String;Lio/sentry/SentryOptions;)Z
@@ -374,7 +374,7 @@ public final class io/sentry/android/core/TempSensorBreadcrumbsIntegration : and
 }
 
 public final class io/sentry/android/core/UserInteractionIntegration : android/app/Application$ActivityLifecycleCallbacks, io/sentry/Integration, java/io/Closeable {
-	public fun <init> (Landroid/app/Application;Lio/sentry/android/core/LoadClass;)V
+	public fun <init> (Landroid/app/Application;Lio/sentry/util/LoadClass;)V
 	public fun close ()V
 	public fun onActivityCreated (Landroid/app/Activity;Landroid/os/Bundle;)V
 	public fun onActivityDestroyed (Landroid/app/Activity;)V

sentry-android-core/src/main/java/io/sentry/android/core/ActivityFramesTracker.java

@@ -39,7 +39,7 @@ public final class ActivityFramesTracker {
   private final @NotNull MainLooperHandler handler;
 
   public ActivityFramesTracker(
-      final @NotNull LoadClass loadClass,
+      final @NotNull io.sentry.util.LoadClass loadClass,
       final @NotNull SentryAndroidOptions options,
       final @NotNull MainLooperHandler handler) {
 
@@ -54,13 +54,14 @@ public ActivityFramesTracker(
   }
 
   public ActivityFramesTracker(
-      final @NotNull LoadClass loadClass, final @NotNull SentryAndroidOptions options) {
+      final @NotNull io.sentry.util.LoadClass loadClass,
+      final @NotNull SentryAndroidOptions options) {
     this(loadClass, options, new MainLooperHandler());
   }
 
   @TestOnly
   ActivityFramesTracker(
-      final @NotNull LoadClass loadClass,
+      final @NotNull io.sentry.util.LoadClass loadClass,
       final @NotNull SentryAndroidOptions options,
       final @NotNull MainLooperHandler handler,
       final @Nullable FrameMetricsAggregator frameMetricsAggregator) {

sentry-android-core/src/main/java/io/sentry/android/core/AndroidOptionsInitializer.java

@@ -119,7 +119,7 @@ static void loadDefaultAndMetadataOptions(
   static void initializeIntegrationsAndProcessors(
       final @NotNull SentryAndroidOptions options,
       final @NotNull Context context,
-      final @NotNull LoadClass loadClass,
+      final @NotNull io.sentry.util.LoadClass loadClass,
       final @NotNull ActivityFramesTracker activityFramesTracker) {
     initializeIntegrationsAndProcessors(
         options,
@@ -133,7 +133,7 @@ static void initializeIntegrationsAndProcessors(
       final @NotNull SentryAndroidOptions options,
       final @NotNull Context context,
       final @NotNull BuildInfoProvider buildInfoProvider,
-      final @NotNull LoadClass loadClass,
+      final @NotNull io.sentry.util.LoadClass loadClass,
       final @NotNull ActivityFramesTracker activityFramesTracker) {
 
     if (options.getCacheDirPath() != null
@@ -237,7 +237,7 @@ static void installDefaultIntegrations(
       final @NotNull Context context,
       final @NotNull SentryAndroidOptions options,
       final @NotNull BuildInfoProvider buildInfoProvider,
-      final @NotNull LoadClass loadClass,
+      final @NotNull io.sentry.util.LoadClass loadClass,
       final @NotNull ActivityFramesTracker activityFramesTracker,
       final boolean isFragmentAvailable,
       final boolean isTimberAvailable) {

sentry-android-core/src/main/java/io/sentry/android/core/LoadClass.java

@@ -1,13 +1,23 @@
 package io.sentry.android.core;
 
 import io.sentry.ILogger;
-import io.sentry.SentryLevel;
 import io.sentry.SentryOptions;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-/** An Adapter for making Class.forName testable */
-public final class LoadClass {
+/**
+ * An Adapter for making Class.forName testable
+ *
+ * @deprecated please use {@link io.sentry.util.LoadClass} instead.
+ */
+@Deprecated
+public final class LoadClass extends io.sentry.util.LoadClass {
+
+  private final io.sentry.util.LoadClass delegate;
+
+  public LoadClass() {
+    delegate = new io.sentry.util.LoadClass();
+  }
 
   /**
    * Try to load a class via reflection
@@ -17,30 +27,15 @@ public final class LoadClass {
    * @return a Class<?> if it's available, or null
    */
   public @Nullable Class<?> loadClass(final @NotNull String clazz, final @Nullable ILogger logger) {
-    try {
-      return Class.forName(clazz);
-    } catch (ClassNotFoundException e) {
-      if (logger != null) {
-        logger.log(SentryLevel.DEBUG, "Class not available:" + clazz, e);
-      }
-    } catch (UnsatisfiedLinkError e) {
-      if (logger != null) {
-        logger.log(SentryLevel.ERROR, "Failed to load (UnsatisfiedLinkError) " + clazz, e);
-      }
-    } catch (Throwable e) {
-      if (logger != null) {
-        logger.log(SentryLevel.ERROR, "Failed to initialize " + clazz, e);
-      }
-    }
-    return null;
+    return delegate.loadClass(clazz, logger);
   }
 
   public boolean isClassAvailable(final @NotNull String clazz, final @Nullable ILogger logger) {
-    return loadClass(clazz, logger) != null;
+    return delegate.isClassAvailable(clazz, logger);
   }
 
   public boolean isClassAvailable(
       final @NotNull String clazz, final @Nullable SentryOptions options) {
-    return isClassAvailable(clazz, options != null ? options.getLogger() : null);
+    return delegate.isClassAvailable(clazz, options);
   }
 }

sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroid.java

@@ -87,7 +87,7 @@ public static synchronized void init(
       Sentry.init(
           OptionsContainer.create(SentryAndroidOptions.class),
           options -> {
-            final LoadClass classLoader = new LoadClass();
+            final io.sentry.util.LoadClass classLoader = new io.sentry.util.LoadClass();
             final boolean isTimberUpstreamAvailable =
                 classLoader.isClassAvailable(TIMBER_CLASS_NAME, options);
             final boolean isFragmentUpstreamAvailable =
@@ -101,7 +101,7 @@ public static synchronized void init(
                     && classLoader.isClassAvailable(SENTRY_TIMBER_INTEGRATION_CLASS_NAME, options));
 
             final BuildInfoProvider buildInfoProvider = new BuildInfoProvider(logger);
-            final LoadClass loadClass = new LoadClass();
+            final io.sentry.util.LoadClass loadClass = new io.sentry.util.LoadClass();
             final ActivityFramesTracker activityFramesTracker =
                 new ActivityFramesTracker(loadClass, options);
 

sentry-android-core/src/main/java/io/sentry/android/core/UserInteractionIntegration.java

@@ -29,7 +29,7 @@ public final class UserInteractionIntegration
   private final boolean isAndroidXAvailable;
 
   public UserInteractionIntegration(
-      final @NotNull Application application, final @NotNull LoadClass classLoader) {
+      final @NotNull Application application, final @NotNull io.sentry.util.LoadClass classLoader) {
     this.application = Objects.requireNonNull(application, "Application is required");
     isAndroidXAvailable =
         classLoader.isClassAvailable("androidx.core.view.GestureDetectorCompat", options);

sentry-android-fragment/src/test/java/io/sentry/android/fragment/SentryFragmentLifecycleCallbacksTest.kt

@@ -53,7 +53,7 @@ class SentryFragmentLifecycleCallbacksTest {
             whenever(span.spanContext).thenReturn(
                 SpanContext(SentryId.EMPTY_ID, SpanId.EMPTY_ID, "op", null, null)
             )
-            whenever(transaction.startChild(any(), any())).thenReturn(span)
+            whenever(transaction.startChild(any<String>(), any<String>())).thenReturn(span)
             whenever(scope.transaction).thenReturn(transaction)
             whenever(scopes.configureScope(any())).thenAnswer {
                 (it.arguments[0] as ScopeCallback).run(scope)
@@ -190,7 +190,7 @@ class SentryFragmentLifecycleCallbacksTest {
 
         sut.onFragmentCreated(fixture.fragmentManager, fixture.fragment, savedInstanceState = null)
 
-        verify(fixture.transaction, never()).startChild(any(), any())
+        verify(fixture.transaction, never()).startChild(any<String>(), any<String>())
     }
 
     @Test
@@ -200,10 +200,10 @@ class SentryFragmentLifecycleCallbacksTest {
         sut.onFragmentCreated(fixture.fragmentManager, fixture.fragment, savedInstanceState = null)
 
         verify(fixture.transaction).startChild(
-            check {
+            check<String> {
                 assertEquals(SentryFragmentLifecycleCallbacks.FRAGMENT_LOAD_OP, it)
             },
-            check {
+            check<String> {
                 assertEquals("androidx.fragment.app.Fragment", it)
             }
         )
@@ -215,7 +215,7 @@ class SentryFragmentLifecycleCallbacksTest {
 
         sut.onFragmentCreated(fixture.fragmentManager, fixture.fragment, savedInstanceState = null)
 
-        verify(fixture.transaction, never()).startChild(any(), any())
+        verify(fixture.transaction, never()).startChild(any<String>(), any<String>())
     }
 
     @Test
@@ -225,7 +225,7 @@ class SentryFragmentLifecycleCallbacksTest {
         sut.onFragmentCreated(fixture.fragmentManager, fixture.fragment, savedInstanceState = null)
         sut.onFragmentCreated(fixture.fragmentManager, fixture.fragment, savedInstanceState = null)
 
-        verify(fixture.transaction).startChild(any(), any())
+        verify(fixture.transaction).startChild(any<String>(), any<String>())
     }
 
     @Test

sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts

@@ -53,6 +53,7 @@ val upstreamAgent = configurations.create("upstreamAgent") {
 
 dependencies {
     bootstrapLibs(projects.sentry)
+    bootstrapLibs(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap)
     javaagentLibs(projects.sentryOpentelemetry.sentryOpentelemetryAgentcustomization)
     upstreamAgent(Config.Libs.OpenTelemetry.otelJavaAgent)
 }

sentry-opentelemetry/sentry-opentelemetry-agentcustomization/build.gradle.kts

@@ -24,6 +24,7 @@ dependencies {
         exclude(group = "io.opentelemetry")
         exclude(group = "io.opentelemetry.javaagent")
     }
+    implementation(projects.sentryOpentelemetry.sentryOpentelemetryBootstrap)
 
     compileOnly(Config.Libs.OpenTelemetry.otelSdk)
     compileOnly(Config.Libs.OpenTelemetry.otelExtensionAutoconfigureSpi)

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

@@ -1,9 +1,11 @@
 package io.sentry.opentelemetry;
 
+import io.opentelemetry.context.ContextStorage;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizerProvider;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
+import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
 import io.sentry.Instrumenter;
 import io.sentry.Sentry;
 import io.sentry.SentryIntegrationPackageStorage;
@@ -28,12 +30,16 @@ public final class SentryAutoConfigurationCustomizerProvider
   @Override
   public void customize(AutoConfigurationCustomizer autoConfiguration) {
     final @Nullable VersionInfoHolder versionInfoHolder = createVersionInfo();
+
+    ContextStorage.addWrapper((storage) -> new SentryContextStorage(storage));
+
     if (isSentryAutoInitEnabled()) {
       Sentry.init(
           options -> {
             options.setEnableExternalConfiguration(true);
             options.setInstrumenter(Instrumenter.OTEL);
             options.addEventProcessor(new OpenTelemetryLinkErrorEventProcessor());
+            options.setSpanFactory(new OtelSpanFactory());
             final @Nullable SdkVersion sdkVersion = createSdkVersion(options, versionInfoHolder);
             if (sdkVersion != null) {
               options.setSdkVersion(sdkVersion);
@@ -140,7 +146,12 @@ private static class VersionInfoHolder {
 
   private SdkTracerProviderBuilder configureSdkTracerProvider(
       SdkTracerProviderBuilder tracerProvider, ConfigProperties config) {
-    return tracerProvider.addSpanProcessor(new SentrySpanProcessor());
+    // TODO [POTEL] configurable or separate packages for old vs new way
+    //    return tracerProvider.addSpanProcessor(new SentrySpanProcessor());
+    return tracerProvider
+        .setSampler(new SentrySampler())
+        .addSpanProcessor(new PotelSentrySpanProcessor())
+        .addSpanProcessor(BatchSpanProcessor.builder(new SentrySpanExporter()).build());
   }
 
   private Map<String, String> getDefaultProperties() {

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

@@ -7,7 +7,8 @@
 public final class SentryPropagatorProvider implements ConfigurablePropagatorProvider {
   @Override
   public TextMapPropagator getPropagator(ConfigProperties config) {
-    return new SentryPropagator();
+    //    return new SentryPropagator();
+    return new PotelSentryPropagator();
   }
 
   @Override