Skip to content

Commit 555ce1e

Browse files
committed
Merge branch '3.3.x'
2 parents 937dbff + a04dee6 commit 555ce1e

File tree

1 file changed

+7
-1
lines changed
  • spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator

1 file changed

+7
-1
lines changed

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/observability.adoc

+7-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,13 @@ The preceding example will prevent all observations whose name contains "denied"
8181
[[actuator.observability.opentelemetry]]
8282
== OpenTelemetry Support
8383

84-
Spring Boot's actuator module includes basic support for https://opentelemetry.io/[OpenTelemetry].
84+
NOTE: There are several ways to support https://opentelemetry.io/[OpenTelemetry] in your application.
85+
You can use the https://opentelemetry.io/docs/zero-code/java/agent/[OpenTelemetry Java Agent] or the https://opentelemetry.io/docs/zero-code/java/spring-boot-starter/[OpenTelemetry Spring Boot Starter],
86+
which are supported by the OTel community; the metrics and traces use the semantic conventions defined by OTel libraries.
87+
This documentation describes OpenTelemetry as officially supported by the Spring team, using Micrometer and the OTLP exporter;
88+
the metrics and traces use the semantic conventions described in the Spring projects documentation, such as {spring-framework-docs}/integration/observability.html[Spring Framework].
89+
90+
Spring Boot's actuator module includes basic support for OpenTelemetry.
8591

8692
It provides a bean of type `OpenTelemetry`, and if there are beans of type `SdkTracerProvider`, `ContextPropagators`, `SdkLoggerProvider` or `SdkMeterProvider` in the application context, they automatically get registered.
8793
Additionally, it provides a `Resource` bean.

0 commit comments

Comments
 (0)