Add Spring Boot service version finder / ResourceProvider #9480
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
laurit
reviewed
Sep 18, 2023
...java/io/opentelemetry/instrumentation/spring/resources/SpringBootServiceVersionDetector.java
Show resolved
Hide resolved
|
Could you also add a smoke test for this similarly to 20230920.6251727205 (if I didn't mess anything up that version should contain the build-info.properties)
|
| InputStream openClasspathResource(String filename, String location) { | ||
| String path = location + "/" + filename; | ||
| return classLoader.getResourceAsStream(path); | ||
| } |
There was a problem hiding this comment.
Now that the SystemHelper is used in two classes, WDYT about making it a top-level class?
| } | ||
|
|
||
| // Exists for testing | ||
| public SpringBootServiceVersionDetector(SystemHelper system) { |
There was a problem hiding this comment.
Suggested change
| public SpringBootServiceVersionDetector(SystemHelper system) { | |
| SpringBootServiceVersionDetector(SystemHelper system) { |
| } | ||
|
|
||
| private Optional<String> getServiceVersionFromBuildInfo() { | ||
| try (InputStream in = system.openClasspathResource("build-info.properties", "META-INF")) { |
There was a problem hiding this comment.
I think putting "META-INF" first makes more sense, since it's a directory that contains the build info file
Suggested change
| try (InputStream in = system.openClasspathResource("build-info.properties", "META-INF")) { | |
| try (InputStream in = system.openClasspathResource("META-INF", "build-info.properties")) { |
laurit
approved these changes
Sep 21, 2023
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.
No description provided.