spotless

Author: trask

instrumentation/ratpack/ratpack-1.4/testing/src/main/java/io/opentelemetry/instrumentation/ratpack/client/AbstractRatpackHttpClientTest.java

@@ -178,15 +178,17 @@ private static Throwable nettyClientSpanErrorMapper(URI uri, Throwable exception
       // to align with the span emitted by the Netty instrumentation ("connection timed out") on
       // Linux. Prefer the wrapped cause when available, otherwise synthesize the expected message.
       Throwable cause = exception.getCause();
-      if (cause instanceof ConnectTimeoutException || cause instanceof PrematureChannelClosureException) {
+      if (cause instanceof ConnectTimeoutException
+          || cause instanceof PrematureChannelClosureException) {
         return cause;
       }
       if (exception instanceof ConnectTimeoutException
           || exception instanceof PrematureChannelClosureException) {
         return exception;
       }
       if ("https".equalsIgnoreCase(uri.getScheme())) {
-        return new PrematureChannelClosureException("channel gone inactive with 1 missing response(s)");
+        return new PrematureChannelClosureException(
+            "channel gone inactive with 1 missing response(s)");
       }
       int port = uri.getPort();
       if (port == -1) {

instrumentation/resources/library/src/main/java/io/opentelemetry/instrumentation/resources/ProcessResource.java

@@ -93,7 +93,8 @@ private static Resource doBuildResource() {
       attributes.put(PROCESS_EXECUTABLE_PATH, executablePath.toString());
 
       String[] args = ProcessArguments.getProcessArguments();
-      // This will only work with Java 9+ and Linux but provides everything except the executablePath.
+      // This will only work with Java 9+ and Linux but provides everything except the
+      // executablePath.
       // Argument array may be empty on Java 9+ when the command line is too long, see
       // https://bugs.openjdk.org/browse/JDK-8345117
       if (args.length > 0) {

instrumentation/resources/library/src/test/java/io/opentelemetry/instrumentation/resources/internal/ResourceDeclarativeConfigTest.java

@@ -70,7 +70,10 @@ void endToEnd() {
               assertThat(attributeKeys).contains("os.type");
               // ProcessResourceComponentProvider
               assertThat(attributeKeys)
-                  .contains(java8 || OS.WINDOWS.isCurrentOs() ? "process.command_line" : "process.command_args");
+                  .contains(
+                      java8 || OS.WINDOWS.isCurrentOs()
+                          ? "process.command_line"
+                          : "process.command_args");
               assertThat(attributeKeys).contains("process.executable.path");
               assertThat(attributeKeys).contains("process.pid");
               // ProcessRuntimeResourceComponentProvider

javaagent-bootstrap/src/test/java/io/opentelemetry/javaagent/bootstrap/AgentClassLoaderTest.java

@@ -13,6 +13,7 @@
 import java.net.URL;
 import java.util.concurrent.Phaser;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
 import org.junit.jupiter.api.condition.OS;
 
 class AgentClassLoaderTest {
@@ -83,6 +84,9 @@ private static Object getClassLoadingLock(ClassLoader classLoader, String classN
   }
 
   @Test
+  @DisabledOnOs(
+      value = OS.WINDOWS,
+      disabledReason = "Windows reports empty process arguments even on Java 9+")
   void multiReleaseJar() throws Exception {
     boolean jdk8 = "1.8".equals(System.getProperty("java.specification.version"));
     Class<?> mrJarClass =
@@ -112,12 +116,8 @@ protected String getClassSuffix() {
       Method method = clazz.getDeclaredMethod("getProcessArguments");
       method.setAccessible(true);
       String[] result = (String[]) method.invoke(null);
-      // jdk8 versions returns empty array, jdk9 version may return empty on Windows due to
-      // ProcessHandle.current().info().arguments() not being available on all platforms
-      if (!jdk8 && !OS.WINDOWS.isCurrentOs()) {
-        // on non-jdk8 and non-Windows, we should get process arguments
-        assertThat(result.length > 0).isTrue();
-      }
+      // jdk8 versions returns empty array, jdk9 version does not
+      assertThat(result.length > 0).isNotEqualTo(jdk8);
     }
   }
 }