Fix profiling init for Spring and Spring Boot w Agent auto-init

sentry-async-profiler/src/main/java/io/sentry/asyncprofiler/provider/AsyncProfilerProfileConverterProvider.java

@@ -5,7 +5,6 @@
 import io.sentry.profiling.JavaProfileConverterProvider;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * AsyncProfiler implementation of {@link JavaProfileConverterProvider}. This provider integrates
@@ -15,7 +14,7 @@
 public final class AsyncProfilerProfileConverterProvider implements JavaProfileConverterProvider {
 
   @Override
-  public @Nullable IProfileConverter getProfileConverter() {
+  public @NotNull IProfileConverter getProfileConverter() {
     return new AsyncProfilerProfileConverter();
   }
 

sentry-spring-boot-jakarta/api/sentry-spring-boot-jakarta.api

@@ -24,6 +24,10 @@ public class io/sentry/spring/boot/jakarta/SentryLogbackInitializer : org/spring
 	public fun supportsEventType (Lorg/springframework/core/ResolvableType;)Z
 }
 
+public class io/sentry/spring/boot/jakarta/SentryProfilerAutoConfiguration {
+	public fun <init> ()V
+}
+
 public class io/sentry/spring/boot/jakarta/SentryProperties : io/sentry/SentryOptions {
 	public fun <init> ()V
 	public fun getExceptionResolverOrder ()I

sentry-spring-boot-jakarta/src/main/java/io/sentry/spring/boot/jakarta/SentryProfilerAutoConfiguration.java

@@ -0,0 +1,13 @@
+package io.sentry.spring.boot.jakarta;
+
+import com.jakewharton.nopen.annotation.Open;
+import io.sentry.spring.jakarta.SentryProfilerConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass(name = {"io.sentry.opentelemetry.agent.AgentMarker"})
+@Open
+@Import(SentryProfilerConfiguration.class)
+public class SentryProfilerAutoConfiguration {}

sentry-spring-boot-jakarta/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,3 +1,4 @@
 io.sentry.spring.boot.jakarta.SentryAutoConfiguration
+io.sentry.spring.boot.jakarta.SentryProfilerAutoConfiguration
 io.sentry.spring.boot.jakarta.SentryLogbackAppenderAutoConfiguration
 io.sentry.spring.boot.jakarta.SentryWebfluxAutoConfiguration

sentry-spring-jakarta/api/sentry-spring-jakarta.api

@@ -42,6 +42,12 @@ public class io/sentry/spring/jakarta/SentryInitBeanPostProcessor : org/springfr
 	public fun setApplicationContext (Lorg/springframework/context/ApplicationContext;)V
 }
 
+public class io/sentry/spring/jakarta/SentryProfilerConfiguration {
+	public fun <init> ()V
+	public fun sentryOpenTelemetryProfilerConfiguration ()Lio/sentry/IContinuousProfiler;
+	public fun sentryOpenTelemetryProfilerConverterConfiguration ()Lio/sentry/IProfileConverter;
+}
+
 public class io/sentry/spring/jakarta/SentryRequestHttpServletRequestProcessor : io/sentry/EventProcessor {
 	public fun <init> (Lio/sentry/spring/jakarta/tracing/TransactionNameProvider;Ljakarta/servlet/http/HttpServletRequest;)V
 	public fun getOrder ()Ljava/lang/Long;

sentry-spring-jakarta/src/main/java/io/sentry/spring/jakarta/SentryProfilerConfiguration.java

@@ -0,0 +1,94 @@
+package io.sentry.spring.jakarta;
+
+import com.jakewharton.nopen.annotation.Open;
+import io.sentry.IContinuousProfiler;
+import io.sentry.IProfileConverter;
+import io.sentry.NoOpContinuousProfiler;
+import io.sentry.NoOpProfileConverter;
+import io.sentry.Sentry;
+import io.sentry.SentryLevel;
+import io.sentry.SentryOptions;
+import io.sentry.profiling.ProfilingServiceLoader;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Handles late initialization of the profiler if the application is run with the OTEL Agent in
+ * auto-init mode. In that case the agent cannot initialize the profiler yet and falls back to No-Op
+ * implementations. This Configuration sets the profiler and converter on the options if that was
+ * the case.
+ */
+@Configuration(proxyBeanMethods = false)
+@Open
+public class SentryProfilerConfiguration {
+
+  @Bean
+  @ConditionalOnMissingBean(name = "sentryOpenTelemetryProfilerConfiguration")
+  public IContinuousProfiler sentryOpenTelemetryProfilerConfiguration() {
+    SentryOptions options = Sentry.getGlobalScope().getOptions();
+    IContinuousProfiler profiler = NoOpContinuousProfiler.getInstance();
+
+    if (Sentry.isEnabled()
+        && options.isContinuousProfilingEnabled()
+        && options.getContinuousProfiler() instanceof NoOpContinuousProfiler) {
+
+      options
+          .getLogger()
+          .log(
+              SentryLevel.DEBUG,
+              "Continuous profiler is NoOp, attempting to reload with Spring Boot classloader");
+
+      String path = options.getProfilingTracesDirPath();
+
+      profiler =
+          ProfilingServiceLoader.loadContinuousProfiler(
+              options.getLogger(),
+              path != null ? path : "",
+              options.getProfilingTracesHz(),
+              options.getExecutorService());
+
+      options.setContinuousProfiler(profiler);
+
+      if (!(profiler instanceof NoOpContinuousProfiler)) {
+        options
+            .getLogger()
+            .log(
+                SentryLevel.INFO,
+                "Successfully loaded continuous profiler via Spring Boot classloader");
+      }
+    }
+    return profiler;
+  }
+
+  @Bean
+  @ConditionalOnMissingBean(name = "sentryOpenTelemetryProfilerConverterConfiguration")
+  public IProfileConverter sentryOpenTelemetryProfilerConverterConfiguration() {
+    SentryOptions options = Sentry.getGlobalScope().getOptions();
+    IProfileConverter converter = NoOpProfileConverter.getInstance();
+
+    if (Sentry.isEnabled()
+        && options.isContinuousProfilingEnabled()
+        && options.getProfilerConverter() instanceof NoOpProfileConverter) {
+
+      options
+          .getLogger()
+          .log(
+              SentryLevel.DEBUG,
+              "Profile converter is NoOp, attempting to reload with Spring Boot classloader");
+
+      converter = ProfilingServiceLoader.loadProfileConverter();
+
+      options.setProfilerConverter(converter);
+
+      if (!(converter instanceof NoOpProfileConverter)) {
+        options
+            .getLogger()
+            .log(
+                SentryLevel.INFO,
+                "Successfully loaded profile converter via Spring Boot classloader");
+      }
+    }
+    return converter;
+  }
+}

sentry/api/sentry.api

@@ -1582,6 +1582,11 @@ public final class io/sentry/NoOpLogger : io/sentry/ILogger {
 	public fun log (Lio/sentry/SentryLevel;Ljava/lang/Throwable;Ljava/lang/String;[Ljava/lang/Object;)V
 }
 
+public final class io/sentry/NoOpProfileConverter : io/sentry/IProfileConverter {
+	public fun convertFromFile (Ljava/lang/String;)Lio/sentry/protocol/profiling/SentryProfile;
+	public static fun getInstance ()Lio/sentry/NoOpProfileConverter;
+}
+
 public final class io/sentry/NoOpReplayBreadcrumbConverter : io/sentry/ReplayBreadcrumbConverter {
 	public fun convert (Lio/sentry/Breadcrumb;)Lio/sentry/rrweb/RRWebEvent;
 	public static fun getInstance ()Lio/sentry/NoOpReplayBreadcrumbConverter;
@@ -2893,6 +2898,7 @@ public final class io/sentry/SentryEnvelopeItem {
 	public static fun fromEvent (Lio/sentry/ISerializer;Lio/sentry/SentryBaseEvent;)Lio/sentry/SentryEnvelopeItem;
 	public static fun fromLogs (Lio/sentry/ISerializer;Lio/sentry/SentryLogEvents;)Lio/sentry/SentryEnvelopeItem;
 	public static fun fromProfileChunk (Lio/sentry/ProfileChunk;Lio/sentry/ISerializer;)Lio/sentry/SentryEnvelopeItem;
+	public static fun fromProfileChunk (Lio/sentry/ProfileChunk;Lio/sentry/ISerializer;Lio/sentry/IProfileConverter;)Lio/sentry/SentryEnvelopeItem;
 	public static fun fromProfilingTrace (Lio/sentry/ProfilingTraceData;JLio/sentry/ISerializer;)Lio/sentry/SentryEnvelopeItem;
 	public static fun fromReplay (Lio/sentry/ISerializer;Lio/sentry/ILogger;Lio/sentry/SentryReplayEvent;Lio/sentry/ReplayRecording;Z)Lio/sentry/SentryEnvelopeItem;
 	public static fun fromSession (Lio/sentry/ISerializer;Lio/sentry/Session;)Lio/sentry/SentryEnvelopeItem;
@@ -3385,6 +3391,7 @@ public class io/sentry/SentryOptions {
 	public fun getPerformanceCollectors ()Ljava/util/List;
 	public fun getProfileLifecycle ()Lio/sentry/ProfileLifecycle;
 	public fun getProfileSessionSampleRate ()Ljava/lang/Double;
+	public fun getProfilerConverter ()Lio/sentry/IProfileConverter;
 	public fun getProfilesSampleRate ()Ljava/lang/Double;
 	public fun getProfilesSampler ()Lio/sentry/SentryOptions$ProfilesSamplerCallback;
 	public fun getProfilingTracesDirPath ()Ljava/lang/String;
@@ -3530,6 +3537,7 @@ public class io/sentry/SentryOptions {
 	public fun setPrintUncaughtStackTrace (Z)V
 	public fun setProfileLifecycle (Lio/sentry/ProfileLifecycle;)V
 	public fun setProfileSessionSampleRate (Ljava/lang/Double;)V
+	public fun setProfilerConverter (Lio/sentry/IProfileConverter;)V
 	public fun setProfilesSampleRate (Ljava/lang/Double;)V
 	public fun setProfilesSampler (Lio/sentry/SentryOptions$ProfilesSamplerCallback;)V
 	public fun setProfilingTracesDirPath (Ljava/lang/String;)V

sentry/src/main/java/io/sentry/NoOpProfileConverter.java

@@ -0,0 +1,21 @@
+package io.sentry;
+
+import io.sentry.protocol.profiling.SentryProfile;
+import java.io.IOException;
+import org.jetbrains.annotations.NotNull;
+
+public final class NoOpProfileConverter implements IProfileConverter {
+
+  private static final NoOpProfileConverter instance = new NoOpProfileConverter();
+
+  private NoOpProfileConverter() {}
+
+  public static NoOpProfileConverter getInstance() {
+    return instance;
+  }
+
+  @Override
+  public @NotNull SentryProfile convertFromFile(@NotNull String jfrFilePath) throws IOException {
+    return new SentryProfile();
+  }
+}

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

@@ -717,6 +717,11 @@ private static void initJvmContinuousProfiling(@NotNull SentryOptions options) {
                 options.getExecutorService());
 
         options.setContinuousProfiler(continuousProfiler);
+
+        final IProfileConverter profileConverter = ProfilingServiceLoader.loadProfileConverter();
+        if (profileConverter != null) {
+          options.setProfilerConverter(profileConverter);
+        }
       } catch (Exception e) {
         options
             .getLogger()

sentry/src/main/java/io/sentry/SentryClient.java

@@ -983,7 +983,8 @@ public void captureSession(final @NotNull Session session, final @Nullable Hint
           new SentryEnvelope(
               new SentryEnvelopeHeader(sentryId, options.getSdkVersion(), null),
               Collections.singletonList(
-                  SentryEnvelopeItem.fromProfileChunk(profileChunk, options.getSerializer())));
+                  SentryEnvelopeItem.fromProfileChunk(
+                      profileChunk, options.getSerializer(), options.getProfilerConverter())));
       sentryId = sendEnvelope(envelope, null);
     } catch (IOException | SentryEnvelopeException e) {
       options

sentry/src/main/java/io/sentry/SentryEnvelopeItem.java

@@ -6,7 +6,6 @@
 
 import io.sentry.clientreport.ClientReport;
 import io.sentry.exception.SentryEnvelopeException;
-import io.sentry.profiling.ProfilingServiceLoader;
 import io.sentry.protocol.SentryTransaction;
 import io.sentry.protocol.profiling.SentryProfile;
 import io.sentry.util.FileUtils;
@@ -283,6 +282,15 @@ private static void ensureAttachmentSizeLimit(
       final @NotNull ProfileChunk profileChunk, final @NotNull ISerializer serializer)
       throws SentryEnvelopeException {
 
+    return fromProfileChunk(profileChunk, serializer, NoOpProfileConverter.getInstance());
+  }
+
+  public static @NotNull SentryEnvelopeItem fromProfileChunk(
+      final @NotNull ProfileChunk profileChunk,
+      final @NotNull ISerializer serializer,
+      final @NotNull IProfileConverter profileConverter)
+      throws SentryEnvelopeException {
+
     final @NotNull File traceFile = profileChunk.getTraceFile();
     // Using CachedItem, so we read the trace file in the background
     final CachedItem cachedItem =
@@ -296,9 +304,7 @@ private static void ensureAttachmentSizeLimit(
               }
 
               if (ProfileChunk.PLATFORM_JAVA.equals(profileChunk.getPlatform())) {
-                final IProfileConverter profileConverter =
-                    ProfilingServiceLoader.loadProfileConverter();
-                if (profileConverter != null) {
+                if (!NoOpProfileConverter.getInstance().equals(profileConverter)) {
                   try {
                     final SentryProfile profile =
                         profileConverter.convertFromFile(traceFile.getAbsolutePath());

sentry/src/main/java/io/sentry/SentryOptions.java

@@ -387,6 +387,9 @@ public class SentryOptions {
   /** Profiler that runs continuously until stopped. */
   private @NotNull IContinuousProfiler continuousProfiler = NoOpContinuousProfiler.getInstance();
 
+  /** Profiler that runs continuously until stopped. */
+  private @NotNull IProfileConverter profilerConverter = NoOpProfileConverter.getInstance();
+
   /**
    * Contains a list of origins to which `sentry-trace` header should be sent in HTTP integrations.
    */
@@ -604,6 +607,14 @@ public class SentryOptions {
 
   private @Nullable String profilingTracesDirPath;
 
+  public @NotNull IProfileConverter getProfilerConverter() {
+    return profilerConverter;
+  }
+
+  public void setProfilerConverter(@NotNull IProfileConverter profilerConverter) {
+    this.profilerConverter = profilerConverter;
+  }
+
   /**
    * Configuration options for Sentry Build Distribution. NOTE: Ideally this would be in
    * SentryAndroidOptions, but there's a circular dependency issue between sentry-android-core and

sentry/src/main/java/io/sentry/profiling/JavaProfileConverterProvider.java

@@ -2,7 +2,7 @@
 
 import io.sentry.IProfileConverter;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Service provider interface for creating profile converters.
@@ -18,6 +18,6 @@ public interface JavaProfileConverterProvider {
    *
    * @return a profile converter instance, or null if the provider cannot create one
    */
-  @Nullable
+  @NotNull
   IProfileConverter getProfileConverter();
 }

sentry/src/main/java/io/sentry/profiling/ProfilingServiceLoader.java

@@ -5,6 +5,7 @@
 import io.sentry.IProfileConverter;
 import io.sentry.ISentryExecutorService;
 import io.sentry.NoOpContinuousProfiler;
+import io.sentry.NoOpProfileConverter;
 import io.sentry.ScopesAdapter;
 import io.sentry.SentryLevel;
 import java.util.Iterator;
@@ -51,7 +52,7 @@ public final class ProfilingServiceLoader {
    *
    * @return an IProfileConverter instance or null if no provider is found
    */
-  public static @Nullable IProfileConverter loadProfileConverter() {
+  public static @NotNull IProfileConverter loadProfileConverter() {
     ILogger logger = ScopesAdapter.getInstance().getGlobalScope().getOptions().getLogger();
     try {
       JavaProfileConverterProvider provider =
@@ -63,12 +64,16 @@ public final class ProfilingServiceLoader {
             provider.getClass().getName());
         return provider.getProfileConverter();
       } else {
-        logger.log(SentryLevel.DEBUG, "No profile converter provider found, returning null");
-        return null;
+        logger.log(
+            SentryLevel.DEBUG, "No profile converter provider found, using NoOpProfileConverter");
+        return NoOpProfileConverter.getInstance();
       }
     } catch (Throwable t) {
-      logger.log(SentryLevel.ERROR, "Failed to load profile converter provider, returning null", t);
-      return null;
+      logger.log(
+          SentryLevel.ERROR,
+          "Failed to load profile converter provider, using NoOpProfileConverter",
+          t);
+      return NoOpProfileConverter.getInstance();
     }
   }
 

sentry/src/test/java/io/sentry/profiling/ProfilingServiceLoaderTest.kt

@@ -28,7 +28,7 @@ class ProfilingServiceLoaderTest {
 }
 
 class JavaProfileConverterProviderStub : JavaProfileConverterProvider {
-  override fun getProfileConverter(): IProfileConverter? {
+  override fun getProfileConverter(): IProfileConverter {
     return ProfileConverterStub()
   }
 }