From 394cbaf287c766fd6380b388ffb8a7ce4019d528 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Thu, 30 Apr 2026 05:57:16 +0000 Subject: [PATCH 1/8] Review fixes for http-url-connection:javaagent Automated code review of instrumentation/http-url-connection/javaagent. --- .../httpurlconnection/HttpUrlConnectionTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java index 505bdf17738e..cd0c2ef7e14e 100644 --- a/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java +++ b/instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java @@ -41,6 +41,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.junit.jupiter.api.RepeatedTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.junit.jupiter.params.ParameterizedTest; @@ -157,8 +158,7 @@ void traceRequest(boolean useCache) throws IOException { span.hasName("test-http-server").hasKind(SERVER).hasParent(trace.getSpan(3)))); } - @ParameterizedTest - @ValueSource(ints = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10}) + @RepeatedTest(10) void testBrokenApiUsage() throws IOException { URL url = resolveAddress("/success").toURL(); HttpURLConnection connection = From ab42f400c59629c74a534e9dffab87cef5a6205b Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Thu, 30 Apr 2026 06:02:01 +0000 Subject: [PATCH 2/8] Review fixes for hystrix-1.4:javaagent Automated code review of instrumentation/hystrix-1.4/javaagent. --- .../hystrix/v1_4/ExperimentalTestHelper.java | 13 ++----- .../v1_4/HystrixObservableChainTest.java | 18 +++++----- .../hystrix/v1_4/HystrixObservableTest.java | 35 +++++++++---------- .../hystrix/v1_4/HystrixTest.java | 23 ++++++------ 4 files changed, 39 insertions(+), 50 deletions(-) diff --git a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/ExperimentalTestHelper.java b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/ExperimentalTestHelper.java index 98ed71fa5dd8..2e748788d287 100644 --- a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/ExperimentalTestHelper.java +++ b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/ExperimentalTestHelper.java @@ -5,21 +5,12 @@ package io.opentelemetry.javaagent.instrumentation.hystrix.v1_4; -import static io.opentelemetry.api.common.AttributeKey.booleanKey; -import static io.opentelemetry.api.common.AttributeKey.stringKey; - -import io.opentelemetry.api.common.AttributeKey; - class ExperimentalTestHelper { - private static final boolean isEnabled = + private static final boolean EXPERIMENTAL_ATTRIBUTES = Boolean.getBoolean("otel.instrumentation.hystrix.experimental-span-attributes"); - static final AttributeKey HYSTRIX_COMMAND = stringKey("hystrix.command"); - static final AttributeKey HYSTRIX_GROUP = stringKey("hystrix.group"); - static final AttributeKey HYSTRIX_CIRCUIT_OPEN = booleanKey("hystrix.circuit_open"); - static T experimental(T value) { - if (isEnabled) { + if (EXPERIMENTAL_ATTRIBUTES) { return value; } return null; diff --git a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableChainTest.java b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableChainTest.java index 186ff7a4a4f8..8758956354bc 100644 --- a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableChainTest.java +++ b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableChainTest.java @@ -5,9 +5,8 @@ package io.opentelemetry.javaagent.instrumentation.hystrix.v1_4; -import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_CIRCUIT_OPEN; -import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_COMMAND; -import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_GROUP; +import static io.opentelemetry.api.common.AttributeKey.booleanKey; +import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.experimental; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static org.assertj.core.api.Assertions.assertThat; @@ -94,9 +93,9 @@ protected Observable construct() { span.hasName("ExampleGroup.TestCommand.execute") .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(HYSTRIX_COMMAND, experimental("TestCommand")), - equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")), - equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))), + equalTo(stringKey("hystrix.command"), experimental("TestCommand")), + equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")), + equalTo(booleanKey("hystrix.circuit_open"), experimental(false))), span -> span.hasName("tracedMethod") .hasParent(trace.getSpan(1)) @@ -105,9 +104,10 @@ protected Observable construct() { span.hasName("OtherGroup.AnotherTestCommand.execute") .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(HYSTRIX_COMMAND, experimental("AnotherTestCommand")), - equalTo(HYSTRIX_GROUP, experimental("OtherGroup")), - equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))), + equalTo( + stringKey("hystrix.command"), experimental("AnotherTestCommand")), + equalTo(stringKey("hystrix.group"), experimental("OtherGroup")), + equalTo(booleanKey("hystrix.circuit_open"), experimental(false))), span -> span.hasName("anotherTracedMethod") .hasParent(trace.getSpan(3)) diff --git a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableTest.java b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableTest.java index 99d702b11258..24c3dae5b3a2 100644 --- a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableTest.java +++ b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableTest.java @@ -5,9 +5,8 @@ package io.opentelemetry.javaagent.instrumentation.hystrix.v1_4; -import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_CIRCUIT_OPEN; -import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_COMMAND; -import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_GROUP; +import static io.opentelemetry.api.common.AttributeKey.booleanKey; +import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.experimental; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static org.assertj.core.api.Assertions.assertThat; @@ -84,9 +83,9 @@ protected Observable construct() { span.hasName("ExampleGroup.TestCommand.execute") .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(HYSTRIX_COMMAND, experimental("TestCommand")), - equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")), - equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))), + equalTo(stringKey("hystrix.command"), experimental("TestCommand")), + equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")), + equalTo(booleanKey("hystrix.circuit_open"), experimental(false))), span -> span.hasName("tracedMethod") .hasParent(trace.getSpan(1)) @@ -290,16 +289,16 @@ protected Observable resumeWithFallback() { .hasStatus(StatusData.error()) .hasException(new IllegalArgumentException()) .hasAttributesSatisfyingExactly( - equalTo(HYSTRIX_COMMAND, experimental("TestCommand")), - equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")), - equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))), + equalTo(stringKey("hystrix.command"), experimental("TestCommand")), + equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")), + equalTo(booleanKey("hystrix.circuit_open"), experimental(false))), span -> span.hasName("ExampleGroup.TestCommand.fallback") .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(HYSTRIX_COMMAND, experimental("TestCommand")), - equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")), - equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))))); + equalTo(stringKey("hystrix.command"), experimental("TestCommand")), + equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")), + equalTo(booleanKey("hystrix.circuit_open"), experimental(false))))); } private static Stream provideCommandFallbackArguments() { @@ -388,17 +387,17 @@ protected Observable construct() { .hasStatus(StatusData.error()) .hasException(exception.getCause()) .hasAttributesSatisfyingExactly( - equalTo(HYSTRIX_COMMAND, experimental("TestCommand")), - equalTo(HYSTRIX_GROUP, experimental("FailingGroup")), - equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))), + equalTo(stringKey("hystrix.command"), experimental("TestCommand")), + equalTo(stringKey("hystrix.group"), experimental("FailingGroup")), + equalTo(booleanKey("hystrix.circuit_open"), experimental(false))), span -> span.hasName("FailingGroup.TestCommand.fallback") .hasParent(trace.getSpan(1)) .hasException(hystrixRuntimeException.getFallbackException()) .hasAttributesSatisfyingExactly( - equalTo(HYSTRIX_COMMAND, experimental("TestCommand")), - equalTo(HYSTRIX_GROUP, experimental("FailingGroup")), - equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))))); + equalTo(stringKey("hystrix.command"), experimental("TestCommand")), + equalTo(stringKey("hystrix.group"), experimental("FailingGroup")), + equalTo(booleanKey("hystrix.circuit_open"), experimental(false))))); } private static Stream provideCommandNoFallbackResultsInErrorArguments() { diff --git a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixTest.java b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixTest.java index 07c41a0a4cd3..9f54d3ee8bb6 100644 --- a/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixTest.java +++ b/instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixTest.java @@ -5,9 +5,8 @@ package io.opentelemetry.javaagent.instrumentation.hystrix.v1_4; -import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_CIRCUIT_OPEN; -import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_COMMAND; -import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_GROUP; +import static io.opentelemetry.api.common.AttributeKey.booleanKey; +import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.experimental; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static org.assertj.core.api.Assertions.assertThat; @@ -66,9 +65,9 @@ private String tracedMethod() { span.hasName("ExampleGroup.TestCommand.execute") .hasParent(trace.getSpan(0)) .hasAttributesSatisfyingExactly( - equalTo(HYSTRIX_COMMAND, experimental("TestCommand")), - equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")), - equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))), + equalTo(stringKey("hystrix.command"), experimental("TestCommand")), + equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")), + equalTo(booleanKey("hystrix.circuit_open"), experimental(false))), span -> span.hasName("tracedMethod") .hasParent(trace.getSpan(1)) @@ -109,16 +108,16 @@ protected String getFallback() { .hasStatus(StatusData.error()) .hasException(new IllegalArgumentException()) .hasAttributesSatisfyingExactly( - equalTo(HYSTRIX_COMMAND, experimental("TestCommand")), - equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")), - equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))), + equalTo(stringKey("hystrix.command"), experimental("TestCommand")), + equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")), + equalTo(booleanKey("hystrix.circuit_open"), experimental(false))), span -> span.hasName("ExampleGroup.TestCommand.fallback") .hasParent(trace.getSpan(1)) .hasAttributesSatisfyingExactly( - equalTo(HYSTRIX_COMMAND, experimental("TestCommand")), - equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")), - equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))))); + equalTo(stringKey("hystrix.command"), experimental("TestCommand")), + equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")), + equalTo(booleanKey("hystrix.circuit_open"), experimental(false))))); } private static Stream provideCommandActionArguments() { From a224ae77799130b1f3e40d4088bc351c04fb4568 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Thu, 30 Apr 2026 06:04:48 +0000 Subject: [PATCH 3/8] Review fixes for iceberg-1.8:library Automated code review of instrumentation/iceberg-1.8/library. --- .../instrumentation/iceberg/v1_8/IcebergTelemetry.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/instrumentation/iceberg-1.8/library/src/main/java/io/opentelemetry/instrumentation/iceberg/v1_8/IcebergTelemetry.java b/instrumentation/iceberg-1.8/library/src/main/java/io/opentelemetry/instrumentation/iceberg/v1_8/IcebergTelemetry.java index 732e2010fd09..c061164d492c 100644 --- a/instrumentation/iceberg-1.8/library/src/main/java/io/opentelemetry/instrumentation/iceberg/v1_8/IcebergTelemetry.java +++ b/instrumentation/iceberg-1.8/library/src/main/java/io/opentelemetry/instrumentation/iceberg/v1_8/IcebergTelemetry.java @@ -5,6 +5,8 @@ package io.opentelemetry.instrumentation.iceberg.v1_8; +import static java.util.Objects.requireNonNull; + import io.opentelemetry.api.OpenTelemetry; import org.apache.iceberg.Scan; import org.apache.iceberg.ScanTask; @@ -20,7 +22,7 @@ public static IcebergTelemetry create(OpenTelemetry openTelemetry) { } private IcebergTelemetry(OpenTelemetry openTelemetry) { - this.openTelemetry = openTelemetry; + this.openTelemetry = requireNonNull(openTelemetry); } /** @@ -37,6 +39,6 @@ private IcebergTelemetry(OpenTelemetry openTelemetry) { */ public > T1 wrapScan( Scan scan) { - return scan.metricsReporter(new IcebergMetricsReporter(openTelemetry)); + return requireNonNull(scan).metricsReporter(new IcebergMetricsReporter(openTelemetry)); } } From b3b624784eaaba4a36394925077515a17f103eeb Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Thu, 30 Apr 2026 06:10:54 +0000 Subject: [PATCH 4/8] Review fixes for internal-application-logger:bootstrap Automated code review of instrumentation/internal/internal-application-logger/bootstrap. --- .../internal-application-logger/bootstrap/build.gradle.kts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/instrumentation/internal/internal-application-logger/bootstrap/build.gradle.kts b/instrumentation/internal/internal-application-logger/bootstrap/build.gradle.kts index 2cb65998cad9..072a96df450f 100644 --- a/instrumentation/internal/internal-application-logger/bootstrap/build.gradle.kts +++ b/instrumentation/internal/internal-application-logger/bootstrap/build.gradle.kts @@ -1,7 +1,3 @@ plugins { id("otel.javaagent-bootstrap") } - -dependencies { - compileOnly(project(":javaagent-bootstrap")) -} From 8f4510d9ec830131304c26000568af71aa5c2311 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Thu, 30 Apr 2026 06:16:45 +0000 Subject: [PATCH 5/8] Review fixes for internal-application-logger:javaagent Automated code review of instrumentation/internal/internal-application-logger/javaagent. --- .../internal-application-logger/javaagent/build.gradle.kts | 2 -- 1 file changed, 2 deletions(-) diff --git a/instrumentation/internal/internal-application-logger/javaagent/build.gradle.kts b/instrumentation/internal/internal-application-logger/javaagent/build.gradle.kts index d989f9426f0b..602a07ab0a82 100644 --- a/instrumentation/internal/internal-application-logger/javaagent/build.gradle.kts +++ b/instrumentation/internal/internal-application-logger/javaagent/build.gradle.kts @@ -21,8 +21,6 @@ muzzle { dependencies { bootstrap(project(":instrumentation:internal:internal-application-logger:bootstrap")) - compileOnly(project(":javaagent-bootstrap")) - compileOnly("org.slf4j:slf4j-api") { version { // 1.4.0 introduced the TRACE logging level From fa40a2017b1b52ce43fca9f5f8a15cf910cd33b5 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Thu, 30 Apr 2026 06:20:13 +0000 Subject: [PATCH 6/8] Review fixes for internal-class-loader:javaagent Automated code review of instrumentation/internal/internal-class-loader/javaagent. --- .../internal/internal-class-loader/javaagent/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/instrumentation/internal/internal-class-loader/javaagent/build.gradle.kts b/instrumentation/internal/internal-class-loader/javaagent/build.gradle.kts index bb56f554cf60..e0b30b60cec8 100644 --- a/instrumentation/internal/internal-class-loader/javaagent/build.gradle.kts +++ b/instrumentation/internal/internal-class-loader/javaagent/build.gradle.kts @@ -5,7 +5,6 @@ plugins { } dependencies { - compileOnly(project(":javaagent-bootstrap")) compileOnly(project(":javaagent-tooling")) compileOnly(project(":instrumentation:internal:internal-class-loader:compile-stub")) From faa46c14b5849f46f950fd62a81526cc721e7a54 Mon Sep 17 00:00:00 2001 From: otelbot <197425009+otelbot@users.noreply.github.com> Date: Thu, 30 Apr 2026 06:23:06 +0000 Subject: [PATCH 7/8] Review fixes for internal-class-loader:javaagent-integration-tests Automated code review of instrumentation/internal/internal-class-loader/javaagent-integration-tests. --- .../java/instrumentation/TestInstrumentationModule.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/instrumentation/internal/internal-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java b/instrumentation/internal/internal-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java index 9626c110a62a..fff8fb7af93c 100644 --- a/instrumentation/internal/internal-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java +++ b/instrumentation/internal/internal-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java @@ -5,7 +5,6 @@ package instrumentation; -import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static java.util.Collections.singletonList; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -42,11 +41,6 @@ public boolean isIndyModule() { } private static class TestTypeInstrumentation implements TypeInstrumentation { - @Override - public ElementMatcher classLoaderOptimization() { - return hasClassesNamed("org.apache.commons.lang3.SystemUtils"); - } - @Override public ElementMatcher typeMatcher() { return named("org.apache.commons.lang3.SystemUtils"); From b66dbf9e8f17be725b3de497a643ebe8b47892dd Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Thu, 30 Apr 2026 08:54:41 -0700 Subject: [PATCH 8/8] revert --- .../instrumentation/iceberg/v1_8/IcebergTelemetry.java | 6 ++---- .../java/instrumentation/TestInstrumentationModule.java | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/instrumentation/iceberg-1.8/library/src/main/java/io/opentelemetry/instrumentation/iceberg/v1_8/IcebergTelemetry.java b/instrumentation/iceberg-1.8/library/src/main/java/io/opentelemetry/instrumentation/iceberg/v1_8/IcebergTelemetry.java index c061164d492c..732e2010fd09 100644 --- a/instrumentation/iceberg-1.8/library/src/main/java/io/opentelemetry/instrumentation/iceberg/v1_8/IcebergTelemetry.java +++ b/instrumentation/iceberg-1.8/library/src/main/java/io/opentelemetry/instrumentation/iceberg/v1_8/IcebergTelemetry.java @@ -5,8 +5,6 @@ package io.opentelemetry.instrumentation.iceberg.v1_8; -import static java.util.Objects.requireNonNull; - import io.opentelemetry.api.OpenTelemetry; import org.apache.iceberg.Scan; import org.apache.iceberg.ScanTask; @@ -22,7 +20,7 @@ public static IcebergTelemetry create(OpenTelemetry openTelemetry) { } private IcebergTelemetry(OpenTelemetry openTelemetry) { - this.openTelemetry = requireNonNull(openTelemetry); + this.openTelemetry = openTelemetry; } /** @@ -39,6 +37,6 @@ private IcebergTelemetry(OpenTelemetry openTelemetry) { */ public > T1 wrapScan( Scan scan) { - return requireNonNull(scan).metricsReporter(new IcebergMetricsReporter(openTelemetry)); + return scan.metricsReporter(new IcebergMetricsReporter(openTelemetry)); } } diff --git a/instrumentation/internal/internal-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java b/instrumentation/internal/internal-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java index fff8fb7af93c..9626c110a62a 100644 --- a/instrumentation/internal/internal-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java +++ b/instrumentation/internal/internal-class-loader/javaagent-integration-tests/src/main/java/instrumentation/TestInstrumentationModule.java @@ -5,6 +5,7 @@ package instrumentation; +import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed; import static java.util.Collections.singletonList; import static net.bytebuddy.matcher.ElementMatchers.named; @@ -41,6 +42,11 @@ public boolean isIndyModule() { } private static class TestTypeInstrumentation implements TypeInstrumentation { + @Override + public ElementMatcher classLoaderOptimization() { + return hasClassesNamed("org.apache.commons.lang3.SystemUtils"); + } + @Override public ElementMatcher typeMatcher() { return named("org.apache.commons.lang3.SystemUtils");