Skip to content

Commit e0a7aac

Browse files
committed
adding micrometer traces
1 parent 1cd6714 commit e0a7aac

File tree

5 files changed

+346
-38
lines changed

5 files changed

+346
-38
lines changed

dapr-spring/dapr-spring-boot-autoconfigure/src/main/java/io/dapr/spring/boot/autoconfigure/client/DaprClientAutoConfiguration.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,16 @@
2020
import io.dapr.config.Properties;
2121
import io.dapr.workflows.client.DaprWorkflowClient;
2222
import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
23+
import io.micrometer.observation.ObservationRegistry;
24+
import io.opentelemetry.api.metrics.Meter;
25+
import io.opentelemetry.api.trace.Tracer;
2326
import org.springframework.boot.autoconfigure.AutoConfiguration;
2427
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2528
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2629
import org.springframework.boot.context.properties.EnableConfigurationProperties;
2730
import org.springframework.context.annotation.Bean;
2831

32+
import javax.annotation.Nullable;
2933
import java.util.HashMap;
3034
import java.util.Map;
3135

@@ -84,9 +88,12 @@ DaprClient daprClient(DaprClientBuilder daprClientBuilder) {
8488

8589
@Bean
8690
@ConditionalOnMissingBean
87-
DaprWorkflowClient daprWorkflowClient(DaprConnectionDetails daprConnectionDetails) {
91+
DaprWorkflowClient daprWorkflowClient(DaprConnectionDetails daprConnectionDetails,
92+
@Nullable ObservationRegistry observationRegistry,
93+
@Nullable Tracer tracer,
94+
@Nullable Meter meter) {
8895
Properties properties = createPropertiesFromConnectionDetails(daprConnectionDetails);
89-
return new DaprWorkflowClient(properties);
96+
return new DaprWorkflowClient(properties, observationRegistry, tracer, meter);
9097
}
9198

9299
@Bean

pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
<maven.compiler.source>11</maven.compiler.source>
3232
<maven.compiler.target>11</maven.compiler.target>
3333
<maven.compiler.release>11</maven.compiler.release>
34+
<micrometer.version>1.16.0</micrometer.version>
35+
<opentelemetry-api.version>1.56.0</opentelemetry-api.version>
3436
<maven.deploy.skip>true</maven.deploy.skip>
3537
<!--
3638
manually declare durabletask-client's jackson dependencies for workflows sdk
@@ -127,6 +129,16 @@
127129
<artifactId>mockito-core</artifactId>
128130
<version>${mockito.version}</version>
129131
</dependency>
132+
<dependency>
133+
<groupId>io.micrometer</groupId>
134+
<artifactId>micrometer-observation</artifactId>
135+
<version>${micrometer.version}</version>
136+
</dependency>
137+
<dependency>
138+
<groupId>io.opentelemetry</groupId>
139+
<artifactId>opentelemetry-api</artifactId>
140+
<version>${opentelemetry-api.version}</version>
141+
</dependency>
130142
<dependency>
131143
<groupId>io.projectreactor</groupId>
132144
<artifactId>reactor-test</artifactId>

sdk-workflows/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@
4141
<artifactId>junit-vintage-engine</artifactId>
4242
<scope>test</scope>
4343
</dependency>
44+
<dependency>
45+
<groupId>io.micrometer</groupId>
46+
<artifactId>micrometer-observation</artifactId>
47+
</dependency>
48+
<dependency>
49+
<groupId>io.opentelemetry</groupId>
50+
<artifactId>opentelemetry-api</artifactId>
51+
</dependency>
4452
<dependency>
4553
<groupId>io.dapr</groupId>
4654
<artifactId>durabletask-client</artifactId>

0 commit comments

Comments
 (0)