Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move Zipkin Docker Compose support into spring-boot-zipkin

Browse Source
This commit is contained in:
Phillip Webb
2025-05-23 14:54:46 -07:00
parent 86a0d9b64d
commit 232ab3dedb
7 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-docker-compose-all/src/main/resources/META-INF/spring.factories
View File

@@ -2,5 +2,4 @@
org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\ org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
org.springframework.boot.docker.compose.service.connection.otlp.OpenTelemetryLoggingDockerComposeConnectionDetailsFactory,\ org.springframework.boot.docker.compose.service.connection.otlp.OpenTelemetryLoggingDockerComposeConnectionDetailsFactory,\
org.springframework.boot.docker.compose.service.connection.otlp.OpenTelemetryMetricsDockerComposeConnectionDetailsFactory,\ org.springframework.boot.docker.compose.service.connection.otlp.OpenTelemetryMetricsDockerComposeConnectionDetailsFactory,\
org.springframework.boot.docker.compose.service.connection.otlp.OpenTelemetryTracingDockerComposeConnectionDetailsFactory,\ org.springframework.boot.docker.compose.service.connection.otlp.OpenTelemetryTracingDockerComposeConnectionDetailsFactory
org.springframework.boot.docker.compose.service.connection.zipkin.ZipkinDockerComposeConnectionDetailsFactory

2
spring-boot-project/spring-boot-zipkin/build.gradle
View File

@@ -14,11 +14,13 @@ dependencies {
api("io.zipkin.reporter2:zipkin-reporter-brave") api("io.zipkin.reporter2:zipkin-reporter-brave")
optional(project(":spring-boot-project:spring-boot-autoconfigure")) optional(project(":spring-boot-project:spring-boot-autoconfigure"))
optional(project(":spring-boot-project:spring-boot-docker-compose"))
optional(project(":spring-boot-project:spring-boot-testcontainers")) optional(project(":spring-boot-project:spring-boot-testcontainers"))
optional("io.zipkin.reporter2:zipkin-reporter-brave") optional("io.zipkin.reporter2:zipkin-reporter-brave")
dockerTestImplementation(project(":spring-boot-project:spring-boot-test")) dockerTestImplementation(project(":spring-boot-project:spring-boot-test"))
dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker")) dockerTestImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"))
dockerTestImplementation(testFixtures(project(":spring-boot-project:spring-boot-docker-compose")))
dockerTestImplementation("org.testcontainers:junit-jupiter") dockerTestImplementation("org.testcontainers:junit-jupiter")
testImplementation(project(":spring-boot-project:spring-boot-test")) testImplementation(project(":spring-boot-project:spring-boot-test"))

2
spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/zipkin/ZipkinDockerComposeConnectionDetailsFactoryIntegrationTests.java → spring-boot-project/spring-boot-zipkin/src/dockerTest/java/org/springframework/boot/zipkin/docker/compose/ZipkinDockerComposeConnectionDetailsFactoryIntegrationTests.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.boot.docker.compose.service.connection.zipkin; package org.springframework.boot.zipkin.docker.compose;
import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
import org.springframework.boot.testsupport.container.TestImage; import org.springframework.boot.testsupport.container.TestImage;

0
spring-boot-project/spring-boot-docker-compose-all/src/dockerTest/resources/org/springframework/boot/docker/compose/service/connection/zipkin/zipkin-compose.yaml → spring-boot-project/spring-boot-zipkin/src/dockerTest/resources/org/springframework/boot/zipkin/docker/compose/zipkin-compose.yaml
View File

5
spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/zipkin/ZipkinDockerComposeConnectionDetailsFactory.java → spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/docker/compose/ZipkinDockerComposeConnectionDetailsFactory.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.boot.docker.compose.service.connection.zipkin; package org.springframework.boot.zipkin.docker.compose;
import org.springframework.boot.docker.compose.core.RunningService; import org.springframework.boot.docker.compose.core.RunningService;
import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionDetailsFactory; import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionDetailsFactory;
@@ -35,8 +35,7 @@ class ZipkinDockerComposeConnectionDetailsFactory
private static final int ZIPKIN_PORT = 9411; private static final int ZIPKIN_PORT = 9411;
ZipkinDockerComposeConnectionDetailsFactory() { ZipkinDockerComposeConnectionDetailsFactory() {
super("openzipkin/zipkin", super("openzipkin/zipkin", "org.springframework.boot.zipkin.autoconfigure.ZipkinAutoConfiguration");
"org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration");
} }
@Override @Override

4
spring-boot-project/spring-boot-docker-compose-all/src/main/java/org/springframework/boot/docker/compose/service/connection/zipkin/package-info.java → spring-boot-project/spring-boot-zipkin/src/main/java/org/springframework/boot/zipkin/docker/compose/package-info.java
View File

@@ -15,6 +15,6 @@
*/ */
/** /**
* Auto-configuration for Docker Compose Zipkin service connections. * Support for Docker Compose Zipkin service connections.
*/ */
package org.springframework.boot.docker.compose.service.connection.zipkin; package org.springframework.boot.zipkin.docker.compose;

1
spring-boot-project/spring-boot-zipkin/src/main/resources/META-INF/spring.factories
View File

@@ -1,3 +1,4 @@
# Connection Details Factories # Connection Details Factories
org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\ org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
org.springframework.boot.zipkin.docker.compose.ZipkinDockerComposeConnectionDetailsFactory,\
org.springframework.boot.zipkin.testcontainers.ZipkinContainerConnectionDetailsFactory org.springframework.boot.zipkin.testcontainers.ZipkinContainerConnectionDetailsFactory