diff --git a/smoke-tests-otel-starter/spring-boot-3.2/src/main/resources/application.yaml b/smoke-tests-otel-starter/spring-boot-3.2/src/main/resources/application.yaml new file mode 100644 index 000000000000..0533d63c9b88 --- /dev/null +++ b/smoke-tests-otel-starter/spring-boot-3.2/src/main/resources/application.yaml @@ -0,0 +1,47 @@ +otel: + # "file_format" serves as opt-in to the new file format + file_format: "1.0-rc.1" + resource: + detection/development: + detectors: + - service: + attributes: + - name: service.name + value: declarative-config-spring-boot-3 + + tracer_provider: + processors: + - simple: + exporter: + test: + - simple: + exporter: + console: + + logger_provider: + processors: + - simple: + exporter: + test: + + meter_provider: + readers: + - periodic: + # Set really long interval. We'll call forceFlush when we need the metrics + # instead of collecting them periodically. + interval: 1000000 + exporter: + test: + + propagator: + composite: + - tracecontext: + - baggage: + + instrumentation/development: + java: + runtime-telemetry: + emit_experimental_telemetry: true + http: + client: + emit_experimental_telemetry: true diff --git a/smoke-tests-otel-starter/spring-boot-3.2/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java b/smoke-tests-otel-starter/spring-boot-3.2/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java index f01bafb6e22e..5508312be896 100644 --- a/smoke-tests-otel-starter/spring-boot-3.2/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java +++ b/smoke-tests-otel-starter/spring-boot-3.2/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java @@ -8,7 +8,6 @@ import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.SpanKind; -import io.opentelemetry.sdk.testing.assertj.TraceAssert; import io.opentelemetry.semconv.HttpAttributes; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -41,18 +40,12 @@ void restClient() { .body(String.class)) .isEqualTo("pong"); - if (System.getProperty("org.graalvm.nativeimage.imagecode") != null) { - // ignore the trace for creating the db table - testing.waitAndAssertTraces(trace -> {}, OtelSpringStarterSmokeTest::assertClient); - } else { - testing.waitAndAssertTraces(OtelSpringStarterSmokeTest::assertClient); - } - } - - private static void assertClient(TraceAssert traceAssert) { - traceAssert.hasSpansSatisfyingExactly( - span -> HttpSpanDataAssert.create(span).assertClientGetRequest("/ping"), - span -> span.hasKind(SpanKind.SERVER).hasAttribute(HttpAttributes.HTTP_ROUTE, "/ping"), - span -> withSpanAssert(span)); + testing.waitAndAssertTraces( + traceAssert -> + traceAssert.hasSpansSatisfyingExactly( + span -> HttpSpanDataAssert.create(span).assertClientGetRequest("/ping"), + span -> + span.hasKind(SpanKind.SERVER).hasAttribute(HttpAttributes.HTTP_ROUTE, "/ping"), + span -> withSpanAssert(span))); } }