Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,16 @@
import io.dapr.config.Properties;
import io.dapr.workflows.client.DaprWorkflowClient;
import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
import io.micrometer.observation.ObservationRegistry;
import io.opentelemetry.api.metrics.Meter;
import io.opentelemetry.api.trace.Tracer;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;

import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;

Expand Down Expand Up @@ -84,9 +88,12 @@ DaprClient daprClient(DaprClientBuilder daprClientBuilder) {

@Bean
@ConditionalOnMissingBean
DaprWorkflowClient daprWorkflowClient(DaprConnectionDetails daprConnectionDetails) {
DaprWorkflowClient daprWorkflowClient(DaprConnectionDetails daprConnectionDetails,
@Nullable ObservationRegistry observationRegistry,
@Nullable Tracer tracer,
@Nullable Meter meter) {
Properties properties = createPropertiesFromConnectionDetails(daprConnectionDetails);
return new DaprWorkflowClient(properties);
return new DaprWorkflowClient(properties, observationRegistry, tracer, meter);
}

@Bean
Expand Down
14 changes: 13 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<micrometer.version>1.16.0</micrometer.version>
<opentelemetry-api.version>1.56.0</opentelemetry-api.version>
<maven.deploy.skip>true</maven.deploy.skip>
<!--
manually declare durabletask-client's jackson dependencies for workflows sdk
Expand Down Expand Up @@ -71,7 +73,7 @@
<junit-vintage-engine.version>5.7.0</junit-vintage-engine.version>
<junit-platform-console.version>1.7.0</junit-platform-console.version>
<reactor.version>3.5.12</reactor.version>
<durabletask-client.version>1.5.10</durabletask-client.version>
<durabletask-client.version>1.5.11-SNAPSHOT</durabletask-client.version>
<testcontainers-redis.version>2.2.2</testcontainers-redis.version>
<slf4j.version>2.0.9</slf4j.version>
<mockito.version>3.11.2</mockito.version>
Expand Down Expand Up @@ -127,6 +129,16 @@
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-observation</artifactId>
<version>${micrometer.version}</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
<version>${opentelemetry-api.version}</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
Expand Down
8 changes: 8 additions & 0 deletions sdk-workflows/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-observation</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
</dependency>
<dependency>
<groupId>io.dapr</groupId>
<artifactId>durabletask-client</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,6 @@ public interface WorkflowActivityContext {

<T> T getInput(Class<T> targetType);

String getTraceParentId();

}
Loading
Loading