Fix ProcessResource directory separator (#4782)

* Fix ProcessResource directory separator * spotless
open-telemetry · Oct 1, 2022 · 3ee7bbd · 3ee7bbd
1 parent e1519bd
commit 3ee7bbd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...ons/resources/src/main/java/io/opentelemetry/sdk/extension/resources/ProcessResource.java b/...ons/resources/src/main/java/io/opentelemetry/sdk/extension/resources/ProcessResource.java
@@ -67,9 +67,9 @@ private static Resource doBuildResource() {
     if (javaHome != null) {
       StringBuilder executablePath = new StringBuilder(javaHome);
       executablePath
-          .append(File.pathSeparatorChar)
+          .append(File.separatorChar)
           .append("bin")
-          .append(File.pathSeparatorChar)
+          .append(File.separatorChar)
           .append("java");
       if (osName != null && osName.toLowerCase().startsWith("windows")) {
         executablePath.append(".exe");

diff --git a/...resources/src/test/java/io/opentelemetry/sdk/extension/resources/ProcessResourceTest.java b/...resources/src/test/java/io/opentelemetry/sdk/extension/resources/ProcessResourceTest.java
@@ -29,9 +29,7 @@ void notWindows() {
     Attributes attributes = resource.getAttributes();
 
     assertThat(attributes.get(ResourceAttributes.PROCESS_PID)).isGreaterThan(1);
-    assertThat(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH))
-        .contains("java")
-        .doesNotEndWith(".exe");
+    assertThat(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH)).matches(".*[/\\\\]java");
     assertThat(attributes.get(ResourceAttributes.PROCESS_COMMAND_LINE))
         .contains(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH));
   }
@@ -45,8 +43,7 @@ void windows() {
 
     assertThat(attributes.get(ResourceAttributes.PROCESS_PID)).isGreaterThan(1);
     assertThat(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH))
-        .contains("java")
-        .endsWith(".exe");
+        .matches(".*[/\\\\]java\\.exe");
     assertThat(attributes.get(ResourceAttributes.PROCESS_COMMAND_LINE))
         .contains(attributes.get(ResourceAttributes.PROCESS_EXECUTABLE_PATH));
   }