Make it possible to register multiple helper resources under the same… #5703
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
conventions/src/main/kotlin/io.opentelemetry.instrumentation.javaagent-testing.gradle.kts
Outdated
Show resolved
Hide resolved
Comment on lines
-64
to
-69
| extensions.addAll( | ||
| parseLocation( | ||
| System.getProperty( | ||
| "otel.javaagent.experimental.initializer.jar", | ||
| System.getenv("OTEL_JAVAAGENT_EXPERIMENTAL_INITIALIZER_JAR")), | ||
| javaagentFile)); |
There was a problem hiding this comment.
This property is already handled by the AgentClassLoader -- the jar it points to end up being added directly to the agent CL. Loading it as an extension just adds another copy of these classes.
trask
approved these changes
Mar 29, 2022
Comment on lines
+36
to
+38
| resourceUrls.size() == 2 | ||
| resourceUrls.get(0).openStream().text.trim() == 'Hello world!' | ||
| resourceUrls.get(1).openStream().text.trim() == 'Hello there' |
Comment on lines
179
to
183
| URL resource = helpersSource.getResource(helperResource.getAgentPath()); | ||
| if (resource == null) { | ||
| Enumeration<URL> resources; | ||
| try { | ||
| resources = helpersSource.getResources(helperResource.getAgentPath()); | ||
| } catch (IOException e) { |
There was a problem hiding this comment.
I don't think I've ever noticed that getResources throws IOException but getResource doesn't
There was a problem hiding this comment.
Yeah, I was surprised by that too
| } | ||
|
|
||
| private static boolean containsSameFile(List<URL> haystack, URL needle) { | ||
| for (URL r : haystack) { |
There was a problem hiding this comment.
(just kidding 😄)
Suggested change
| for (URL r : haystack) { | |
| for (URL hayOrNeedle : haystack) { |
javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/HelperResources.java
Outdated
Show resolved
Hide resolved
javaagent-bootstrap/src/main/java/io/opentelemetry/javaagent/bootstrap/HelperResources.java
Outdated
Show resolved
Hide resolved
RashmiRam
pushed a commit
to RashmiRam/opentelemetry-auto-instr-java
that referenced
this pull request
May 23, 2022
open-telemetry#5703) * Make it possible to register multiple helper resources under the same name * go back to using the old property in tests after all * code review comments
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
… name
Extracted part of #5692