Fix directory separator in ProcessResource attributes #6716
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
|
|
trask
reviewed
Sep 23, 2022
There was a problem hiding this comment.
thx @fcrespel! can you see if it's not too hard to add a test for this?
Note that this issue was already present in sdk-extensions-resources before it was moved here; should it be fixed there too?
cc @jack-berg
|
@trask I updated the existing tests in ProcessResourceTest to include the directory separator, is that OK for you? |
trask
reviewed
Sep 24, 2022
| @@ -29,7 +30,7 @@ void notWindows() { | |||
|
|
|||
| assertThat(attributes.get(ResourceAttributes.PROCESS_PID)).isGreaterThan(1); | |||
| assertThat(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH)) | |||
| .contains("java") | |||
| .contains(File.separatorChar + "java") | |||
There was a problem hiding this comment.
maybe something like .matches("[/\\]java")? e.g. to avoid the test verification relying on the same logic that we missed previously
There was a problem hiding this comment.
I have updated the tests accordingly.
laurit
approved these changes
Sep 26, 2022
LironKS
pushed a commit
to helios/opentelemetry-java-instrumentation
that referenced
this pull request
Oct 23, 2022
…#6716) The separator char used to build the Java executable path in ProcessResource is wrong: `File.pathSeparatorChar` is the PATH variable separator (`:` on Linux, `;` on Windows), the right one for directories is `File.separatorChar` (`/` on Linux, `\` on Windows). Note that this issue was already present in [sdk-extensions-resources](https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/resources/src/main/java/io/opentelemetry/sdk/extension/resources/ProcessResource.java#L64) before it was moved here; should it be fixed there too?
LironKS
pushed a commit
to helios/opentelemetry-java-instrumentation
that referenced
this pull request
Oct 31, 2022
…#6716) The separator char used to build the Java executable path in ProcessResource is wrong: `File.pathSeparatorChar` is the PATH variable separator (`:` on Linux, `;` on Windows), the right one for directories is `File.separatorChar` (`/` on Linux, `\` on Windows). Note that this issue was already present in [sdk-extensions-resources](https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/resources/src/main/java/io/opentelemetry/sdk/extension/resources/ProcessResource.java#L64) before it was moved here; should it be fixed there too?
LironKS
pushed a commit
to helios/opentelemetry-java-instrumentation
that referenced
this pull request
Dec 4, 2022
…#6716) The separator char used to build the Java executable path in ProcessResource is wrong: `File.pathSeparatorChar` is the PATH variable separator (`:` on Linux, `;` on Windows), the right one for directories is `File.separatorChar` (`/` on Linux, `\` on Windows). Note that this issue was already present in [sdk-extensions-resources](https://github.com/open-telemetry/opentelemetry-java/blob/main/sdk-extensions/resources/src/main/java/io/opentelemetry/sdk/extension/resources/ProcessResource.java#L64) before it was moved here; should it be fixed there too?
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.
The separator char used to build the Java executable path in ProcessResource is wrong:
File.pathSeparatorCharis the PATH variable separator (:on Linux,;on Windows), the right one for directories isFile.separatorChar(/on Linux,\on Windows).Note that this issue was already present in sdk-extensions-resources before it was moved here; should it be fixed there too?