fix

Author: trask

instrumentation/akka/akka-http-10.0/javaagent/src/test/scala/io/opentelemetry/javaagent/instrumentation/akkahttp/AkkaHttpClientInstrumentationTest.scala

@@ -120,8 +120,8 @@ class AkkaHttpClientInstrumentationTest
   ): Unit = {
     options.disableTestRedirects()
     options.disableTestNonStandardHttpMethod()
-    // On Windows, non-routable addresses timeout instead of failing fast, causing the test to timeout
-    // before the HTTP client can create a span, resulting in only the parent span being captured.
+    // On Windows, non-routable addresses timeout instead of failing fast, causing test timeout
+    // before the HTTP client can create a span, resulting in only the parent span.
     if (OS.WINDOWS.isCurrentOs()) {
       options.disableTestRemoteConnection()
     }

instrumentation/async-http-client/async-http-client-2.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/asynchttpclient/v2_0/AsyncHttpClientTest.java

@@ -98,9 +98,8 @@ public void onThrowable(Throwable throwable) {
   protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
     optionsBuilder.disableTestRedirects();
     optionsBuilder.spanEndsAfterBody();
-    // On Windows, non-routable addresses timeout instead of failing fast, causing the test to
-    // timeout
-    // before the HTTP client can create a span, resulting in only the parent span being captured.
+    // On Windows, non-routable addresses timeout instead of failing fast, causing test timeout
+    // before the HTTP client can create a span, resulting in only the parent span.
     if (OS.WINDOWS.isCurrentOs()) {
       optionsBuilder.disableTestRemoteConnection();
     }

instrumentation/netty/netty-3.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v3_8/client/Netty38ClientTest.java

@@ -140,8 +140,7 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
     optionsBuilder.disableTestHttps();
     optionsBuilder.disableTestReadTimeout();
 
-    // On Windows, non-routable addresses behave differently, causing platform-specific test
-    // failures.
+    // On Windows, non-routable addresses behave differently, causing test failures.
     if (OS.WINDOWS.isCurrentOs()) {
       optionsBuilder.disableTestRemoteConnection();
     }

instrumentation/netty/netty-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/netty/v4_0/client/Netty40ClientTest.java

@@ -142,8 +142,7 @@ protected void configure(HttpClientTestOptions.Builder optionsBuilder) {
 
     optionsBuilder.setExpectedClientSpanNameMapper(Netty40ClientTest::expectedClientSpanName);
     optionsBuilder.setHttpAttributes(Netty40ClientTest::httpAttributes);
-    // On Windows, non-routable addresses behave differently, causing platform-specific test
-    // failures.
+    // On Windows, non-routable addresses behave differently, causing test failures.
     if (OS.WINDOWS.isCurrentOs()) {
       optionsBuilder.disableTestRemoteConnection();
     }

instrumentation/powerjob-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/powerjob/v4_0/PowerJobBasicProcessorTest.java

@@ -16,7 +16,6 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.internal.StringUtils;
 import io.opentelemetry.api.trace.SpanKind;
-import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
@@ -26,12 +25,15 @@
 import javax.sql.DataSource;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
 import tech.powerjob.official.processors.impl.FileCleanupProcessor;
 import tech.powerjob.official.processors.impl.HttpProcessor;
 import tech.powerjob.official.processors.impl.script.PythonProcessor;
 import tech.powerjob.official.processors.impl.script.ShellProcessor;
 import tech.powerjob.official.processors.impl.sql.DynamicDatasourceSqlProcessor;
 import tech.powerjob.official.processors.impl.sql.SpringDatasourceSqlProcessor;
+import tech.powerjob.worker.core.processor.ProcessResult;
 import tech.powerjob.worker.core.processor.TaskContext;
 import tech.powerjob.worker.core.processor.WorkflowContext;
 import tech.powerjob.worker.core.processor.sdk.BasicProcessor;
@@ -174,32 +176,34 @@ void testMapReduceProcessor() throws Exception {
         });
   }
 
+  // ShellProcessor relies on /bin/sh so skip on Windows where that binary is unavailable.
+  @DisabledOnOs(value = OS.WINDOWS, disabledReason = "ShellProcessor requires /bin/sh")
   @Test
   void testShellProcessor() throws Exception {
     long jobId = 1;
-    // Use platform-appropriate command: echo works on both Windows and Unix-like systems
+    // echo works on both Linux and Windows
     String jobParam = "echo test";
     TaskContext taskContext = genTaskContext(jobId, jobParam);
     taskContext.setWorkflowContext(new WorkflowContext(jobId, ""));
     taskContext.setOmsLogger(new TestOmsLogger());
     BasicProcessor shellProcessor = new ShellProcessor();
-    shellProcessor.process(taskContext);
+    Class<?> shellProcessorClass = shellProcessor.getClass();
+    ProcessResult result = shellProcessor.process(taskContext);
+    assertThat(result.isSuccess())
+        .as(
+            "shell processor result on %s: %s",
+            System.getProperty("os.name"), result.getMsg())
+        .isTrue();
     testing.waitAndAssertTraces(
         trace -> {
           trace.hasSpansSatisfyingExactly(
               span -> {
-                span.hasName(String.format("%s.process", ShellProcessor.class.getSimpleName()))
+                span.hasName(String.format("%s.process", shellProcessorClass.getSimpleName()))
                     .hasKind(SpanKind.INTERNAL)
-                    // On Windows, shell command execution may fail if the shell is not available
-                    // or configured correctly, so accept both UNSET and ERROR status
-                    .satisfies(
-                        spanData -> {
-                          StatusCode code = spanData.getStatus().getStatusCode();
-                          assertThat(code).isIn(StatusCode.UNSET, StatusCode.ERROR);
-                        })
+                    .hasStatus(StatusData.unset())
                     .hasAttributesSatisfyingExactly(
                         attributeAssertions(
-                            ShellProcessor.class.getName(), jobId, jobParam, SHELL_PROCESSOR));
+                            shellProcessorClass.getName(), jobId, jobParam, SHELL_PROCESSOR));
               });
         });
   }