Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class AgentDebugLoggingTest extends AbstractSmokeTest<Integer> {
@Override
protected void configure(SmokeTestOptions<Integer> options) {
options
.springBoot("20251011.18424653812")
.springBoot("20251017.18602659902")
.waitStrategy(
new TargetWaitStrategy.Log(
Duration.ofMinutes(1),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class DeclarativeConfigurationSmokeTest extends AbstractSmokeTest<Integer> {
@Override
protected void configure(SmokeTestOptions<Integer> options) {
options
.springBoot("20251011.18424653812")
.springBoot("20251017.18602659902")
.env("OTEL_EXPERIMENTAL_CONFIG_FILE", "declarative-config.yaml")
.extraResources(ResourceMapping.of("declarative-config.yaml", "/declarative-config.yaml"));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class LogsSmokeTest extends AbstractSmokeTest<Integer> {

@Override
protected void configure(SmokeTestOptions<Integer> options) {
options.springBoot("20251011.18424653812");
options.springBoot("20251017.18602659902");
}

@ParameterizedTest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class PrometheusSmokeTest extends AbstractSmokeTest<Integer> {
@Override
protected void configure(SmokeTestOptions<Integer> options) {
options
.springBoot("20251011.18424653812")
.springBoot("20251017.18602659902")
.env("OTEL_METRICS_EXPORTER", "prometheus")
.env("OTEL_EXPORTER_PROMETHEUS_PORT", String.valueOf(PROMETHEUS_PORT))
.extraPorts(PROMETHEUS_PORT);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class SdkDisabledSmokeTest extends AbstractSmokeTest<Integer> {
@Override
protected void configure(SmokeTestOptions<Integer> options) {
options
.springBoot("20251011.18424653812")
.springBoot("20251017.18602659902")
.env("OTEL_SDK_DISABLED", "true")
.telemetryTimeout(Duration.ofSeconds(5));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@ protected void configure(SmokeTestOptions<Integer> options) {
.image(
jdk ->
String.format(
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk%s-20251009.18389598604",
"ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-security-manager:jdk%s-20251017.18602659887",
jdk))
.env("OTEL_JAVAAGENT_EXPERIMENTAL_SECURITY_MANAGER_SUPPORT_ENABLED", "true");
}

@ParameterizedTest
// restore after image update
// @ValueSource(ints = {8, 11, 17, 21}) // Security Manager removed in Java 25
@ValueSource(ints = {8, 21}) // Security Manager removed in Java 25
@ValueSource(ints = {8, 11, 17, 21}) // Security Manager removed in Java 25
void securityManagerSmokeTest(int jdk) {
start(jdk);
testing.waitAndAssertTraces(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,14 @@ class SpringBootSmokeTest extends AbstractSmokeTest<Integer> {
@Override
protected void configure(SmokeTestOptions<Integer> options) {
options
.springBoot("20251013.18455512027")
.springBoot("20251017.18602659902")
.setServiceName(false)
.env("OTEL_METRICS_EXPORTER", "otlp")
.env("OTEL_RESOURCE_ATTRIBUTES", "foo=bar");
}

@ParameterizedTest
// restore after image update
// @ValueSource(ints = {8, 11, 17, 21, 25})
@ValueSource(ints = {8, 21, 25})
@ValueSource(ints = {8, 11, 17, 21, 25})
void springBootSmokeTest(int jdk) {
SmokeTestOutput output = start(jdk);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class SpringBootWithSamplingSmokeTest extends AbstractSmokeTest<Integer> {
@Override
protected void configure(SmokeTestOptions<Integer> options) {
options
.springBoot("20251011.18424653812")
.springBoot("20251017.18602659902")
.env("OTEL_TRACES_SAMPLER", "parentbased_traceidratio")
.env("OTEL_TRACES_SAMPLER_ARG", String.valueOf(SAMPLER_PROBABILITY));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class OtTracePropagationTest extends AbstractSmokeTest<Integer> {

@Override
protected void configure(SmokeTestOptions<Integer> options) {
options.springBoot("20251011.18424653812").env("otel.propagators", "ottrace");
options.springBoot("20251017.18602659902").env("otel.propagators", "ottrace");
}

@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ abstract class PropagationTest extends AbstractSmokeTest<Integer> {

@Override
protected void configure(SmokeTestOptions<Integer> options) {
options.springBoot("20251011.18424653812");
options.springBoot("20251017.18602659902");
}

@Test
Expand Down
Loading