Skip to content

Commit 8fc1bca

Browse files
committed
Polish "Add service connection from Opentelemetry Collector for Logging"
See gh-41324
1 parent 7adf843 commit 8fc1bca

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/opentelemetry/otlp/OtlpLoggingProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class OtlpLoggingProperties {
3535
/**
3636
* URL to the OTel collector's HTTP API.
3737
*/
38-
private String endpoint = "http://localhost:4318/v1/logs";
38+
private String endpoint;
3939

4040
/**
4141
* Call timeout for the OTel Collector to process an exported batch of data. This

spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryLoggingDockerComposeConnectionDetailsFactoryIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class OpenTelemetryLoggingDockerComposeConnectionDetailsFactoryIntegrationTests
3232

3333
@DockerComposeTest(composeFile = "otlp-compose.yaml", image = TestImage.OPENTELEMETRY)
3434
void runCreatesConnectionDetails(OtlpLoggingConnectionDetails connectionDetails) {
35-
assertThat(connectionDetails.getEndpoint()).startsWith("http://").endsWith("/v1/logs");
35+
assertThat(connectionDetails.getUrl()).startsWith("http://").endsWith("/v1/logs");
3636
}
3737

3838
}

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/otlp/OpenTelemetryLoggingDockerComposeConnectionDetailsFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private OpenTelemetryLoggingDockerComposeConnectionDetails(RunningService source
5656
}
5757

5858
@Override
59-
public String getEndpoint() {
59+
public String getUrl() {
6060
return "http://%s:%d/v1/logs".formatted(this.host, this.port);
6161
}
6262

spring-boot-project/spring-boot-testcontainers/src/dockerTest/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryLoggingContainerConnectionDetailsFactoryIntegrationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class OpenTelemetryLoggingContainerConnectionDetailsFactoryIntegrationTests {
5050

5151
@Test
5252
void connectionCanBeMadeToOpenTelemetryContainer() {
53-
assertThat(this.connectionDetails.getEndpoint())
53+
assertThat(this.connectionDetails.getUrl())
5454
.isEqualTo("http://" + container.getHost() + ":" + container.getMappedPort(4318) + "/v1/logs");
5555
}
5656

spring-boot-project/spring-boot-testcontainers/src/main/java/org/springframework/boot/testcontainers/service/connection/otlp/OpenTelemetryLoggingContainerConnectionDetailsFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private OpenTelemetryLoggingContainerConnectionDetails(ContainerConnectionSource
5454
}
5555

5656
@Override
57-
public String getEndpoint() {
57+
public String getUrl() {
5858
return "http://%s:%d/v1/logs".formatted(getContainer().getHost(), getContainer().getMappedPort(4318));
5959
}
6060

0 commit comments

Comments
 (0)