Skip to content

Commit fd9011b

Browse files
zeitlingerzeitlinger
committed
unnest
1 parent 3760f5a commit fd9011b

13 files changed

+169
-195
lines changed

‎smoke-tests/src/main/java/io/opentelemetry/smoketest/AbstractRemoteTelemetryTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.smoketest;
27

38
import java.util.function.Consumer;

‎smoke-tests/src/main/java/io/opentelemetry/smoketest/SmokeTestInstrumentationExtension.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.smoketest;
27

38
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -23,10 +28,9 @@ public void beforeEach(ExtensionContext extensionContext) {
2328
}
2429

2530
SmokeTestRunner smokeTestRunner = (SmokeTestRunner) getTestRunner();
26-
((AbstractRemoteTelemetryTest) testInstance).configureTelemetryRetriever(
27-
smokeTestRunner::setTelemetryRetriever);
31+
((AbstractRemoteTelemetryTest) testInstance)
32+
.configureTelemetryRetriever(smokeTestRunner::setTelemetryRetriever);
2833

2934
super.beforeEach(extensionContext);
3035
}
3136
}
32-

‎smoke-tests/src/main/java/io/opentelemetry/smoketest/SmokeTestRunner.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.smoketest;
27

38
import io.opentelemetry.api.OpenTelemetry;
@@ -26,12 +31,10 @@ void setTelemetryRetriever(RemoteTelemetryRetriever telemetryRetriever) {
2631
}
2732

2833
@Override
29-
public void beforeTestClass() {
30-
}
34+
public void beforeTestClass() {}
3135

3236
@Override
33-
public void afterTestClass() {
34-
}
37+
public void afterTestClass() {}
3538

3639
@Override
3740
public void clearAllExportedData() {

‎smoke-tests/src/test/java/io/opentelemetry/smoketest/AgentDebugLoggingTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ protected TargetWaitStrategy getWaitStrategy() {
2727

2828
@DisplayName("verifies that debug logging is working by checking for a debug log on startup")
2929
@Test
30-
void verifyLogging() throws Exception {
31-
runTarget(8, output -> {});
30+
void verifyLogging() {
31+
startTarget(8);
3232
}
3333
}

‎smoke-tests/src/test/java/io/opentelemetry/smoketest/DeclarativeConfigurationSmokeTest.java‎

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -49,44 +49,41 @@ protected TargetWaitStrategy getWaitStrategy() {
4949

5050
@ParameterizedTest
5151
@ValueSource(ints = {8, 11, 17})
52-
void springBootSmokeTest(int jdk) throws Exception {
53-
runTarget(
54-
jdk,
55-
output -> {
56-
client().get("/greeting").aggregate().join();
57-
List<SpanData> traces = waitForTraces();
58-
assertThat(traces).hasSize(1);
52+
void springBootSmokeTest(int jdk) {
53+
startTarget(jdk);
5954

60-
// There is one span (io.opentelemetry.opentelemetry-instrumentation-annotations-1.16 is
61-
// not used,
62-
// because instrumentation_mode=none)
63-
TracesAssert.assertThat(traces)
64-
.hasTracesSatisfyingExactly(
65-
trace ->
66-
trace.hasSpansSatisfyingExactly(
67-
span ->
68-
span.hasResourceSatisfying(
69-
resource ->
70-
resource
71-
.hasAttribute(
72-
ServiceAttributes.SERVICE_NAME,
73-
"declarative-config-smoke-test")
74-
.hasAttribute(
75-
satisfies(
76-
ContainerIncubatingAttributes.CONTAINER_ID,
77-
v -> v.isNotBlank()))
78-
.hasAttribute(
79-
satisfies(
80-
ProcessIncubatingAttributes
81-
.PROCESS_EXECUTABLE_PATH,
82-
v -> v.isNotBlank()))
83-
.hasAttribute(
84-
satisfies(
85-
HostIncubatingAttributes.HOST_NAME,
86-
v -> v.isNotBlank()))
87-
.hasAttribute(
88-
TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME,
89-
"opentelemetry-javaagent"))));
90-
});
55+
client().get("/greeting").aggregate().join();
56+
List<SpanData> traces = waitForTraces();
57+
assertThat(traces).hasSize(1);
58+
59+
// There is one span (io.opentelemetry.opentelemetry-instrumentation-annotations-1.16 is
60+
// not used,
61+
// because instrumentation_mode=none)
62+
TracesAssert.assertThat(traces)
63+
.hasTracesSatisfyingExactly(
64+
trace ->
65+
trace.hasSpansSatisfyingExactly(
66+
span ->
67+
span.hasResourceSatisfying(
68+
resource ->
69+
resource
70+
.hasAttribute(
71+
ServiceAttributes.SERVICE_NAME,
72+
"declarative-config-smoke-test")
73+
.hasAttribute(
74+
satisfies(
75+
ContainerIncubatingAttributes.CONTAINER_ID,
76+
v -> v.isNotBlank()))
77+
.hasAttribute(
78+
satisfies(
79+
ProcessIncubatingAttributes.PROCESS_EXECUTABLE_PATH,
80+
v -> v.isNotBlank()))
81+
.hasAttribute(
82+
satisfies(
83+
HostIncubatingAttributes.HOST_NAME,
84+
v -> v.isNotBlank()))
85+
.hasAttribute(
86+
TelemetryIncubatingAttributes.TELEMETRY_DISTRO_NAME,
87+
"opentelemetry-javaagent"))));
9188
}
9289
}

‎smoke-tests/src/test/java/io/opentelemetry/smoketest/JavaSmokeTest.java‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,7 @@ void setUp() {
7979
telemetryRetriever = new RemoteTelemetryRetriever(containerManager.getBackendMappedPort());
8080
}
8181

82-
public void runTarget(int jdk, TargetRunner runner) throws Exception {
83-
Consumer<OutputFrame> startTarget = startTarget(jdk);
84-
try {
85-
runner.runInTarget(startTarget);
86-
} finally {
87-
stopTarget();
88-
}
89-
}
90-
91-
protected Consumer<OutputFrame> startTarget(int jdk) {
82+
protected Consumer<OutputFrame> startTarget(int jdk) {
9283
return startTarget(String.valueOf(jdk), null, false);
9384
}
9485

‎smoke-tests/src/test/java/io/opentelemetry/smoketest/LogsSmokeTest.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,11 @@ protected TargetWaitStrategy getWaitStrategy() {
3131

3232
@ParameterizedTest
3333
@ValueSource(ints = {8, 11, 17})
34-
void shouldExportLogs(int jdk) throws Exception {
35-
runTarget(
36-
jdk,
37-
output -> {
38-
client().get("/greeting").aggregate().join();
39-
Collection<LogRecordData> logs = waitForLogs();
34+
void shouldExportLogs(int jdk) {
35+
startTarget(jdk);
36+
client().get("/greeting").aggregate().join();
37+
Collection<LogRecordData> logs = waitForLogs();
4038

41-
assertThat(logs).isNotEmpty();
42-
});
39+
assertThat(logs).isNotEmpty();
4340
}
4441
}

‎smoke-tests/src/test/java/io/opentelemetry/smoketest/QuarkusSmokeTest.java‎

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -38,36 +38,31 @@ protected boolean getSetServiceName() {
3838
@ParameterizedTest
3939
@ValueSource(ints = {17, 21, 23}) // Quarkus 3.7+ requires Java 17+
4040
void quarkusSmokeTest(int jdk) throws Exception {
41-
runTarget(
42-
jdk,
43-
output -> {
44-
String currentAgentVersion;
45-
try (JarFile agentJar = new JarFile(agentPath)) {
46-
currentAgentVersion =
47-
agentJar
48-
.getManifest()
49-
.getMainAttributes()
50-
.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
51-
}
41+
startTarget(jdk);
42+
String currentAgentVersion;
43+
try (JarFile agentJar = new JarFile(agentPath)) {
44+
currentAgentVersion =
45+
agentJar
46+
.getManifest()
47+
.getMainAttributes()
48+
.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
49+
}
5250

53-
client().get("/hello").aggregate().join();
51+
client().get("/hello").aggregate().join();
5452

55-
assertThat(waitForTraces())
56-
.hasTracesSatisfyingExactly(
57-
trace ->
58-
trace.hasSpansSatisfyingExactly(
59-
span ->
60-
span.hasName("GET /hello")
61-
.hasResourceSatisfying(
62-
resource -> {
63-
resource
64-
.hasAttribute(
65-
TelemetryIncubatingAttributes
66-
.TELEMETRY_DISTRO_VERSION,
67-
currentAgentVersion)
68-
.hasAttribute(
69-
ServiceAttributes.SERVICE_NAME, "quarkus");
70-
})));
71-
});
53+
assertThat(waitForTraces())
54+
.hasTracesSatisfyingExactly(
55+
trace ->
56+
trace.hasSpansSatisfyingExactly(
57+
span ->
58+
span.hasName("GET /hello")
59+
.hasResourceSatisfying(
60+
resource -> {
61+
resource
62+
.hasAttribute(
63+
TelemetryIncubatingAttributes.TELEMETRY_DISTRO_VERSION,
64+
currentAgentVersion)
65+
.hasAttribute(ServiceAttributes.SERVICE_NAME, "quarkus");
66+
})));
7267
}
7368
}

‎smoke-tests/src/test/java/io/opentelemetry/smoketest/SdkDisabledSmokeTest.java‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,17 @@ protected Map<String, String> getExtraEnv() {
3131
@ParameterizedTest
3232
@ValueSource(ints = {8, 11, 17})
3333
void noopSdkSmokeTest(int jdk) throws Exception {
34-
runTarget(
35-
jdk,
36-
output -> {
37-
String currentAgentVersion =
38-
new JarFile(agentPath)
39-
.getManifest()
40-
.getMainAttributes()
41-
.get(Attributes.Name.IMPLEMENTATION_VERSION)
42-
.toString();
34+
startTarget(jdk);
35+
String currentAgentVersion =
36+
new JarFile(agentPath)
37+
.getManifest()
38+
.getMainAttributes()
39+
.get(Attributes.Name.IMPLEMENTATION_VERSION)
40+
.toString();
4341

44-
assertThat(client().get("/greeting").aggregate().join().contentUtf8()).isEqualTo("Hi!");
45-
assertThat(waitForTraces()).isEmpty();
46-
assertVersionLogged(output, currentAgentVersion);
47-
assertThat(waitForTraces()).isEmpty();
48-
});
42+
assertThat(client().get("/greeting").aggregate().join().contentUtf8()).isEqualTo("Hi!");
43+
assertThat(waitForTraces()).isEmpty();
44+
assertVersionLogged(output, currentAgentVersion);
45+
assertThat(waitForTraces()).isEmpty();
4946
}
5047
}

‎smoke-tests/src/test/java/io/opentelemetry/smoketest/SecurityManagerSmokeTest.java‎

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

66
package io.opentelemetry.smoketest;
77

8-
import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
98
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
109
import java.util.Collections;
1110
import java.util.Map;

0 commit comments

Comments
 (0)