Fix Sentry plugin

Author: LaurentTreguier

quarkus-sentry/build.gradle

@@ -5,7 +5,6 @@ subprojects {
         implementation(enforcedPlatform("io.quarkus.platform:quarkus-bom:${quarkusPlatformVersion}"))
         implementation(enforcedPlatform("io.sentry:sentry-bom:${sentryVersion}"))
         implementation("io.quarkus:quarkus-opentelemetry")
-        implementation("io.sentry:sentry-opentelemetry-core")
         annotationProcessor("io.quarkus:quarkus-extension-processor")
     }
 }

quarkus-sentry/deployment/build.gradle

@@ -10,5 +10,6 @@ dependencies {
     implementation("io.quarkus:quarkus-core-deployment")
     implementation("io.quarkus:quarkus-opentelemetry-deployment")
     implementation("io.quarkus:quarkus-rest-deployment")
+    implementation("io.sentry:sentry-opentelemetry-bootstrap")
     implementation(project(":quarkus-sentry:runtime"))
 }

quarkus-sentry/deployment/src/main/java/app/fyreplace/api/sentry/processors/SentryProcessor.java

@@ -1,15 +1,16 @@
 package app.fyreplace.api.sentry.processors;
 
-import app.fyreplace.api.sentry.beans.SentrySpanProcessorProducer;
 import app.fyreplace.api.sentry.config.SentryConfig;
 import app.fyreplace.api.sentry.recorders.SentryRecorder;
-import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.LogHandlerBuildItem;
+import io.quarkus.deployment.builditem.SystemPropertyBuildItem;
+import io.sentry.opentelemetry.SentryContextStorageProvider;
 
+@SuppressWarnings("unused")
 public final class SentryProcessor {
     private static final String FEATURE = "sentry";
 
@@ -19,15 +20,19 @@ FeatureBuildItem feature() {
     }
 
     @BuildStep
-    @Record(ExecutionTime.RUNTIME_INIT)
-    LogHandlerBuildItem addSentryHandler(final SentryConfig config, final SentryRecorder recorder) {
-        return new LogHandlerBuildItem(recorder.create(config));
+    SystemPropertyBuildItem setOtelAutoConfigure() {
+        return new SystemPropertyBuildItem("otel.java.global-autoconfigure.enabled", "true");
     }
 
     @BuildStep
-    AdditionalBeanBuildItem addSentrySpanProcessorProducer() {
-        return AdditionalBeanBuildItem.builder()
-                .addBeanClass(SentrySpanProcessorProducer.class)
-                .build();
+    SystemPropertyBuildItem setContextStorageProvider() {
+        return new SystemPropertyBuildItem(
+                "io.opentelemetry.context.contextStorageProvider", SentryContextStorageProvider.class.getCanonicalName());
+    }
+
+    @BuildStep
+    @Record(ExecutionTime.RUNTIME_INIT)
+    LogHandlerBuildItem addSentryHandler(final SentryConfig config, final SentryRecorder recorder) {
+        return new LogHandlerBuildItem(recorder.create(config));
     }
 }

quarkus-sentry/runtime/build.gradle

@@ -7,13 +7,10 @@ repositories {
 }
 
 dependencies {
+    implementation("io.opentelemetry.instrumentation:opentelemetry-jdbc")
     implementation("io.quarkus:quarkus-arc")
     implementation("io.quarkus:quarkus-core")
     implementation("io.quarkus:quarkus-rest")
     implementation("io.sentry:sentry-jul")
-    implementation("io.opentelemetry.instrumentation:opentelemetry-jdbc")
-}
-
-quarkusExtension {
-    deploymentModule = ":quarkus-sentry:deployment"
+    implementation("io.sentry:sentry-opentelemetry-agentless")
 }

quarkus-sentry/runtime/src/main/java/app/fyreplace/api/sentry/beans/SentrySpanProcessorProducer.java

@@ -3,11 +3,9 @@
 import app.fyreplace.api.sentry.config.SentryConfig;
 import io.quarkus.runtime.RuntimeValue;
 import io.quarkus.runtime.annotations.Recorder;
-import io.sentry.Instrumenter;
 import io.sentry.Sentry;
 import io.sentry.SentryOptions;
 import io.sentry.jul.SentryHandler;
-import io.sentry.opentelemetry.OpenTelemetryLinkErrorEventProcessor;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Handler;
@@ -32,8 +30,6 @@ public RuntimeValue<Optional<Handler>> create(final SentryConfig sentryConfig) {
             sentryConfig.tracesSampleRate().ifPresent(it::setTracesSampleRate);
             it.setRelease(appName + '@' + appVersion);
             it.addInAppInclude("app.fyreplace.api");
-            it.setInstrumenter(Instrumenter.OTEL);
-            it.addEventProcessor(new OpenTelemetryLinkErrorEventProcessor());
             options.set(it);
         });