From 3f9a4f46c038a249732af7b5613110d28ca98d95 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 30 Jun 2026 16:45:55 -0400 Subject: [PATCH] Unify usage of OperatingSystem.architecture() Co-Authored-By: Claude Opus 4.8 (1M context) --- .../com/datadog/profiling/controller/EnvironmentChecker.java | 5 ++--- .../groovy/executor/NettyExecutorInstrumentationTest.groovy | 3 +-- .../src/test/groovy/RemoteJDBCInstrumentationTest.groovy | 3 +-- .../restlet-2.2/src/latestDepTest/groovy/RestletTest.groovy | 4 +--- .../test/java/datadog/smoketest/ProcessBuilderHelper.java | 4 +--- .../groovy/datadog/smoketest/Java9ModulesSmokeTest.groovy | 3 +-- .../main/groovy/datadog/smoketest/AbstractSmokeTest.groovy | 3 +-- .../groovy/datadog/smoketest/WebSphereJmxSmokeTest.groovy | 4 +--- 8 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java index be2553acade..666aa0029f5 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java +++ b/dd-java-agent/agent-profiling/profiling-controller/src/main/java/com/datadog/profiling/controller/EnvironmentChecker.java @@ -1,7 +1,5 @@ package com.datadog.profiling.controller; -import static datadog.environment.OperatingSystem.architecture; - import datadog.environment.JavaVirtualMachine; import datadog.environment.OperatingSystem; import datadog.environment.SystemProperties; @@ -238,7 +236,8 @@ private static boolean checkLoadLibrary(Path target, StringBuilder sb) { @SuppressForbidden private static boolean extractSoFromJar(Path target, StringBuilder sb) throws Exception { URL jarUrl = EnvironmentChecker.class.getProtectionDomain().getCodeSource().getLocation(); - String linuxArchFolder = architecture().isArm64() ? "/linux-arm64/" : "/linux-x64/"; + String linuxArchFolder = + OperatingSystem.architecture().isArm64() ? "/linux-arm64/" : "/linux-x64/"; try (JarFile jarFile = new JarFile(new File(jarUrl.toURI()))) { return jarFile.stream() .filter(e -> e.getName().contains("libjavaProfiler.so")) diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy index 727d8060c32..0fd96e40d29 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/executor/NettyExecutorInstrumentationTest.groovy @@ -1,6 +1,5 @@ package executor -import static datadog.environment.OperatingSystem.architecture import static org.junit.jupiter.api.Assumptions.assumeTrue import datadog.environment.OperatingSystem @@ -23,7 +22,7 @@ import spock.lang.Shared // TODO: netty-all 4.1.9 only ships linux-x86_64 epoll native libraries. @IgnoreIf({ - OperatingSystem.isLinux() && architecture().isArm64() + OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64() }) class NettyExecutorInstrumentationTest extends InstrumentationSpecification { diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy b/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy index 5c3c676ea37..0637f56d9ef 100644 --- a/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy @@ -2,7 +2,6 @@ import static DbType.MYSQL import static DbType.ORACLE import static DbType.POSTGRESQL import static DbType.SQLSERVER -import static datadog.environment.OperatingSystem.architecture import static datadog.trace.agent.test.utils.TraceUtils.basicSpan import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace import static datadog.trace.api.config.TraceInstrumentationConfig.DB_CLIENT_HOST_SPLIT_BY_INSTANCE @@ -117,7 +116,7 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { // MS SQL Server has no arm64 images. return !(db == SQLSERVER && OperatingSystem.isLinux() - && architecture().isArm64()) + && OperatingSystem.architecture().isArm64()) } def peerConnectionProps(DbType db){ diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/latestDepTest/groovy/RestletTest.groovy b/dd-java-agent/instrumentation/restlet-2.2/src/latestDepTest/groovy/RestletTest.groovy index fe504f1a030..5b3d1a75d73 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/src/latestDepTest/groovy/RestletTest.groovy +++ b/dd-java-agent/instrumentation/restlet-2.2/src/latestDepTest/groovy/RestletTest.groovy @@ -1,5 +1,3 @@ -import static datadog.environment.OperatingSystem.architecture - import datadog.environment.OperatingSystem import org.restlet.Request import org.restlet.Response @@ -12,7 +10,7 @@ class RestletTest extends RestletTestBase { @Override boolean testParallelRequest() { // TODO: Parallel processing is failing on Linux arm64. - return !(OperatingSystem.isLinux() && architecture().isArm64()) + return !(OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64()) } @Override diff --git a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java index 7bdc5ddfa24..e0ee9150109 100644 --- a/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java +++ b/dd-smoke-tests/debugger-integration-tests/src/test/java/datadog/smoketest/ProcessBuilderHelper.java @@ -1,7 +1,5 @@ package datadog.smoketest; -import static datadog.environment.OperatingSystem.architecture; - import datadog.environment.OperatingSystem; import java.io.File; import java.nio.file.Path; @@ -59,7 +57,7 @@ public static ProcessBuilder createProcessBuilder( List command = new ArrayList<>(); command.addAll(baseCommand); - if (OperatingSystem.isLinux() && architecture().isArm64()) { + if (OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64()) { // Disable CDS to avoid SIGSEGVs on Linux arm64. command.add(1, "-Xshare:off"); } diff --git a/dd-smoke-tests/java9-modules/src/test/groovy/datadog/smoketest/Java9ModulesSmokeTest.groovy b/dd-smoke-tests/java9-modules/src/test/groovy/datadog/smoketest/Java9ModulesSmokeTest.groovy index 8272215b3fb..57865e57bca 100644 --- a/dd-smoke-tests/java9-modules/src/test/groovy/datadog/smoketest/Java9ModulesSmokeTest.groovy +++ b/dd-smoke-tests/java9-modules/src/test/groovy/datadog/smoketest/Java9ModulesSmokeTest.groovy @@ -1,6 +1,5 @@ package datadog.smoketest -import static datadog.environment.OperatingSystem.architecture import static java.util.concurrent.TimeUnit.SECONDS import datadog.environment.JavaVirtualMachine @@ -9,7 +8,7 @@ import spock.lang.IgnoreIf // TODO: OpenJ9 (Semeru) on Linux arm64 fails on this test. @IgnoreIf({ - OperatingSystem.isLinux() && architecture().isArm64() && JavaVirtualMachine.isJ9() + OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64() && JavaVirtualMachine.isJ9() }) class Java9ModulesSmokeTest extends AbstractSmokeTest { // Estimate for the amount of time instrumentation plus some extra diff --git a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy index ae1d2f6b6ef..28b71306349 100644 --- a/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy +++ b/dd-smoke-tests/src/main/groovy/datadog/smoketest/AbstractSmokeTest.groovy @@ -1,6 +1,5 @@ package datadog.smoketest -import static datadog.environment.OperatingSystem.architecture import static datadog.trace.agent.test.server.http.TestHttpServer.httpServer import static datadog.trace.api.ProtocolVersion.V0_4 import static datadog.trace.api.ProtocolVersion.V0_5 @@ -255,7 +254,7 @@ abstract class AbstractSmokeTest extends ProcessManager { } // Disable CDS to avoid SIGSEGVs on Linux arm64. - if (OperatingSystem.isLinux() && architecture().isArm64()) { + if (OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64()) { ret += "-Xshare:off" } ret as String[] diff --git a/dd-smoke-tests/websphere-jmx/src/test/groovy/datadog/smoketest/WebSphereJmxSmokeTest.groovy b/dd-smoke-tests/websphere-jmx/src/test/groovy/datadog/smoketest/WebSphereJmxSmokeTest.groovy index dc3dfdd6efe..81dde64229d 100644 --- a/dd-smoke-tests/websphere-jmx/src/test/groovy/datadog/smoketest/WebSphereJmxSmokeTest.groovy +++ b/dd-smoke-tests/websphere-jmx/src/test/groovy/datadog/smoketest/WebSphereJmxSmokeTest.groovy @@ -1,7 +1,5 @@ package datadog.smoketest -import static datadog.environment.OperatingSystem.architecture - import datadog.environment.OperatingSystem import java.time.Duration import java.util.concurrent.ArrayBlockingQueue @@ -27,7 +25,7 @@ import spock.lang.Shared */ // There is no arm64 docker image for IBM icr.io/appcafe/websphere-traditional. @IgnoreIf({ - OperatingSystem.isLinux() && architecture().isArm64() + OperatingSystem.isLinux() && OperatingSystem.architecture().isArm64() }) class WebSphereJmxSmokeTest extends AbstractSmokeTest {