Merge branch 'main' into rz/ref/capturer-main-thread

Author: romtsn

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## 8.18.0
 
 ### Features
 

gradle.properties

@@ -11,7 +11,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 android.useAndroidX=true
 
 # Release information
-versionName=8.17.0
+versionName=8.18.0
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

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/api/sentry.api

@@ -4719,8 +4719,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;
@@ -73,18 +70,18 @@ public void readManifestFiles() {
               final @Nullable String otelVersion =
                   mainAttributes.getValue("Sentry-Opentelemetry-Version-Name");
               if (otelVersion != null) {
-                versionInfo.packages.add(
-                    new SentryPackage("maven:io.opentelemetry:opentelemetry-sdk", otelVersion));
-                versionInfo.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) {
-                versionInfo.packages.add(
-                    new SentryPackage(
+                SentryIntegrationPackageStorage.getInstance()
+                    .addPackage(
                         "maven:io.opentelemetry.javaagent:opentelemetry-javaagent",
-                        otelJavaagentVersion));
-                versionInfo.integrations.add("OpenTelemetry-Agent");
+                        otelJavaagentVersion);
+                SentryIntegrationPackageStorage.getInstance().addIntegration("OpenTelemetry-Agent");
               }
               if (name.equals("sentry.java.opentelemetry.agentless")) {
                 SentryIntegrationPackageStorage.getInstance()
@@ -117,8 +114,6 @@ public void readManifestFiles() {
   public static final class VersionInfoHolder {
     private volatile @Nullable String sdkName;
     private volatile @Nullable String sdkVersion;
-    private List<SentryPackage> packages = new ArrayList<>();
-    private List<String> integrations = new ArrayList<>();
 
     public @Nullable String getSdkName() {
       return sdkName;
@@ -127,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;
-    }
   }
 }