Skip to content

Adding sdk tracing capabilities on spring #1713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
salaboy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding sdk tracing capabilities on spring #1713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions dapr-spring/dapr-spring-boot-4-autoconfigure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,16 @@
<artifactId>spring-data-keyvalue</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-observation</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-observation-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
Expand Down
18 changes: 15 additions & 3 deletions ...c/main/java/io/dapr/spring/boot4/autoconfigure/client/DaprClientSB4AutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import io.dapr.spring.boot.properties.client.DaprConnectionDetails;
import io.dapr.workflows.client.DaprWorkflowClient;
import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
import io.micrometer.observation.ObservationRegistry;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
Expand Down Expand Up @@ -91,14 +92,25 @@ DaprClientBuilder daprClientBuilder(DaprConnectionDetails daprConnectionDetails,

@Bean
@ConditionalOnMissingBean
DaprClient daprClient(DaprClientBuilder daprClientBuilder) {
return daprClientBuilder.build();
DaprClient daprClient(DaprClientBuilder daprClientBuilder,
ObjectProvider<ObservationRegistry> observationRegistryProvider) {
DaprClient client = daprClientBuilder.build();
ObservationRegistry registry = observationRegistryProvider.getIfAvailable();
if (registry != null && !registry.isNoop()) {
return new ObservationDaprClient(client, registry);
}
return client;
}

@Bean
@ConditionalOnMissingBean
DaprWorkflowClient daprWorkflowClient(DaprConnectionDetails daprConnectionDetails) {
DaprWorkflowClient daprWorkflowClient(DaprConnectionDetails daprConnectionDetails,
ObjectProvider<ObservationRegistry> observationRegistryProvider) {
Properties properties = createPropertiesFromConnectionDetails(daprConnectionDetails);
ObservationRegistry registry = observationRegistryProvider.getIfAvailable();
if (registry != null && !registry.isNoop()) {
return new ObservationDaprWorkflowClient(properties, registry);
}
return new DaprWorkflowClient(properties);
}

Expand Down
Loading
Loading