Skip to content

Commit 564f05e

Browse files
authored
fix(core): Disable manifest URL caching when reading versions (JAVA-730) (#6124)
ManifestVersionReader was retaining jar-backed inflater state while scanning META-INF/MANIFEST.MF entries. Disable URL caching for those reads and close the stream after parsing.
1 parent b4d1330 commit 564f05e

2 files changed

Lines changed: 56 additions & 39 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## Unreleased
4+
5+
### Fixes
6+
7+
- Disable URL caching when reading `META-INF/MANIFEST.MF` files during version detection so that the SDK no longer keeps jar file handles open for the life of the process ([#6124](https://github.com/getsentry/sentry-java/pull/6124)
8+
39
## 8.57.0
410

511
### Behavioral Changes

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

Lines changed: 50 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
import io.sentry.SentryIntegrationPackageStorage;
55
import io.sentry.util.AutoClosableReentrantLock;
66
import java.io.IOException;
7+
import java.io.InputStream;
78
import java.net.URL;
9+
import java.net.URLConnection;
810
import java.util.Enumeration;
911
import java.util.jar.Attributes;
1012
import java.util.jar.Manifest;
@@ -56,48 +58,57 @@ public void readManifestFiles() {
5658
ClassLoader.getSystemClassLoader().getResources("META-INF/MANIFEST.MF");
5759
while (resources.hasMoreElements()) {
5860
try {
59-
final @NotNull Manifest manifest = new Manifest(resources.nextElement().openStream());
60-
final @Nullable Attributes mainAttributes = manifest.getMainAttributes();
61-
if (mainAttributes != null) {
62-
final @Nullable String name = mainAttributes.getValue("Sentry-Opentelemetry-SDK-Name");
63-
final @Nullable String version = mainAttributes.getValue("Implementation-Version");
64-
final @Nullable String sdkName = mainAttributes.getValue("Sentry-SDK-Name");
65-
final @Nullable String packageName = mainAttributes.getValue("Sentry-SDK-Package-Name");
61+
final @NotNull URLConnection connection = resources.nextElement().openConnection();
62+
// Disable caches to avoid leaking jar-backed inflater state.
63+
connection.setUseCaches(false);
6664

67-
if (name != null && version != null) {
68-
versionInfo.sdkName = name;
69-
versionInfo.sdkVersion = version;
70-
final @Nullable String otelVersion =
71-
mainAttributes.getValue("Sentry-Opentelemetry-Version-Name");
72-
if (otelVersion != null) {
73-
SentryIntegrationPackageStorage.getInstance()
74-
.addPackage("maven:io.opentelemetry:opentelemetry-sdk", otelVersion);
75-
SentryIntegrationPackageStorage.getInstance().addIntegration("OpenTelemetry");
76-
}
77-
final @Nullable String otelJavaagentVersion =
78-
mainAttributes.getValue("Sentry-Opentelemetry-Javaagent-Version-Name");
79-
if (otelJavaagentVersion != null) {
80-
SentryIntegrationPackageStorage.getInstance()
81-
.addPackage(
82-
"maven:io.opentelemetry.javaagent:opentelemetry-javaagent",
83-
otelJavaagentVersion);
84-
SentryIntegrationPackageStorage.getInstance().addIntegration("OpenTelemetry-Agent");
85-
}
86-
if (name.equals("sentry.java.opentelemetry.agentless")) {
87-
SentryIntegrationPackageStorage.getInstance()
88-
.addIntegration("OpenTelemetry-Agentless");
89-
}
90-
if (name.equals("sentry.java.opentelemetry.agentless-spring")) {
91-
SentryIntegrationPackageStorage.getInstance()
92-
.addIntegration("OpenTelemetry-Agentless-Spring");
65+
try (final @NotNull InputStream inputStream = connection.getInputStream()) {
66+
final @NotNull Manifest manifest = new Manifest(inputStream);
67+
final @Nullable Attributes mainAttributes = manifest.getMainAttributes();
68+
if (mainAttributes != null) {
69+
final @Nullable String name =
70+
mainAttributes.getValue("Sentry-Opentelemetry-SDK-Name");
71+
final @Nullable String version = mainAttributes.getValue("Implementation-Version");
72+
final @Nullable String sdkName = mainAttributes.getValue("Sentry-SDK-Name");
73+
final @Nullable String packageName =
74+
mainAttributes.getValue("Sentry-SDK-Package-Name");
75+
76+
if (name != null && version != null) {
77+
versionInfo.sdkName = name;
78+
versionInfo.sdkVersion = version;
79+
final @Nullable String otelVersion =
80+
mainAttributes.getValue("Sentry-Opentelemetry-Version-Name");
81+
if (otelVersion != null) {
82+
SentryIntegrationPackageStorage.getInstance()
83+
.addPackage("maven:io.opentelemetry:opentelemetry-sdk", otelVersion);
84+
SentryIntegrationPackageStorage.getInstance().addIntegration("OpenTelemetry");
85+
}
86+
final @Nullable String otelJavaagentVersion =
87+
mainAttributes.getValue("Sentry-Opentelemetry-Javaagent-Version-Name");
88+
if (otelJavaagentVersion != null) {
89+
SentryIntegrationPackageStorage.getInstance()
90+
.addPackage(
91+
"maven:io.opentelemetry.javaagent:opentelemetry-javaagent",
92+
otelJavaagentVersion);
93+
SentryIntegrationPackageStorage.getInstance()
94+
.addIntegration("OpenTelemetry-Agent");
95+
}
96+
if (name.equals("sentry.java.opentelemetry.agentless")) {
97+
SentryIntegrationPackageStorage.getInstance()
98+
.addIntegration("OpenTelemetry-Agentless");
99+
}
100+
if (name.equals("sentry.java.opentelemetry.agentless-spring")) {
101+
SentryIntegrationPackageStorage.getInstance()
102+
.addIntegration("OpenTelemetry-Agentless-Spring");
103+
}
93104
}
94-
}
95105

96-
if (sdkName != null
97-
&& version != null
98-
&& packageName != null
99-
&& sdkName.startsWith("sentry.java")) {
100-
SentryIntegrationPackageStorage.getInstance().addPackage(packageName, version);
106+
if (sdkName != null
107+
&& version != null
108+
&& packageName != null
109+
&& sdkName.startsWith("sentry.java")) {
110+
SentryIntegrationPackageStorage.getInstance().addPackage(packageName, version);
111+
}
101112
}
102113
}
103114
} catch (Exception e) {

0 commit comments

Comments
 (0)