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

Replace static util class with JarDetails #24

Merged
merged 2 commits into from
Sep 28, 2023
Merged

Replace static util class with JarDetails #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d549c9
Replace static util class with JarDetails
tylerbenson Jul 27, 2023
100dc45
Code review changes
tylerbenson Sep 28, 2023
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
57 changes: 22 additions & 35 deletions ...ain/java/io/opentelemetry/instrumentation/javaagent/runtimemetrics/java8/JarAnalyzer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,8 @@

package io.opentelemetry.instrumentation.javaagent.runtimemetrics.java8;

import static io.opentelemetry.instrumentation.javaagent.runtimemetrics.java8.JarAnalyzerUtil.addPackageChecksum;
import static io.opentelemetry.instrumentation.javaagent.runtimemetrics.java8.JarAnalyzerUtil.addPackageDescription;
import static io.opentelemetry.instrumentation.javaagent.runtimemetrics.java8.JarAnalyzerUtil.addPackageNameAndVersion;
import static io.opentelemetry.instrumentation.javaagent.runtimemetrics.java8.JarAnalyzerUtil.addPackagePath;
import static io.opentelemetry.instrumentation.javaagent.runtimemetrics.java8.JarAnalyzerUtil.addPackageType;

import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.common.Attributes;
import io.opentelemetry.api.common.AttributesBuilder;
import io.opentelemetry.api.events.EventEmitter;
Expand Down Expand Up @@ -46,6 +41,15 @@ final class JarAnalyzer implements ClassFileTransformer {
private static final String WAR_EXTENSION = ".war";
private static final String EVENT_DOMAIN_PACKAGE = "package";
private static final String EVENT_NAME_INFO = "info";
static final AttributeKey<String> PACKAGE_NAME = AttributeKey.stringKey("package.name");
static final AttributeKey<String> PACKAGE_VERSION = AttributeKey.stringKey("package.version");
static final AttributeKey<String> PACKAGE_TYPE = AttributeKey.stringKey("package.type");
static final AttributeKey<String> PACKAGE_DESCRIPTION =
AttributeKey.stringKey("package.description");
static final AttributeKey<String> PACKAGE_CHECKSUM = AttributeKey.stringKey("package.checksum");
static final AttributeKey<String> PACKAGE_CHECKSUM_ALGORITHM =
AttributeKey.stringKey("package.checksum_algorithm");
static final AttributeKey<String> PACKAGE_PATH = AttributeKey.stringKey("package.path");

private final Set<URI> seenUris = new HashSet<>();
private final BlockingQueue<URL> toProcess = new LinkedBlockingDeque<>();
Expand Down Expand Up @@ -172,39 +176,22 @@ public void run() {
* content.
*/
static void processUrl(EventEmitter eventEmitter, URL archiveUrl) {
AttributesBuilder builder = Attributes.builder();

try {
addPackageType(builder, archiveUrl);
} catch (Exception e) {
logger.log(Level.WARNING, "Error adding package type for archive URL: {0}" + archiveUrl, e);
}

try {
addPackageChecksum(builder, archiveUrl);
} catch (Exception e) {
logger.log(Level.WARNING, "Error adding package checksum for archive URL: " + archiveUrl, e);
}

try {
addPackagePath(builder, archiveUrl);
} catch (Exception e) {
logger.log(Level.WARNING, "Error adding package path archive URL: " + archiveUrl, e);
}

JarDetails jarDetails;
try {
addPackageDescription(builder, archiveUrl);
jarDetails = JarDetails.forUrl(archiveUrl);
} catch (Exception e) {
logger.log(
Level.WARNING, "Error adding package description for archive URL: " + archiveUrl, e);
logger.log(Level.WARNING, "Error reading package for archive URL: {0}" + archiveUrl, e);
return;
}
AttributesBuilder builder = Attributes.builder();

try {
addPackageNameAndVersion(builder, archiveUrl);
} catch (Exception e) {
logger.log(
Level.WARNING, "Error adding package name and version for archive URL: " + archiveUrl, e);
}
builder.put(PACKAGE_PATH, jarDetails.packagePath());
builder.put(PACKAGE_TYPE, jarDetails.packageType());
builder.put(PACKAGE_NAME, jarDetails.packageName());
builder.put(PACKAGE_VERSION, jarDetails.version());
builder.put(PACKAGE_DESCRIPTION, jarDetails.packageDescription());
builder.put(PACKAGE_CHECKSUM, jarDetails.computeSha1());
builder.put(PACKAGE_CHECKSUM_ALGORITHM, "SHA1");

eventEmitter.emit(EVENT_NAME_INFO, builder.build());
}
Expand Down
183 changes: 0 additions & 183 deletions ...java/io/opentelemetry/instrumentation/javaagent/runtimemetrics/java8/JarAnalyzerUtil.java
View file
Open in desktop

This file was deleted.

Loading