Skip to content

Commit 1020959

Browse files
committed
fixup! Create spring-boot-opentelemetry module
1 parent aaba152 commit 1020959

File tree

6 files changed

+16
-14
lines changed

6 files changed

+16
-14
lines changed

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/features/dev-services.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ The following service connections are currently supported:
110110
| javadoc:org.springframework.boot.neo4j.autoconfigure.Neo4jConnectionDetails[]
111111
| Containers named "neo4j" or "bitnami/neo4j"
112112

113-
| javadoc:org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingConnectionDetails[]
113+
| javadoc:org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingConnectionDetails[]
114114
| Containers named "otel/opentelemetry-collector-contrib", "grafana/otel-lgtm"
115115

116116
| javadoc:org.springframework.boot.actuate.autoconfigure.metrics.export.otlp.OtlpMetricsConnectionDetails[]

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ The following service connection factories are provided in the `spring-boot-test
155155
| javadoc:org.springframework.boot.neo4j.autoconfigure.Neo4jConnectionDetails[]
156156
| Containers of type javadoc:{url-testcontainers-neo4j-javadoc}/org.testcontainers.containers.Neo4jContainer[]
157157

158-
| javadoc:org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingConnectionDetails[]
158+
| javadoc:org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingConnectionDetails[]
159159
| Containers named "otel/opentelemetry-collector-contrib" or of type `LgtmStackContainer`
160160

161161
| javadoc:org.springframework.boot.actuate.autoconfigure.metrics.export.otlp.OtlpMetricsConnectionDetails[]

spring-boot-project/spring-boot-opentelemetry/src/main/java/org/springframework/boot/opentelemetry/actuate/autoconfigure/logging/OpenTelemetryLoggingTransportConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
import org.springframework.beans.factory.ObjectProvider;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
29+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2930
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3031
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3132
import org.springframework.context.annotation.Bean;
@@ -37,6 +38,7 @@
3738
* @author Toshiaki Maki
3839
*/
3940
@Configuration(proxyBeanMethods = false)
41+
@ConditionalOnClass(OtlpHttpLogRecordExporter.class)
4042
@ConditionalOnMissingBean({ OtlpGrpcLogRecordExporter.class, OtlpHttpLogRecordExporter.class })
4143
@ConditionalOnBean(OpenTelemetryLoggingConnectionDetails.class)
4244
class OpenTelemetryLoggingTransportConfiguration {

spring-boot-project/spring-boot-opentelemetry/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
},
1414
{
1515
"name": "management.otlp.logging",
16-
"type": "org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingProperties",
17-
"sourceType": "org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingProperties",
16+
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
17+
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
1818
"deprecation": {
1919
"replacement": "management.opentelemetry.logging.export",
2020
"level": "error"
2121
}
2222
},
2323
{
2424
"name": "management.otlp.logging.compression",
25-
"type": "org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingProperties$Compression",
25+
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties$Compression",
2626
"description": "Method used to compress the payload.",
27-
"sourceType": "org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingProperties",
27+
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
2828
"defaultValue": "none",
2929
"deprecation": {
3030
"replacement": "management.opentelemetry.logging.export.compression",
@@ -35,7 +35,7 @@
3535
"name": "management.otlp.logging.connect-timeout",
3636
"type": "java.time.Duration",
3737
"description": "Connect timeout for the OTel collector connection.",
38-
"sourceType": "org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingProperties",
38+
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
3939
"defaultValue": "10s",
4040
"deprecation": {
4141
"replacement": "management.opentelemetry.logging.export.connect-timeout",
@@ -46,7 +46,7 @@
4646
"name": "management.otlp.logging.endpoint",
4747
"type": "java.lang.String",
4848
"description": "URL to the OTel collector's HTTP API.",
49-
"sourceType": "org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingProperties",
49+
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
5050
"deprecation": {
5151
"replacement": "management.opentelemetry.logging.export.endpoint",
5252
"level": "error"
@@ -65,7 +65,7 @@
6565
"name": "management.otlp.logging.headers",
6666
"type": "java.util.Map<java.lang.String,java.lang.String>",
6767
"description": "Custom HTTP headers you want to pass to the collector, for example auth headers.",
68-
"sourceType": "org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingProperties",
68+
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
6969
"deprecation": {
7070
"replacement": "management.opentelemetry.logging.export.headers",
7171
"level": "error"
@@ -75,7 +75,7 @@
7575
"name": "management.otlp.logging.timeout",
7676
"type": "java.time.Duration",
7777
"description": "Call timeout for the OTel Collector to process an exported batch of data. This timeout spans the entire call: resolving DNS, connecting, writing the request body, server processing, and reading the response body. If the call requires redirects or retries all must complete within one timeout period.",
78-
"sourceType": "org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingProperties",
78+
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
7979
"defaultValue": "10s",
8080
"deprecation": {
8181
"replacement": "management.opentelemetry.logging.export.timeout",
@@ -84,9 +84,9 @@
8484
},
8585
{
8686
"name": "management.otlp.logging.transport",
87-
"type": "org.springframework.boot.actuate.autoconfigure.logging.otlp.Transport",
87+
"type": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.Transport",
8888
"description": "Transport used to send the logs.",
89-
"sourceType": "org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingProperties",
89+
"sourceType": "org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportProperties",
9090
"defaultValue": "http",
9191
"deprecation": {
9292
"replacement": "management.opentelemetry.logging.export.transport",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class GrafanaOpenTelemetryLoggingContainerConnectionDetailsFactory
3737

3838
GrafanaOpenTelemetryLoggingContainerConnectionDetailsFactory() {
3939
super(ANY_CONNECTION_NAME,
40-
"org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingAutoConfiguration");
40+
"org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportAutoConfiguration");
4141
}
4242

4343
@Override

spring-boot-project/spring-boot-testcontainers-all/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
@@ -43,7 +43,7 @@ class OpenTelemetryLoggingContainerConnectionDetailsFactory
4343

4444
OpenTelemetryLoggingContainerConnectionDetailsFactory() {
4545
super("otel/opentelemetry-collector-contrib",
46-
"org.springframework.boot.actuate.autoconfigure.logging.otlp.OtlpLoggingAutoConfiguration");
46+
"org.springframework.boot.opentelemetry.actuate.autoconfigure.logging.OpenTelemetryLoggingExportAutoConfiguration");
4747
}
4848

4949
@Override

0 commit comments

Comments
 (0)