Merge branch 'main' into 07-29-do_not_report_cached_events_as_lost

Author: adinauer

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

@@ -7,11 +7,9 @@
 import io.opentelemetry.sdk.trace.export.BatchSpanProcessor;
 import io.sentry.InitPriority;
 import io.sentry.Sentry;
-import io.sentry.SentryIntegrationPackageStorage;
 import io.sentry.SentryOptions;
 import io.sentry.internal.ManifestVersionReader;
 import io.sentry.protocol.SdkVersion;
-import io.sentry.protocol.SentryPackage;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
@@ -46,15 +44,6 @@ public void customize(AutoConfigurationCustomizer autoConfiguration) {
           });
     }
 
-    if (versionInfoHolder != null) {
-      for (SentryPackage pkg : versionInfoHolder.getPackages()) {
-        SentryIntegrationPackageStorage.getInstance().addPackage(pkg.getName(), pkg.getVersion());
-      }
-      for (String integration : versionInfoHolder.getIntegrations()) {
-        SentryIntegrationPackageStorage.getInstance().addIntegration(integration);
-      }
-    }
-
     autoConfiguration
         .addTracerProviderCustomizer(this::configureSdkTracerProvider)
         .addPropertiesSupplier(this::getDefaultProperties);

sentry-opentelemetry/sentry-opentelemetry-agentless-spring/build.gradle.kts

@@ -30,6 +30,8 @@ buildConfig {
 tasks.jar {
   manifest {
     attributes(
+      "Sentry-Opentelemetry-SDK-Name" to
+        Config.Sentry.SENTRY_OPENTELEMETRY_AGENTLESS_SPRING_SDK_NAME,
       "Sentry-Version-Name" to project.version,
       "Sentry-SDK-Name" to Config.Sentry.SENTRY_OPENTELEMETRY_AGENTLESS_SPRING_SDK_NAME,
       "Sentry-SDK-Package-Name" to "maven:io.sentry:sentry-opentelemetry-agentless-spring",

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

@@ -28,6 +28,7 @@ buildConfig {
 tasks.jar {
   manifest {
     attributes(
+      "Sentry-Opentelemetry-SDK-Name" to Config.Sentry.SENTRY_OPENTELEMETRY_AGENTLESS_SDK_NAME,
       "Sentry-Version-Name" to project.version,
       "Sentry-SDK-Name" to Config.Sentry.SENTRY_OPENTELEMETRY_AGENTLESS_SDK_NAME,
       "Sentry-SDK-Package-Name" to "maven:io.sentry:sentry-opentelemetry-agentless",

sentry/api/sentry.api

@@ -4720,8 +4720,6 @@ public final class io/sentry/internal/ManifestVersionReader {
 
 public final class io/sentry/internal/ManifestVersionReader$VersionInfoHolder {
 	public fun <init> ()V
-	public fun getIntegrations ()Ljava/util/List;
-	public fun getPackages ()Ljava/util/List;
 	public fun getSdkName ()Ljava/lang/String;
 	public fun getSdkVersion ()Ljava/lang/String;
 }

sentry/src/main/java/io/sentry/internal/ManifestVersionReader.java

@@ -2,13 +2,10 @@
 
 import io.sentry.ISentryLifecycleToken;
 import io.sentry.SentryIntegrationPackageStorage;
-import io.sentry.protocol.SentryPackage;
 import io.sentry.util.AutoClosableReentrantLock;
 import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
 import java.util.Enumeration;
-import java.util.List;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 import org.jetbrains.annotations.ApiStatus;
@@ -21,7 +18,7 @@ public final class ManifestVersionReader {
   private static final @NotNull AutoClosableReentrantLock staticLock =
       new AutoClosableReentrantLock();
   private volatile boolean hasManifestBeenRead = false;
-  private volatile @Nullable VersionInfoHolder versionInfo = null;
+  private final @NotNull VersionInfoHolder versionInfo = new VersionInfoHolder();
   private @NotNull AutoClosableReentrantLock lock = new AutoClosableReentrantLock();
 
   public static @NotNull ManifestVersionReader getInstance() {
@@ -40,6 +37,9 @@ private ManifestVersionReader() {}
 
   public @Nullable VersionInfoHolder readOpenTelemetryVersion() {
     readManifestFiles();
+    if (versionInfo.sdkVersion == null) {
+      return null;
+    }
     return versionInfo;
   }
 
@@ -48,7 +48,6 @@ public void readManifestFiles() {
       return;
     }
 
-    @Nullable VersionInfoHolder infoHolder = null;
     try (final @NotNull ISentryLifecycleToken ignored = lock.acquire()) {
       if (hasManifestBeenRead) {
         return;
@@ -66,28 +65,32 @@ public void readManifestFiles() {
             final @Nullable String packageName = mainAttributes.getValue("Sentry-SDK-Package-Name");
 
             if (name != null && version != null) {
-              infoHolder = new VersionInfoHolder();
-              infoHolder.sdkName = name;
-              infoHolder.sdkVersion = version;
-              infoHolder.packages.add(
-                  new SentryPackage("maven:io.sentry:sentry-opentelemetry-agent", version));
+              versionInfo.sdkName = name;
+              versionInfo.sdkVersion = version;
               final @Nullable String otelVersion =
                   mainAttributes.getValue("Sentry-Opentelemetry-Version-Name");
               if (otelVersion != null) {
-                infoHolder.packages.add(
-                    new SentryPackage("maven:io.opentelemetry:opentelemetry-sdk", otelVersion));
-                infoHolder.integrations.add("OpenTelemetry");
+                SentryIntegrationPackageStorage.getInstance()
+                    .addPackage("maven:io.opentelemetry:opentelemetry-sdk", otelVersion);
+                SentryIntegrationPackageStorage.getInstance().addIntegration("OpenTelemetry");
               }
               final @Nullable String otelJavaagentVersion =
                   mainAttributes.getValue("Sentry-Opentelemetry-Javaagent-Version-Name");
               if (otelJavaagentVersion != null) {
-                infoHolder.packages.add(
-                    new SentryPackage(
+                SentryIntegrationPackageStorage.getInstance()
+                    .addPackage(
                         "maven:io.opentelemetry.javaagent:opentelemetry-javaagent",
-                        otelJavaagentVersion));
-                infoHolder.integrations.add("OpenTelemetry-Agent");
+                        otelJavaagentVersion);
+                SentryIntegrationPackageStorage.getInstance().addIntegration("OpenTelemetry-Agent");
+              }
+              if (name.equals("sentry.java.opentelemetry.agentless")) {
+                SentryIntegrationPackageStorage.getInstance()
+                    .addIntegration("OpenTelemetry-Agentless");
+              }
+              if (name.equals("sentry.java.opentelemetry.agentless-spring")) {
+                SentryIntegrationPackageStorage.getInstance()
+                    .addIntegration("OpenTelemetry-Agentless-Spring");
               }
-              break;
             }
 
             if (sdkName != null
@@ -105,15 +108,12 @@ public void readManifestFiles() {
       // ignore
     } finally {
       hasManifestBeenRead = true;
-      versionInfo = infoHolder;
     }
   }
 
   public static final class VersionInfoHolder {
-    private @Nullable String sdkName;
-    private @Nullable String sdkVersion;
-    private List<SentryPackage> packages = new ArrayList<>();
-    private List<String> integrations = new ArrayList<>();
+    private volatile @Nullable String sdkName;
+    private volatile @Nullable String sdkVersion;
 
     public @Nullable String getSdkName() {
       return sdkName;
@@ -122,13 +122,5 @@ public static final class VersionInfoHolder {
     public @Nullable String getSdkVersion() {
       return sdkVersion;
     }
-
-    public List<SentryPackage> getPackages() {
-      return packages;
-    }
-
-    public List<String> getIntegrations() {
-      return integrations;
-    }
   }
 }