Skip to content

Commit d391b6f

Browse files
otelbot[bot]trask
otelbot[bot]
and
trask
authored
Code review sweep (run 25149644494) (#18438)
Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
1 parent c4fb86a commit d391b6f

8 files changed

Lines changed: 41 additions & 59 deletions

File tree

‎instrumentation/http-url-connection/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/httpurlconnection/HttpUrlConnectionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import java.util.ArrayList;
4242
import java.util.List;
4343
import java.util.Map;
44+
import org.junit.jupiter.api.RepeatedTest;
4445
import org.junit.jupiter.api.Test;
4546
import org.junit.jupiter.api.extension.RegisterExtension;
4647
import org.junit.jupiter.params.ParameterizedTest;
@@ -157,8 +158,7 @@ void traceRequest(boolean useCache) throws IOException {
157158
span.hasName("test-http-server").hasKind(SERVER).hasParent(trace.getSpan(3))));
158159
}
159160

160-
@ParameterizedTest
161-
@ValueSource(ints = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10})
161+
@RepeatedTest(10)
162162
void testBrokenApiUsage() throws IOException {
163163
URL url = resolveAddress("/success").toURL();
164164
HttpURLConnection connection =

‎instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/ExperimentalTestHelper.java‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,12 @@
55

66
package io.opentelemetry.javaagent.instrumentation.hystrix.v1_4;
77

8-
import static io.opentelemetry.api.common.AttributeKey.booleanKey;
9-
import static io.opentelemetry.api.common.AttributeKey.stringKey;
10-
11-
import io.opentelemetry.api.common.AttributeKey;
12-
138
class ExperimentalTestHelper {
14-
private static final boolean isEnabled =
9+
private static final boolean EXPERIMENTAL_ATTRIBUTES =
1510
Boolean.getBoolean("otel.instrumentation.hystrix.experimental-span-attributes");
1611

17-
static final AttributeKey<String> HYSTRIX_COMMAND = stringKey("hystrix.command");
18-
static final AttributeKey<String> HYSTRIX_GROUP = stringKey("hystrix.group");
19-
static final AttributeKey<Boolean> HYSTRIX_CIRCUIT_OPEN = booleanKey("hystrix.circuit_open");
20-
2112
static <T> T experimental(T value) {
22-
if (isEnabled) {
13+
if (EXPERIMENTAL_ATTRIBUTES) {
2314
return value;
2415
}
2516
return null;

‎instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableChainTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
package io.opentelemetry.javaagent.instrumentation.hystrix.v1_4;
77

8-
import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_CIRCUIT_OPEN;
9-
import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_COMMAND;
10-
import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_GROUP;
8+
import static io.opentelemetry.api.common.AttributeKey.booleanKey;
9+
import static io.opentelemetry.api.common.AttributeKey.stringKey;
1110
import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.experimental;
1211
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1312
import static org.assertj.core.api.Assertions.assertThat;
@@ -94,9 +93,9 @@ protected Observable<String> construct() {
9493
span.hasName("ExampleGroup.TestCommand.execute")
9594
.hasParent(trace.getSpan(0))
9695
.hasAttributesSatisfyingExactly(
97-
equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
98-
equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
99-
equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
96+
equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
97+
equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
98+
equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
10099
span ->
101100
span.hasName("tracedMethod")
102101
.hasParent(trace.getSpan(1))
@@ -105,9 +104,10 @@ protected Observable<String> construct() {
105104
span.hasName("OtherGroup.AnotherTestCommand.execute")
106105
.hasParent(trace.getSpan(1))
107106
.hasAttributesSatisfyingExactly(
108-
equalTo(HYSTRIX_COMMAND, experimental("AnotherTestCommand")),
109-
equalTo(HYSTRIX_GROUP, experimental("OtherGroup")),
110-
equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
107+
equalTo(
108+
stringKey("hystrix.command"), experimental("AnotherTestCommand")),
109+
equalTo(stringKey("hystrix.group"), experimental("OtherGroup")),
110+
equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
111111
span ->
112112
span.hasName("anotherTracedMethod")
113113
.hasParent(trace.getSpan(3))

‎instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixObservableTest.java‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
package io.opentelemetry.javaagent.instrumentation.hystrix.v1_4;
77

8-
import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_CIRCUIT_OPEN;
9-
import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_COMMAND;
10-
import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_GROUP;
8+
import static io.opentelemetry.api.common.AttributeKey.booleanKey;
9+
import static io.opentelemetry.api.common.AttributeKey.stringKey;
1110
import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.experimental;
1211
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1312
import static org.assertj.core.api.Assertions.assertThat;
@@ -84,9 +83,9 @@ protected Observable<String> construct() {
8483
span.hasName("ExampleGroup.TestCommand.execute")
8584
.hasParent(trace.getSpan(0))
8685
.hasAttributesSatisfyingExactly(
87-
equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
88-
equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
89-
equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
86+
equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
87+
equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
88+
equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
9089
span ->
9190
span.hasName("tracedMethod")
9291
.hasParent(trace.getSpan(1))
@@ -290,16 +289,16 @@ protected Observable<String> resumeWithFallback() {
290289
.hasStatus(StatusData.error())
291290
.hasException(new IllegalArgumentException())
292291
.hasAttributesSatisfyingExactly(
293-
equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
294-
equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
295-
equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
292+
equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
293+
equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
294+
equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
296295
span ->
297296
span.hasName("ExampleGroup.TestCommand.fallback")
298297
.hasParent(trace.getSpan(1))
299298
.hasAttributesSatisfyingExactly(
300-
equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
301-
equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
302-
equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false)))));
299+
equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
300+
equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
301+
equalTo(booleanKey("hystrix.circuit_open"), experimental(false)))));
303302
}
304303

305304
private static Stream<Arguments> provideCommandFallbackArguments() {
@@ -388,17 +387,17 @@ protected Observable<String> construct() {
388387
.hasStatus(StatusData.error())
389388
.hasException(exception.getCause())
390389
.hasAttributesSatisfyingExactly(
391-
equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
392-
equalTo(HYSTRIX_GROUP, experimental("FailingGroup")),
393-
equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
390+
equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
391+
equalTo(stringKey("hystrix.group"), experimental("FailingGroup")),
392+
equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
394393
span ->
395394
span.hasName("FailingGroup.TestCommand.fallback")
396395
.hasParent(trace.getSpan(1))
397396
.hasException(hystrixRuntimeException.getFallbackException())
398397
.hasAttributesSatisfyingExactly(
399-
equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
400-
equalTo(HYSTRIX_GROUP, experimental("FailingGroup")),
401-
equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false)))));
398+
equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
399+
equalTo(stringKey("hystrix.group"), experimental("FailingGroup")),
400+
equalTo(booleanKey("hystrix.circuit_open"), experimental(false)))));
402401
}
403402

404403
private static Stream<Arguments> provideCommandNoFallbackResultsInErrorArguments() {

‎instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/v1_4/HystrixTest.java‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
package io.opentelemetry.javaagent.instrumentation.hystrix.v1_4;
77

8-
import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_CIRCUIT_OPEN;
9-
import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_COMMAND;
10-
import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.HYSTRIX_GROUP;
8+
import static io.opentelemetry.api.common.AttributeKey.booleanKey;
9+
import static io.opentelemetry.api.common.AttributeKey.stringKey;
1110
import static io.opentelemetry.javaagent.instrumentation.hystrix.v1_4.ExperimentalTestHelper.experimental;
1211
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1312
import static org.assertj.core.api.Assertions.assertThat;
@@ -66,9 +65,9 @@ private String tracedMethod() {
6665
span.hasName("ExampleGroup.TestCommand.execute")
6766
.hasParent(trace.getSpan(0))
6867
.hasAttributesSatisfyingExactly(
69-
equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
70-
equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
71-
equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
68+
equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
69+
equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
70+
equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
7271
span ->
7372
span.hasName("tracedMethod")
7473
.hasParent(trace.getSpan(1))
@@ -109,16 +108,16 @@ protected String getFallback() {
109108
.hasStatus(StatusData.error())
110109
.hasException(new IllegalArgumentException())
111110
.hasAttributesSatisfyingExactly(
112-
equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
113-
equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
114-
equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false))),
111+
equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
112+
equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
113+
equalTo(booleanKey("hystrix.circuit_open"), experimental(false))),
115114
span ->
116115
span.hasName("ExampleGroup.TestCommand.fallback")
117116
.hasParent(trace.getSpan(1))
118117
.hasAttributesSatisfyingExactly(
119-
equalTo(HYSTRIX_COMMAND, experimental("TestCommand")),
120-
equalTo(HYSTRIX_GROUP, experimental("ExampleGroup")),
121-
equalTo(HYSTRIX_CIRCUIT_OPEN, experimental(false)))));
118+
equalTo(stringKey("hystrix.command"), experimental("TestCommand")),
119+
equalTo(stringKey("hystrix.group"), experimental("ExampleGroup")),
120+
equalTo(booleanKey("hystrix.circuit_open"), experimental(false)))));
122121
}
123122

124123
private static Stream<Arguments> provideCommandActionArguments() {

‎instrumentation/internal/internal-application-logger/bootstrap/build.gradle.kts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
11
plugins {
22
id("otel.javaagent-bootstrap")
33
}
4-
5-
dependencies {
6-
compileOnly(project(":javaagent-bootstrap"))
7-
}

‎instrumentation/internal/internal-application-logger/javaagent/build.gradle.kts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ muzzle {
2121
dependencies {
2222
bootstrap(project(":instrumentation:internal:internal-application-logger:bootstrap"))
2323

24-
compileOnly(project(":javaagent-bootstrap"))
25-
2624
compileOnly("org.slf4j:slf4j-api") {
2725
version {
2826
// 1.4.0 introduced the TRACE logging level

‎instrumentation/internal/internal-class-loader/javaagent/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ plugins {
55
}
66

77
dependencies {
8-
compileOnly(project(":javaagent-bootstrap"))
98
compileOnly(project(":javaagent-tooling"))
109
compileOnly(project(":instrumentation:internal:internal-class-loader:compile-stub"))
1110

0 commit comments

Comments
 (0)