From 1190b17a327ab050af05c340b3d77ba68d8d1078 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 9 Oct 2025 21:37:47 -0700 Subject: [PATCH 01/13] Simplify tests --- .github/workflows/build-common.yml | 32 +------------------ CONTRIBUTING.md | 6 ---- .../kotlin/otel.java-conventions.gradle.kts | 6 ++++ .../runtime-attach/build.gradle.kts | 5 --- 4 files changed, 7 insertions(+), 42 deletions(-) diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml index 20ea2f153..f467d08d8 100644 --- a/.github/workflows/build-common.yml +++ b/.github/workflows/build-common.yml @@ -111,7 +111,7 @@ jobs: - name: Test run: > - ./gradlew test + ./gradlew check -x spotlessCheck "-PtestJavaVersion=${{ matrix.test-java-version }}" "-Porg.gradle.java.installations.paths=${{ steps.setup-java-test.outputs.path }}" "-Porg.gradle.java.installations.auto-download=false" @@ -122,36 +122,6 @@ jobs: if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }} run: cat build-scan.txt - integration-test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - - - name: Set up JDK for running Gradle - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0 - with: - distribution: temurin - java-version: 17 - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2 # v5.0.0 - with: - cache-read-only: ${{ inputs.cache-read-only }} - - - name: Integration test - run: ./gradlew integrationTest "-PmaxTestRetries=${{ inputs.max-test-retries }}" ${{ inputs.no-build-cache && '--no-build-cache' || '' }} - - - name: Build scan - if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }} - run: cat build-scan.txt - - - name: Save integration test results - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 - if: always() - with: - name: integration-test-results - path: jmx-metrics/build/reports/tests/integrationTest - markdown-lint-check: uses: ./.github/workflows/reusable-markdown-lint.yml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 04a50c300..d6e0a0a36 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,12 +31,6 @@ To run the tests: ./gradlew test ``` -Some modules include integration tests that can be run with: - -```bash -./gradlew integrationTest -``` - ## Snapshot Builds Snapshot builds of the `main` branch are available from the Sonatype snapshot repository at: diff --git a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts index ffd6f2bf0..7c29ab9e9 100644 --- a/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts @@ -173,6 +173,12 @@ testing { } } +tasks { + check { + dependsOn(testing.suites) + } +} + fun isJavaVersionAllowed(version: JavaVersion): Boolean { if (otelJava.minJavaVersionSupported.get() > version) { return false diff --git a/runtime-attach/runtime-attach/build.gradle.kts b/runtime-attach/runtime-attach/build.gradle.kts index 27927a7f0..b0bc63065 100644 --- a/runtime-attach/runtime-attach/build.gradle.kts +++ b/runtime-attach/runtime-attach/build.gradle.kts @@ -59,9 +59,4 @@ tasks { excludeTestsMatching("AgentDisabledBySystemPropertyTest") } } - - check { - dependsOn(testAgentDisabledByEnvironmentVariable) - dependsOn(testAgentDisabledBySystemProperty) - } } From fd7f972905a21282fcdab4a68b3b75baf7b9647c Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 08:40:38 -0700 Subject: [PATCH 02/13] aws --- .../aws/xray/AwsXrayRemoteSamplerIntegrationTest.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java index fe281e3e2..9bf273377 100644 --- a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java +++ b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java @@ -16,6 +16,7 @@ import java.time.Duration; import java.util.Collections; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIf; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.GenericContainer; @@ -31,9 +32,13 @@ // to update sampling rules and assert rough ratios of sampling decisions. In the meantime, it // expects you to update the rules through the dashboard to see the effect on the sampling decisions // that are printed. -@Testcontainers(disabledWithoutDocker = true) +@EnabledIf("hasAwsCredentials") class AwsXrayRemoteSamplerIntegrationTest { + static boolean hasAwsCredentials() { + return System.getenv("AWS_ACCESS_KEY_ID") != null; + } + private static final Logger logger = LoggerFactory.getLogger(AwsXrayRemoteSamplerIntegrationTest.class); @@ -45,7 +50,7 @@ class AwsXrayRemoteSamplerIntegrationTest { .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("otel-collector"))) .withCopyFileToContainer( MountableFile.forClasspathResource("/otel-collector.yml"), "/etc/otel-collector.yml") - .withCommand("--config /etc/otel-collector.yml --log-level DEBUG") + .withCommand("--config /etc/otel-collector.yml") .withEnv("AWS_ACCESS_KEY_ID", System.getenv("AWS_ACCESS_KEY_ID")) .withEnv("AWS_SECRET_ACCESS_KEY", System.getenv("AWS_SECRET_ACCESS_KEY")) .withEnv("AWS_REGION", System.getenv("AWS_REGION")); From 668e9688fe00acd56debae65557cb08ffcfb4a02 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Fri, 10 Oct 2025 15:42:47 +0000 Subject: [PATCH 03/13] ./gradlew spotlessApply --- .../contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java index 9bf273377..8c9686bf7 100644 --- a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java +++ b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java @@ -23,7 +23,6 @@ import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.MountableFile; From 3fff16d84faea76c286b7929fb2cb55f9d1cfc38 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 09:34:35 -0700 Subject: [PATCH 04/13] Fix windows --- .../io/opentelemetry/contrib/jmxscraper/TestAppContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java index 7a8655a51..623d06bf1 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java @@ -36,7 +36,7 @@ public class TestAppContainer extends GenericContainer { private boolean clientCertificate; public TestAppContainer() { - super("openjdk:8u272-jre-slim"); + super("openjdk:8u342-jre-slim"); this.properties = new HashMap<>(); From 5f24847f2405d81f1acc57386d36f068886bb5e2 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 10:50:50 -0700 Subject: [PATCH 05/13] fix --- .../target_systems/TargetSystemIntegrationTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TargetSystemIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TargetSystemIntegrationTest.java index e74e93180..0356affdc 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TargetSystemIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/TargetSystemIntegrationTest.java @@ -7,6 +7,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; +import static org.testcontainers.Testcontainers.exposeHostPorts; import com.linecorp.armeria.server.ServerBuilder; import com.linecorp.armeria.server.grpc.GrpcService; @@ -35,11 +36,12 @@ import org.junit.jupiter.api.io.TempDir; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.Testcontainers; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.junit.jupiter.Testcontainers; +@Testcontainers(disabledWithoutDocker = true) public abstract class TargetSystemIntegrationTest { private static final Logger logger = LoggerFactory.getLogger(TargetSystemIntegrationTest.class); private static final Logger targetSystemLogger = LoggerFactory.getLogger("TargetSystemContainer"); @@ -72,7 +74,7 @@ static void beforeAll() { network = Network.newNetwork(); otlpServer = new OtlpGrpcServer(); otlpServer.start(); - Testcontainers.exposeHostPorts(otlpServer.httpPort()); + exposeHostPorts(otlpServer.httpPort()); otlpEndpoint = "http://" + OTLP_HOST + ":" + otlpServer.httpPort(); } From 69efe202f3ebb363a522766e53a572aa017579c8 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 11:32:43 -0700 Subject: [PATCH 06/13] fix --- .../contrib/jmxscraper/JmxConnectionTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java index 00d7fc124..225173ff0 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java @@ -15,11 +15,13 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.EnabledIf; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.testcontainers.DockerClientFactory; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; import org.testcontainers.containers.output.Slf4jLogConsumer; @@ -29,8 +31,18 @@ * JmxConnectionBuilder and relies on containers to minimize the JMX/RMI network complications which * are not NAT-friendly. */ +@EnabledIf("isDockerAvailable") class JmxConnectionTest { + static boolean isDockerAvailable() { + try { + DockerClientFactory.instance().client(); + return true; + } catch (Throwable e) { + return false; + } + } + // OTLP endpoint is not used in test mode, but still has to be provided private static final String DUMMY_OTLP_ENDPOINT = "http://dummy-otlp-endpoint:8080/"; private static final String SCRAPER_BASE_IMAGE = "openjdk:8u342-jre-slim"; From 88d7f4ec20f583ea20415504f136142bbea99b09 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 14:26:36 -0700 Subject: [PATCH 07/13] fix --- ibm-mq-metrics/build.gradle.kts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ibm-mq-metrics/build.gradle.kts b/ibm-mq-metrics/build.gradle.kts index 31e191841..7e489bd53 100644 --- a/ibm-mq-metrics/build.gradle.kts +++ b/ibm-mq-metrics/build.gradle.kts @@ -50,7 +50,11 @@ testing { targets { all { testTask.configure { - shouldRunAfter(tasks.test) + // Jakarta JMS requires Java 11+ + val testJavaVersion: String? by project + if (testJavaVersion == "8") { + enabled = false + } } } } From 0bab357385c905d70429eb469a3f5cec50e89b48 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 14:27:45 -0700 Subject: [PATCH 08/13] revert --- .../contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java index 8c9686bf7..dcc0e9494 100644 --- a/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java +++ b/aws-xray/src/awsTest/java/io/opentelemetry/contrib/aws/xray/AwsXrayRemoteSamplerIntegrationTest.java @@ -49,7 +49,7 @@ static boolean hasAwsCredentials() { .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("otel-collector"))) .withCopyFileToContainer( MountableFile.forClasspathResource("/otel-collector.yml"), "/etc/otel-collector.yml") - .withCommand("--config /etc/otel-collector.yml") + .withCommand("--config /etc/otel-collector.yml --log-level DEBUG") .withEnv("AWS_ACCESS_KEY_ID", System.getenv("AWS_ACCESS_KEY_ID")) .withEnv("AWS_SECRET_ACCESS_KEY", System.getenv("AWS_SECRET_ACCESS_KEY")) .withEnv("AWS_REGION", System.getenv("AWS_REGION")); From 12c9126aac64e39400e1422704799d8629f03e80 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 14:28:47 -0700 Subject: [PATCH 09/13] fix --- .../io/opentelemetry/contrib/jmxscraper/TestAppContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java index 623d06bf1..7a8655a51 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/TestAppContainer.java @@ -36,7 +36,7 @@ public class TestAppContainer extends GenericContainer { private boolean clientCertificate; public TestAppContainer() { - super("openjdk:8u342-jre-slim"); + super("openjdk:8u272-jre-slim"); this.properties = new HashMap<>(); From 7e243061408d62aa23ccafc2146b3536095b0837 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 16:16:25 -0700 Subject: [PATCH 10/13] fix --- .../jmxmetrics/target_systems/SolrIntegrationTest.java | 4 ++++ .../jmxscraper/target_systems/SolrIntegrationTest.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/SolrIntegrationTest.java b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/SolrIntegrationTest.java index 78fc82acd..d8c7197e5 100644 --- a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/SolrIntegrationTest.java +++ b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/SolrIntegrationTest.java @@ -11,11 +11,15 @@ import io.opentelemetry.proto.metrics.v1.Metric; import java.time.Duration; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledOnJre; +import org.junit.jupiter.api.condition.JRE; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; +// Java 8 has issues resolving Docker network hostnames (java.net.UnknownHostException) +@DisabledOnJre(JRE.JAVA_8) class SolrIntegrationTest extends AbstractIntegrationTest { SolrIntegrationTest() { diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java index 9cba55701..682f3c848 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java @@ -14,10 +14,14 @@ import io.opentelemetry.contrib.jmxscraper.assertions.AttributeMatcherGroup; import java.nio.file.Path; import java.time.Duration; +import org.junit.jupiter.api.condition.DisabledOnJre; +import org.junit.jupiter.api.condition.JRE; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; import org.testcontainers.containers.wait.strategy.Wait; +// Java 8 has issues resolving Docker network hostnames (java.net.UnknownHostException) +@DisabledOnJre(JRE.JAVA_8) class SolrIntegrationTest extends TargetSystemIntegrationTest { @Override From dc40365558f98ff4a3a96aae7561d67834053121 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 16:56:28 -0700 Subject: [PATCH 11/13] up --- .../contrib/jmxscraper/JmxConnectionTest.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java index 225173ff0..c55f70669 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/JmxConnectionTest.java @@ -15,34 +15,24 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledIf; import org.junit.jupiter.api.io.TempDir; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.testcontainers.DockerClientFactory; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.junit.jupiter.Testcontainers; /** * Tests all supported ways to connect to remote JMX interface. This indirectly tests * JmxConnectionBuilder and relies on containers to minimize the JMX/RMI network complications which * are not NAT-friendly. */ -@EnabledIf("isDockerAvailable") +@Testcontainers(disabledWithoutDocker = true) class JmxConnectionTest { - static boolean isDockerAvailable() { - try { - DockerClientFactory.instance().client(); - return true; - } catch (Throwable e) { - return false; - } - } - // OTLP endpoint is not used in test mode, but still has to be provided private static final String DUMMY_OTLP_ENDPOINT = "http://dummy-otlp-endpoint:8080/"; private static final String SCRAPER_BASE_IMAGE = "openjdk:8u342-jre-slim"; From 7247e181b0535b7dfc96aa11582975089e4a0017 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 16:57:42 -0700 Subject: [PATCH 12/13] Update jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java --- .../contrib/jmxscraper/target_systems/SolrIntegrationTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java index 682f3c848..f077e36f5 100644 --- a/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java +++ b/jmx-scraper/src/integrationTest/java/io/opentelemetry/contrib/jmxscraper/target_systems/SolrIntegrationTest.java @@ -20,7 +20,8 @@ import org.testcontainers.containers.Network; import org.testcontainers.containers.wait.strategy.Wait; -// Java 8 has issues resolving Docker network hostnames (java.net.UnknownHostException) +// possible workaround on Java 8: +// https://stackoverflow.com/questions/35466461/how-to-connect-with-jmx-from-host-to-docker-container-in-docker-machine @DisabledOnJre(JRE.JAVA_8) class SolrIntegrationTest extends TargetSystemIntegrationTest { From 7df634e23d2cecc07564fe0e2cfa731fba42b53b Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 17:23:31 -0700 Subject: [PATCH 13/13] Update jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/SolrIntegrationTest.java --- .../contrib/jmxmetrics/target_systems/SolrIntegrationTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/SolrIntegrationTest.java b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/SolrIntegrationTest.java index d8c7197e5..d851a679d 100644 --- a/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/SolrIntegrationTest.java +++ b/jmx-metrics/src/integrationTest/java/io/opentelemetry/contrib/jmxmetrics/target_systems/SolrIntegrationTest.java @@ -18,7 +18,8 @@ import org.testcontainers.containers.wait.strategy.Wait; import org.testcontainers.junit.jupiter.Container; -// Java 8 has issues resolving Docker network hostnames (java.net.UnknownHostException) +// possible workaround on Java 8: +// https://stackoverflow.com/questions/35466461/how-to-connect-with-jmx-from-host-to-docker-container-in-docker-machine @DisabledOnJre(JRE.JAVA_8) class SolrIntegrationTest extends AbstractIntegrationTest {