Skip to content

Remove indirection for integrations and packages via VersionInfoHolder #4578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 30, 2025
Merged

Remove indirection for integrations and packages via VersionInfoHolder #4578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions ...tion/src/main/java/io/sentry/opentelemetry/SentryAutoConfigurationCustomizerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions sentry/api/sentry.api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
27 changes: 7 additions & 20 deletions sentry/src/main/java/io/sentry/internal/ManifestVersionReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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;
Expand All @@ -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;
}
}
}
Loading