From dabc83338b15d4b67a2e164b111a715d78a87a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 29 Jul 2024 10:32:35 +0200 Subject: [PATCH] Polish "Add support for Grafana LGTM stack" See gh-41551 --- ...oseConnectionDetailsFactoryIntegrationTests.java} | 6 +++--- ...oseConnectionDetailsFactoryIntegrationTests.java} | 6 +++--- ...poseConnectionDetailsFactoryIntegrationTests.java | 4 ++-- ...poseConnectionDetailsFactoryIntegrationTests.java | 4 ++-- ...MetricsDockerComposeConnectionDetailsFactory.java | 2 +- ...TracingDockerComposeConnectionDetailsFactory.java | 2 +- .../reference/pages/testing/testcontainers.adoc | 4 ++-- ...nerConnectionDetailsFactoryIntegrationTests.java} | 4 ++-- ...nerConnectionDetailsFactoryIntegrationTests.java} | 5 ++--- ...tryMetricsContainerConnectionDetailsFactory.java} | 11 +++++------ ...tryTracingContainerConnectionDetailsFactory.java} | 11 +++++------ .../src/main/resources/META-INF/spring.factories | 4 ++-- .../boot/testsupport/container/TestImage.java | 12 ++++++------ 13 files changed, 36 insertions(+), 39 deletions(-) rename spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/{GrafanaOtelMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java => GrafanaOpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java} (85%) rename spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/{GrafanaOtelTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java => GrafanaOpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java} (85%) rename spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/{GrafanaOtelLgtmMetricsContainerConnectionDetailsFactoryIntegrationTests.java => GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java} (96%) rename spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/{GrafanaOtelLgtmTracingContainerConnectionDetailsFactoryIntegrationTests.java => GrafanaOpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java} (92%) rename spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/{GrafanaOtelLgtmMetricsContainerConnectionDetailsFactory.java => GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactory.java} (87%) rename spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/{GrafanaOtelLgtmTracingContainerConnectionDetailsFactory.java => GrafanaOpenTelemetryTracingContainerConnectionDetailsFactory.java} (87%) diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/GrafanaOtelMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/GrafanaOpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 85% rename from spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/GrafanaOtelMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/GrafanaOpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java index ca6b824e95..81f9632a39 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/GrafanaOtelMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/GrafanaOpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -23,12 +23,12 @@ import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for - * {@link OpenTelemetryMetricsDockerComposeConnectionDetailsFactory}. + * Integration tests for {@link OpenTelemetryMetricsDockerComposeConnectionDetailsFactory} + * using {@link TestImage#GRAFANA_OTEL_LGTM}. * * @author Eddú Meléndez */ -class GrafanaOtelMetricsDockerComposeConnectionDetailsFactoryIntegrationTests { +class GrafanaOpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests { @DockerComposeTest(composeFile = "otlp-compose.yaml", image = TestImage.GRAFANA_OTEL_LGTM) void runCreatesConnectionDetails(OtlpMetricsConnectionDetails connectionDetails) { diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/GrafanaOtelTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/GrafanaOpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 85% rename from spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/GrafanaOtelTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/GrafanaOpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java index ee9b63c5e8..f5158cef6d 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/GrafanaOtelTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/GrafanaOpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -23,12 +23,12 @@ import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for - * {@link OpenTelemetryTracingDockerComposeConnectionDetailsFactory}. + * Integration tests for {@link OpenTelemetryTracingDockerComposeConnectionDetailsFactory} + * using {@link TestImage#GRAFANA_OTEL_LGTM}. * * @author Eddú Meléndez */ -class GrafanaOtelTracingDockerComposeConnectionDetailsFactoryIntegrationTests { +class GrafanaOpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests { @DockerComposeTest(composeFile = "otlp-compose.yaml", image = TestImage.GRAFANA_OTEL_LGTM) void runCreatesConnectionDetails(OtlpTracingConnectionDetails connectionDetails) { diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java index 3ec07184e9..c885e10636 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -23,8 +23,8 @@ import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for - * {@link OpenTelemetryMetricsDockerComposeConnectionDetailsFactory}. + * Integration tests for {@link OpenTelemetryMetricsDockerComposeConnectionDetailsFactory} + * using {@link TestImage#OPENTELEMETRY}. * * @author Eddú Meléndez */ diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java index 97fc794c62..50a713e7fd 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -23,8 +23,8 @@ import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for - * {@link OpenTelemetryTracingDockerComposeConnectionDetailsFactory}. + * Integration tests for {@link OpenTelemetryTracingDockerComposeConnectionDetailsFactory} + * using {@link TestImage#OPENTELEMETRY}. * * @author Eddú Meléndez */ diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactory.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactory.java index 5721ee20dd..419bf357be 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactory.java +++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryMetricsDockerComposeConnectionDetailsFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactory.java b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactory.java index 6d93f3385d..d2be0b11ee 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactory.java +++ b/spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryTracingDockerComposeConnectionDetailsFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc index ef7bcdd4cb..2e1f7b157f 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc @@ -72,10 +72,10 @@ The following service connection factories are provided in the `spring-boot-test | Containers of type `Neo4jContainer` | `OtlpMetricsConnectionDetails` -| Containers named "otel/opentelemetry-collector-contrib" or `LgtmStackContainer` +| Containers named "otel/opentelemetry-collector-contrib" or of type `LgtmStackContainer` | `OtlpTracingConnectionDetails` -| Containers named "otel/opentelemetry-collector-contrib" or `LgtmStackContainer` +| Containers named "otel/opentelemetry-collector-contrib" or of type `LgtmStackContainer` | `PulsarConnectionDetails` | Containers of type `PulsarContainer` diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOtelLgtmMetricsContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java similarity index 96% rename from spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOtelLgtmMetricsContainerConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java index 7e2f62c2b7..fed9b1ed06 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOtelLgtmMetricsContainerConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests.java @@ -45,7 +45,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link GrafanaOtelLgtmMetricsContainerConnectionDetailsFactory}. + * Tests for {@link GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactory}. * * @author Eddú Meléndez */ @@ -53,7 +53,7 @@ import static org.assertj.core.api.Assertions.assertThat; @TestPropertySource(properties = { "management.otlp.metrics.export.resource-attributes.service.name=test", "management.otlp.metrics.export.step=1s" }) @Testcontainers(disabledWithoutDocker = true) -class GrafanaOtelLgtmMetricsContainerConnectionDetailsFactoryIntegrationTests { +class GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection diff --git a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOtelLgtmTracingContainerConnectionDetailsFactoryIntegrationTests.java b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java similarity index 92% rename from spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOtelLgtmTracingContainerConnectionDetailsFactoryIntegrationTests.java rename to spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java index e16fcbe574..c513914566 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOtelLgtmTracingContainerConnectionDetailsFactoryIntegrationTests.java +++ b/spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests.java @@ -33,14 +33,13 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for - * {@link GrafanaOtelLgtmTracingContainerConnectionDetailsFactoryIntegrationTests}. + * Tests for {@link GrafanaOpenTelemetryTracingContainerConnectionDetailsFactory}. * * @author Eddú Meléndez */ @SpringJUnitConfig @Testcontainers(disabledWithoutDocker = true) -class GrafanaOtelLgtmTracingContainerConnectionDetailsFactoryIntegrationTests { +class GrafanaOpenTelemetryTracingContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOtelLgtmMetricsContainerConnectionDetailsFactory.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactory.java similarity index 87% rename from spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOtelLgtmMetricsContainerConnectionDetailsFactory.java rename to spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactory.java index f4daf7daf0..130e6d6ffe 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOtelLgtmMetricsContainerConnectionDetailsFactory.java +++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ package org.springframework.boot.testcontainers.service.connection.otlp; -import org.testcontainers.containers.GenericContainer; import org.testcontainers.grafana.LgtmStackContainer; import org.springframework.boot.actuate.autoconfigure.metrics.export.otlp.OtlpMetricsConnectionDetails; @@ -27,15 +26,15 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect /** * {@link ContainerConnectionDetailsFactory} to create * {@link OtlpMetricsConnectionDetails} from a - * {@link ServiceConnection @ServiceConnection}-annotated {@link GenericContainer} using - * the {@code "otel/opentelemetry-collector-contrib"} image. + * {@link ServiceConnection @ServiceConnection}-annotated {@link LgtmStackContainer} using + * the {@code "grafana/otel-lgtmb"} image. * * @author Eddú Meléndez */ -class GrafanaOtelLgtmMetricsContainerConnectionDetailsFactory +class GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactory extends ContainerConnectionDetailsFactory { - GrafanaOtelLgtmMetricsContainerConnectionDetailsFactory() { + GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactory() { super(ANY_CONNECTION_NAME, "org.springframework.boot.actuate.autoconfigure.metrics.export.otlp.OtlpMetricsExportAutoConfiguration"); } diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOtelLgtmTracingContainerConnectionDetailsFactory.java b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryTracingContainerConnectionDetailsFactory.java similarity index 87% rename from spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOtelLgtmTracingContainerConnectionDetailsFactory.java rename to spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryTracingContainerConnectionDetailsFactory.java index 4433c7458d..eb03927598 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOtelLgtmTracingContainerConnectionDetailsFactory.java +++ b/spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/GrafanaOpenTelemetryTracingContainerConnectionDetailsFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,6 @@ package org.springframework.boot.testcontainers.service.connection.otlp; -import org.testcontainers.containers.GenericContainer; import org.testcontainers.grafana.LgtmStackContainer; import org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpTracingConnectionDetails; @@ -27,15 +26,15 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect /** * {@link ContainerConnectionDetailsFactory} to create * {@link OtlpTracingConnectionDetails} from a - * {@link ServiceConnection @ServiceConnection}-annotated {@link GenericContainer} using - * the {@code "otel/opentelemetry-collector-contrib"} image. + * {@link ServiceConnection @ServiceConnection}-annotated {@link LgtmStackContainer} using + * the {@code "grafana/otel-lgtm"} image. * * @author Eddú Meléndez */ -class GrafanaOtelLgtmTracingContainerConnectionDetailsFactory +class GrafanaOpenTelemetryTracingContainerConnectionDetailsFactory extends ContainerConnectionDetailsFactory { - GrafanaOtelLgtmTracingContainerConnectionDetailsFactory() { + GrafanaOpenTelemetryTracingContainerConnectionDetailsFactory() { super(ANY_CONNECTION_NAME, "org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpAutoConfiguration"); } diff --git a/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring.factories b/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring.factories index 727f4d50f6..6e222c0012 100644 --- a/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring.factories +++ b/spring-boot-project/spring-boot-testcontainers/src/main/resources/META-INF/spring.factories @@ -23,8 +23,8 @@ org.springframework.boot.testcontainers.service.connection.ldap.OpenLdapContaine org.springframework.boot.testcontainers.service.connection.liquibase.LiquibaseContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.mongo.MongoContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.neo4j.Neo4jContainerConnectionDetailsFactory,\ -org.springframework.boot.testcontainers.service.connection.otlp.GrafanaOtelLgtmMetricsContainerConnectionDetailsFactory,\ -org.springframework.boot.testcontainers.service.connection.otlp.GrafanaOtelLgtmTracingContainerConnectionDetailsFactory,\ +org.springframework.boot.testcontainers.service.connection.otlp.GrafanaOpenTelemetryMetricsContainerConnectionDetailsFactory,\ +org.springframework.boot.testcontainers.service.connection.otlp.GrafanaOpenTelemetryTracingContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.otlp.OpenTelemetryMetricsContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.otlp.OpenTelemetryTracingContainerConnectionDetailsFactory,\ org.springframework.boot.testcontainers.service.connection.pulsar.PulsarContainerConnectionDetailsFactory,\ diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java index db26620b20..26c5a3eb27 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support-docker/src/main/java/org/springframework/boot/testsupport/container/TestImage.java @@ -101,6 +101,12 @@ public enum TestImage { */ ELASTICSEARCH_8("elasticsearch", "8.6.1"), + /** + * A container image suitable for testing Grafana OTel LGTM. + */ + GRAFANA_OTEL_LGTM("grafana/otel-lgtm", "0.6.0", () -> LgtmStackContainer.class, + (container) -> ((LgtmStackContainer) container).withStartupTimeout(Duration.ofMinutes(2))), + /** * A container image suitable for testing Confluent's distribution of Kafka. */ @@ -159,12 +165,6 @@ public enum TestImage { */ OPENTELEMETRY("otel/opentelemetry-collector-contrib", "0.75.0"), - /** - * A container image suitable for testing Grafana Otel LGTM. - */ - GRAFANA_OTEL_LGTM("grafana/otel-lgtm", "0.6.0", () -> LgtmStackContainer.class, - (container) -> ((LgtmStackContainer) container).withStartupTimeout(Duration.ofMinutes(2))), - /** * A container image suitable for testing Postgres. */