Skip to content
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

Jump to bottom

Avoid opening jar files before checking in pom is available #5271

Merged
merged 1 commit into from
May 26, 2023
Merged

Avoid opening jar files before checking in pom is available #5271

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: 6 additions & 5 deletions telemetry/src/main/java/datadog/telemetry/dependency/DependencyResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,17 +75,18 @@ static List<Dependency> extractDependenciesFromJar(File jar) {
}

List<Dependency> dependencies = Collections.emptyList();
try (JarFile file = new JarFile(jar, false /* no verify */);
InputStream is = Files.newInputStream(jar.toPath())) {
try (JarFile file = new JarFile(jar, false /* no verify */)) {

// Try to get from maven properties
dependencies = Dependency.fromMavenPom(file);

// Try to guess from manifest or file name
if (dependencies.isEmpty()) {
Manifest manifest = file.getManifest();
dependencies =
Collections.singletonList(Dependency.guessFallbackNoPom(manifest, jar.getName(), is));
try (InputStream is = Files.newInputStream(jar.toPath())) {
Manifest manifest = file.getManifest();
dependencies =
Collections.singletonList(Dependency.guessFallbackNoPom(manifest, jar.getName(), is));
}
}
} catch (IOException e) {
log.debug("unable to read jar file {}", jar, e);
Expand Down