Skip to content

Code review sweep (run 25149644494) #18438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trask merged 8 commits into from
Apr 30, 2026
Merged

Code review sweep (run 25149644494) #18438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
394cbaf
Review fixes for http-url-connection:javaagent
otelbot[bot] Apr 30, 2026
ab42f40
Review fixes for hystrix-1.4:javaagent
otelbot[bot] Apr 30, 2026
a224ae7
Review fixes for iceberg-1.8:library
otelbot[bot] Apr 30, 2026
b3b6247
Review fixes for internal-application-logger:bootstrap
otelbot[bot] Apr 30, 2026
8f4510d
Review fixes for internal-application-logger:javaagent
otelbot[bot] Apr 30, 2026
fa40a20
Review fixes for internal-class-loader:javaagent
otelbot[bot] Apr 30, 2026
faa46c1
Review fixes for internal-class-loader:javaagent-integration-tests
otelbot[bot] Apr 30, 2026
b66dbf9
revert
trask Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...a/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 =
Expand Down
13 changes: 2 additions & 11 deletions .../java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/ExperimentalTestHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> HYSTRIX_COMMAND = stringKey("hystrix.command");
static final AttributeKey<String> HYSTRIX_GROUP = stringKey("hystrix.group");
static final AttributeKey<Boolean> HYSTRIX_CIRCUIT_OPEN = booleanKey("hystrix.circuit_open");

static <T> T experimental(T value) {
if (isEnabled) {
if (EXPERIMENTAL_ATTRIBUTES) {
return value;
}
return null;
Expand Down
18 changes: 9 additions & 9 deletions ...a/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableChainTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -94,9 +93,9 @@ protected Observable<String> 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))
Expand All @@ -105,9 +104,10 @@ protected Observable<String> 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))
Expand Down
35 changes: 17 additions & 18 deletions ...t/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -84,9 +83,9 @@ protected Observable<String> 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))
Expand Down Expand Up @@ -290,16 +289,16 @@ protected Observable<String> 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<Arguments> provideCommandFallbackArguments() {
Expand Down Expand Up @@ -388,17 +387,17 @@ protected Observable<String> 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<Arguments> provideCommandNoFallbackResultsInErrorArguments() {
Expand Down
23 changes: 11 additions & 12 deletions ...nt/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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<Arguments> provideCommandActionArguments() {
Expand Down
4 changes: 0 additions & 4 deletions instrumentation/internal/internal-application-logger/bootstrap/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
plugins {
id("otel.javaagent-bootstrap")
}

dependencies {
compileOnly(project(":javaagent-bootstrap"))
}
2 changes: 0 additions & 2 deletions instrumentation/internal/internal-application-logger/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion instrumentation/internal/internal-class-loader/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ plugins {
}

dependencies {
compileOnly(project(":javaagent-bootstrap"))
compileOnly(project(":javaagent-tooling"))
compileOnly(project(":instrumentation:internal:internal-class-loader:compile-stub"))

Expand Down
Loading