Skip to content

Commit 5c55b5b

Browse files
zeitlingerzeitlinger
committed
builder
1 parent 2634880 commit 5c55b5b

File tree

11 files changed

+51
-138
lines changed

11 files changed

+51
-138
lines changed

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ class AgentDebugLoggingTest extends JavaSmokeTest {
1515

1616
public AgentDebugLoggingTest() {
1717
super(
18-
SmokeTestTarget.builder(
19-
jdk ->
20-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
21-
+ jdk
22-
+ "-20250915.17728045097")
18+
SmokeTestTarget.springBoot()
2319
.waitStrategy(
2420
new TargetWaitStrategy.Log(
2521
Duration.ofMinutes(1),

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

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
import io.opentelemetry.semconv.incubating.HostIncubatingAttributes;
1313
import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes;
1414
import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes;
15-
import java.time.Duration;
16-
import java.util.List;
17-
import java.util.Map;
1815
import org.junit.jupiter.api.condition.DisabledIf;
1916
import org.junit.jupiter.params.ParameterizedTest;
2017
import org.junit.jupiter.params.provider.ValueSource;
@@ -24,19 +21,10 @@ class DeclarativeConfigurationSmokeTest extends JavaSmokeTest {
2421

2522
public DeclarativeConfigurationSmokeTest() {
2623
super(
27-
SmokeTestTarget.builder(
28-
jdk ->
29-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
30-
+ jdk
31-
+ "-20241021.11448062567")
32-
.waitStrategy(new TargetWaitStrategy.Log(
33-
Duration.ofMinutes(1), ".*Started SpringbootApplication in.*"))
34-
.env("OTEL_EXPERIMENTAL_CONFIG_FILE", "declarative-config.yaml"));
35-
}
36-
37-
@Override
38-
protected List<ResourceMapping> getExtraResources() {
39-
return List.of(ResourceMapping.of("declarative-config.yaml", "/declarative-config.yaml"));
24+
SmokeTestTarget.springBoot()
25+
.env("OTEL_EXPERIMENTAL_CONFIG_FILE", "declarative-config.yaml")
26+
.extraResources(
27+
ResourceMapping.of("declarative-config.yaml", "/declarative-config.yaml")));
4028
}
4129

4230
@ParameterizedTest

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,13 @@
55

66
package io.opentelemetry.smoketest;
77

8-
import static java.util.Collections.emptyList;
9-
import static java.util.Collections.emptyMap;
108
import static java.util.stream.Collectors.toSet;
119
import static org.assertj.core.api.Assertions.assertThat;
1210

1311
import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
1412
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
1513
import io.opentelemetry.smoketest.windows.WindowsTestContainerManager;
1614
import io.opentelemetry.testing.internal.armeria.client.WebClient;
17-
import java.util.List;
18-
import java.util.Map;
1915
import java.util.Set;
2016
import java.util.function.Consumer;
2117
import java.util.regex.Pattern;
@@ -65,7 +61,7 @@ protected Consumer<OutputFrame> startTarget(int jdk) {
6561
}
6662

6763
protected Consumer<OutputFrame> startTarget(String jdk, String serverVersion, boolean windows) {
68-
String targetImage = target.getGetTargetImage(jdk, serverVersion, windows);
64+
String targetImage = target.getTargetImage(jdk, serverVersion, windows);
6965
autoCleanup.deferCleanup(() -> containerManager.stopTarget());
7066

7167
return containerManager.startTarget(

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

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,19 @@
55

66
package io.opentelemetry.smoketest;
77

8+
import static org.assertj.core.api.Assertions.assertThat;
9+
810
import io.opentelemetry.sdk.logs.data.LogRecordData;
11+
import java.util.Collection;
912
import org.junit.jupiter.api.condition.DisabledIf;
1013
import org.junit.jupiter.params.ParameterizedTest;
1114
import org.junit.jupiter.params.provider.ValueSource;
1215

13-
import java.time.Duration;
14-
import java.util.Collection;
15-
16-
import static org.assertj.core.api.Assertions.assertThat;
17-
1816
@DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
1917
class LogsSmokeTest extends JavaSmokeTest {
2018

2119
public LogsSmokeTest() {
22-
super(
23-
SmokeTestTarget.builder(
24-
jdk ->
25-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
26-
+ jdk
27-
+ "-20211213.1570880324")
28-
.waitStrategy(
29-
new TargetWaitStrategy.Log(
30-
Duration.ofMinutes(1), ".*Started SpringbootApplication in.*")));
20+
super(SmokeTestTarget.springBoot());
3121
}
3222

3323
@ParameterizedTest

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

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,16 @@
1616

1717
@DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
1818
class QuarkusSmokeTest extends JavaSmokeTest {
19-
@Override
20-
protected String getTargetImage(String jdk) {
21-
return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk"
22-
+ jdk
23-
+ "-20250915.17728045126";
24-
}
25-
26-
@Override
27-
protected TargetWaitStrategy getWaitStrategy() {
28-
return new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Listening on.*");
29-
}
3019

31-
@Override
32-
protected boolean getSetServiceName() {
33-
return false;
20+
public QuarkusSmokeTest() {
21+
super(
22+
SmokeTestTarget.builder(
23+
jdk ->
24+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-quarkus:jdk"
25+
+ jdk
26+
+ "-20250915.17728045126")
27+
.waitStrategy(new TargetWaitStrategy.Log(Duration.ofMinutes(1), ".*Listening on.*"))
28+
.setServiceName(false));
3429
}
3530

3631
@ParameterizedTest

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
99

10-
import java.util.Map;
1110
import java.util.function.Consumer;
1211
import java.util.jar.Attributes;
1312
import java.util.jar.JarFile;
@@ -18,16 +17,9 @@
1817

1918
@DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
2019
class SdkDisabledSmokeTest extends JavaSmokeTest {
21-
@Override
22-
protected String getTargetImage(String jdk) {
23-
return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
24-
+ jdk
25-
+ "-20211213.1570880324";
26-
}
2720

28-
@Override
29-
protected Map<String, String> getExtraEnv() {
30-
return Map.of("OTEL_SDK_DISABLED", "true");
21+
public SdkDisabledSmokeTest() {
22+
super(SmokeTestTarget.springBoot().env("OTEL_SDK_DISABLED", "true"));
3123
}
3224

3325
@ParameterizedTest

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

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

66
package io.opentelemetry.smoketest;
77

8-
import java.util.Collections;
9-
import java.util.Map;
108
import org.junit.jupiter.api.condition.DisabledIf;
119
import org.junit.jupiter.params.ParameterizedTest;
1210
import org.junit.jupiter.params.provider.ValueSource;
1311

1412
@DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
1513
class SecurityManagerSmokeTest extends JavaSmokeTest {
1614

17-
@Override
18-
protected String getTargetImage(String jdk) {
19-
return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk"
20-
+ jdk
21-
+ "-20250915.17728045123";
22-
}
23-
24-
@Override
25-
protected Map<String, String> getExtraEnv() {
26-
return Collections.singletonMap(
27-
"OTEL_JAVAAGENT_EXPERIMENTAL_SECURITY_MANAGER_SUPPORT_ENABLED", "true");
15+
public SecurityManagerSmokeTest() {
16+
super(
17+
SmokeTestTarget.builder(
18+
jdk ->
19+
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk"
20+
+ jdk
21+
+ "-20250915.17728045123")
22+
.env("OTEL_JAVAAGENT_EXPERIMENTAL_SECURITY_MANAGER_SUPPORT_ENABLED", "true"));
2823
}
2924

3025
@ParameterizedTest

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@
66
package io.opentelemetry.smoketest;
77

88
import java.time.Duration;
9+
import java.util.HashMap;
910
import java.util.List;
1011
import java.util.Map;
1112
import java.util.function.Function;
12-
13-
import static java.util.Collections.emptyMap;
13+
import javax.annotation.Nullable;
1414

1515
public class SmokeTestTarget {
1616

1717
@FunctionalInterface
18-
interface GetTargetImage {
18+
public interface GetTargetImage {
1919
String getTargetImage(String jdk, String serverVersion, boolean windows);
2020
}
2121

@@ -48,11 +48,11 @@ public SmokeTestTarget(
4848
this.extraPorts = extraPorts;
4949
}
5050

51-
public GetTargetImage getGetTargetImage() {
52-
return getTargetImage;
53-
}
51+
public String getTargetImage(String jdk, String serverVersion, boolean windows) {
52+
return getTargetImage.getTargetImage(jdk, serverVersion, windows);
53+
}
5454

55-
public String[] getCommand() {
55+
public String[] getCommand() {
5656
return command;
5757
}
5858

@@ -101,7 +101,7 @@ public static Builder springBoot() {
101101
jdk ->
102102
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
103103
+ jdk
104-
+ "-20211213.1570880324")
104+
+ "-20250915.17728045097")
105105
.waitStrategy(
106106
new TargetWaitStrategy.Log(
107107
Duration.ofMinutes(1), ".*Started SpringbootApplication in.*"));
@@ -112,14 +112,13 @@ public static class Builder {
112112
private String[] command;
113113
private String jvmArgsEnvVarName = "JAVA_TOOL_OPTIONS";
114114
private boolean setServiceName = true;
115-
private Map<String, String> extraEnv;
116-
private List<ResourceMapping> extraResources;
115+
private final Map<String, String> extraEnv = new HashMap<>();
116+
private List<ResourceMapping> extraResources = List.of();
117117
private TargetWaitStrategy waitStrategy;
118-
private List<Integer> extraPorts;
118+
private List<Integer> extraPorts = List.of();
119119

120120
private Builder(GetTargetImage getTargetImage) {
121121
this.getTargetImage = getTargetImage;
122-
this.extraEnv = emptyMap();
123122
}
124123

125124
public Builder command(String... command) {
@@ -147,7 +146,7 @@ public Builder extraResources(ResourceMapping... resources) {
147146
return this;
148147
}
149148

150-
public Builder waitStrategy(TargetWaitStrategy waitStrategy) {
149+
public Builder waitStrategy(@Nullable TargetWaitStrategy waitStrategy) {
151150
this.waitStrategy = waitStrategy;
152151
return this;
153152
}

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

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
import io.opentelemetry.semconv.incubating.OsIncubatingAttributes;
1515
import io.opentelemetry.semconv.incubating.TelemetryIncubatingAttributes;
1616
import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes;
17-
import java.time.Duration;
1817
import java.util.List;
19-
import java.util.Map;
2018
import java.util.Set;
2119
import java.util.function.Consumer;
2220
import java.util.jar.Attributes;
@@ -29,27 +27,13 @@
2927

3028
@DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
3129
class SpringBootSmokeTest extends JavaSmokeTest {
32-
@Override
33-
protected String getTargetImage(String jdk) {
34-
return "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
35-
+ jdk
36-
+ "-20241021.11448062567";
37-
}
38-
39-
@Override
40-
protected boolean getSetServiceName() {
41-
return false;
42-
}
43-
44-
@Override
45-
protected Map<String, String> getExtraEnv() {
46-
return Map.of("OTEL_METRICS_EXPORTER", "otlp", "OTEL_RESOURCE_ATTRIBUTES", "foo=bar");
47-
}
4830

49-
@Override
50-
protected TargetWaitStrategy getWaitStrategy() {
51-
return new TargetWaitStrategy.Log(
52-
Duration.ofMinutes(1), ".*Started SpringbootApplication in.*");
31+
public SpringBootSmokeTest() {
32+
super(
33+
SmokeTestTarget.springBoot()
34+
.setServiceName(false)
35+
.env("OTEL_METRICS_EXPORTER", "otlp")
36+
.env("OTEL_RESOURCE_ATTRIBUTES", "foo=bar"));
5337
}
5438

5539
@ParameterizedTest

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

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,19 @@
55

66
package io.opentelemetry.smoketest.propagation;
77

8+
import static org.assertj.core.api.Assertions.assertThat;
9+
810
import io.opentelemetry.smoketest.JavaSmokeTest;
911
import io.opentelemetry.smoketest.SmokeTestTarget;
10-
import io.opentelemetry.smoketest.TargetWaitStrategy;
1112
import io.opentelemetry.testing.internal.armeria.common.AggregatedHttpResponse;
1213
import org.junit.jupiter.api.Test;
1314
import org.junit.jupiter.api.condition.DisabledIf;
1415

15-
import java.time.Duration;
16-
17-
import static org.assertj.core.api.Assertions.assertThat;
18-
1916
@DisabledIf("io.opentelemetry.smoketest.TestContainerManager#useWindowsContainers")
2017
class OtTracePropagationTest extends JavaSmokeTest {
2118

2219
public OtTracePropagationTest() {
23-
super(
24-
SmokeTestTarget.builder(
25-
jdk ->
26-
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk"
27-
+ jdk
28-
+ "-20211213.1570880324")
29-
.waitStrategy(
30-
new TargetWaitStrategy.Log(
31-
Duration.ofMinutes(1), ".*Started SpringbootApplication in.*"))
32-
.env("otel.propagators", "ottrace"));
20+
super(SmokeTestTarget.springBoot().env("otel.propagators", "ottrace"));
3321
}
3422

3523
@Test

0 commit comments

Comments
 (0)