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.

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

Change the default javaagent artifact to have exporters #4106

Merged
merged 26 commits into from
Oct 2, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
af7a83e
Change default javaagent to all, introduce slim
trask Sep 12, 2021
d99849d
Update release builds
trask Sep 12, 2021
9c6f04f
Update examples build
trask Sep 12, 2021
9b20ff0
Update benchmark-overhead
trask Sep 12, 2021
6ea1a07
Update benchmark-e2e
trask Sep 12, 2021
6ab2c68
Update docs where ok pre-release
trask Sep 12, 2021
6e53ea0
Update misc
trask Sep 12, 2021
2a4839c
Fix references to fullJavaagentJar
trask Sep 13, 2021
64df703
Fix it
trask Sep 13, 2021
9c43849
Delete doc for pre-1.0 releases
trask Sep 13, 2021
5113576
Attach backwards compatible "all" artifact to releases
trask Sep 13, 2021
42f4830
Comment
trask Sep 13, 2021
1687020
Comment
trask Sep 13, 2021
ae7e2d1
guessing
trask Sep 13, 2021
2b9de15
fix
trask Sep 13, 2021
cc35263
Merge remote-tracking branch 'upstream/main' into change-default-java…
trask Sep 13, 2021
6cdfbce
Merge remote-tracking branch 'upstream/main' into change-default-java…
trask Sep 23, 2021
f01fbf6
Update version
trask Sep 23, 2021
e6e4e3d
Merge remote-tracking branch 'upstream/main' into change-default-java…
trask Sep 23, 2021
7b4b731
Merge remote-tracking branch 'upstream/main' into change-default-java…
trask Sep 28, 2021
73226a0
Add otlp/grpc exporter to slim artifact
trask Sep 28, 2021
f6c3a94
Merge remote-tracking branch 'upstream/main' into change-default-java…
trask Sep 28, 2021
1fa5ef6
Merge remote-tracking branch 'upstream/main' into change-default-java…
trask Sep 29, 2021
49e1aa8
Merge remote-tracking branch 'upstream/main' into change-default-java…
trask Sep 29, 2021
3db6c45
Fix comment
trask Sep 29, 2021
61ab8fd
Merge remote-tracking branch 'upstream/main' into change-default-java…
trask Sep 30, 2021
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
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ private Path downloadAgent(URL agentUrl) throws Exception {
OkHttpClient client = new OkHttpClient();
Response response = client.newCall(request).execute();
byte[] raw = response.body().bytes();
Path path = Paths.get(".", "opentelemetry-javaagent-all.jar");
Path path = Paths.get(".", "opentelemetry-javaagent.jar");
Files.write(path, raw, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING);
return path;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Optional<Path> resolve() throws IOException {
String latestFilename = fetchLatestFilename(version);
String url = BASE_URL + "/" + version + "/" + latestFilename;
byte[] jarBytes = fetchBodyBytesFrom(url);
Path path = Paths.get(".", "opentelemetry-javaagent-SNAPSHOT-all.jar");
Path path = Paths.get(".", "opentelemetry-javaagent-SNAPSHOT.jar");
Files.write(path, jarBytes, StandardOpenOption.CREATE, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING);
return Optional.of(path);
}
Expand All @@ -49,11 +49,12 @@ private String fetchLatestFilename(String version) throws IOException {
.filter(elem -> {
String classifier = $(elem).child("classifier").content();
String extension = $(elem).child("extension").content();
// TODO (trask) this needs to be updated now that no more "all" artifact
return "all".equals(classifier) && "jar".equals(extension);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@breedx-splk any idea with this change if the classifier check should be changed to "" or null?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the idea here that we'll be publishing the full agent with exporters now without the -all classifier? If so, then I think we should just remove the classifier check entirely.

It looks like you're also publishing -all for backwards compat? Assuming that's temporary, yeah, I think we'll want to remove this classifier check...but it might be nice to see what the xml looks like after the first publish to confirm.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the -all artifact will be attached to the github release for now for backwards compatibility, but won't be published.

there will be a new artifact -slim published after this tho

it might be nice to see what the xml looks like after the first publish to confirm

this works for me 👍

})
.map(e -> $(e).child("value").content())
.findFirst()
.map(value -> "opentelemetry-javaagent-" + value + "-all.jar")
.map(value -> "opentelemetry-javaagent-" + value + ".jar")
.orElseThrow();
}

Expand Down