open-telemetry
/
opentelemetry-java
mirror of https://github.com/open-telemetry/opentelemetry-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ProcessResource directory separator (#4782) 

* Fix ProcessResource directory separator

* spotless
This commit is contained in:
jack-berg 2022-10-01 09:56:15 -05:00 committed by GitHub
parent e1519bdd3d
commit 3ee7bbd165
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk-extensions/resources/src/main/java/io/opentelemetry/sdk/extension/resources/ProcessResource.java
View File

@ -67,9 +67,9 @@ public final class ProcessResource {
if (javaHome != null) { if (javaHome != null) {
StringBuilder executablePath = new StringBuilder(javaHome); StringBuilder executablePath = new StringBuilder(javaHome);
executablePath executablePath
.append(File.pathSeparatorChar) .append(File.separatorChar)
.append("bin") .append("bin")
.append(File.pathSeparatorChar) .append(File.separatorChar)
.append("java"); .append("java");
if (osName != null && osName.toLowerCase().startsWith("windows")) { if (osName != null && osName.toLowerCase().startsWith("windows")) {
executablePath.append(".exe"); executablePath.append(".exe");

7
sdk-extensions/resources/src/test/java/io/opentelemetry/sdk/extension/resources/ProcessResourceTest.java
View File

@ -29,9 +29,7 @@ class ProcessResourceTest {
Attributes attributes = resource.getAttributes(); Attributes attributes = resource.getAttributes();
assertThat(attributes.get(ResourceAttributes.PROCESS_PID)).isGreaterThan(1); assertThat(attributes.get(ResourceAttributes.PROCESS_PID)).isGreaterThan(1);
assertThat(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH)) assertThat(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH)).matches(".*[/\\\\]java");
.contains("java")
.doesNotEndWith(".exe");
assertThat(attributes.get(ResourceAttributes.PROCESS_COMMAND_LINE)) assertThat(attributes.get(ResourceAttributes.PROCESS_COMMAND_LINE))
.contains(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH)); .contains(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH));
} }
@ -45,8 +43,7 @@ class ProcessResourceTest {
assertThat(attributes.get(ResourceAttributes.PROCESS_PID)).isGreaterThan(1); assertThat(attributes.get(ResourceAttributes.PROCESS_PID)).isGreaterThan(1);
assertThat(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH)) assertThat(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH))
.contains("java") .matches(".*[/\\\\]java\\.exe");
.endsWith(".exe");
assertThat(attributes.get(ResourceAttributes.PROCESS_COMMAND_LINE)) assertThat(attributes.get(ResourceAttributes.PROCESS_COMMAND_LINE))
.contains(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH)); .contains(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH));
} }