[Backport release-1.17] Adding trace propagation to local observations#1730
Open
dapr-bot wants to merge 1 commit intorelease-1.17from
Open
[Backport release-1.17] Adding trace propagation to local observations#1730dapr-bot wants to merge 1 commit intorelease-1.17from
dapr-bot wants to merge 1 commit intorelease-1.17from
Conversation
* adding trace propagation to local observations Signed-off-by: salaboy <Salaboy@gmail.com> Signed-off-by: Javier Aliaga <javier@diagrid.io> * refactor(spring): extract Observation decorators into shared dapr-spring-boot-observation module Eliminates the verbatim duplication between dapr-spring-boot-autoconfigure (Spring Boot 3.x) and dapr-spring-boot-4-autoconfigure (Spring Boot 4.x): both modules previously held 100%-identical copies of ObservationDaprClient (~820 LOC) and ObservationDaprWorkflowClient (~400 LOC, including the W3C traceparent/tracestate formatters, repeated 4 times overall). Introduces a new Spring-agnostic module dapr-spring/dapr-spring-boot-observation under package io.dapr.spring.observation.client holding a single canonical copy of both decorators plus a package-private TraceContextFormat helper that replaces the 4 duplicated formatter copies. The module has zero Spring imports so it can be shared safely across Spring Boot 3.x and 4.x without API drift. Autoconfigure modules now depend on dapr-spring-boot-observation (optional), replacing their direct opentelemetry-api dependency. Consumers who skip observation wiring still don't pull OTel onto the classpath. OtelTracingClientInterceptor is now a private static final singleton on ObservationDaprWorkflowClient instead of allocated per client — justified by its existing javadoc which already stated it is stateless and shareable. Tests for the decorators themselves moved to the new module (33 pass); the Spring-wiring test DaprClientObservationAutoConfigurationTest stays in boot 3 with updated imports. Net: -1104 lines. Signed-off-by: Javier Aliaga <javier@diagrid.io> * fix(spring): make dapr-spring-boot-observation non-optional in autoconfigure poms The autoconfigure classes directly reference ObservationDaprClient and ObservationDaprWorkflowClient in their bean factory methods. When the observation module was marked <optional>, it was not propagated through the starters, causing a potential NoClassDefFoundError at runtime for users with a non-noop ObservationRegistry (e.g. actuator + tracing). Removing <optional> restores the original behavior: the Observation decorator classes are always on the classpath wherever the autoconfig is loaded. Signed-off-by: Javier Aliaga <javier@diagrid.io> --------- Signed-off-by: salaboy <Salaboy@gmail.com> Signed-off-by: Javier Aliaga <javier@diagrid.io> Co-authored-by: Javier Aliaga <javier@diagrid.io> (cherry picked from commit 54833d7)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport 54833d7 from #1724.