Skip to content

fix: adapt to durabletask-protobuf proto file split #1702

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

Merged
cicoyle merged 1 commit into from
Mar 26, 2026
Merged

fix: adapt to durabletask-protobuf proto file split #1702

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
43 changes: 41 additions & 2 deletions durabletask-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,57 @@
<version>${download-maven-plugin.version}</version>
<executions>
<execution>
<id>getDaprProto</id>
<id>getOrchestratorServiceProto</id>
<phase>initialize</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<skipCache>true</skipCache>
<url>${durabletask.proto.url}</url>
<url>${durabletask.proto.baseurl}/orchestrator_service.proto</url>
<outputFileName>orchestrator_service.proto</outputFileName>
<outputDirectory>${protobuf.input.directory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>getOrchestrationProto</id>
<phase>initialize</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<skipCache>true</skipCache>
<url>${durabletask.proto.baseurl}/orchestration.proto</url>
<outputFileName>orchestration.proto</outputFileName>
<outputDirectory>${protobuf.input.directory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>getHistoryEventsProto</id>
<phase>initialize</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<skipCache>true</skipCache>
<url>${durabletask.proto.baseurl}/history_events.proto</url>
<outputFileName>history_events.proto</outputFileName>
<outputDirectory>${protobuf.input.directory}</outputDirectory>
</configuration>
</execution>
<execution>
<id>getOrchestratorActionsProto</id>
<phase>initialize</phase>
<goals>
<goal>wget</goal>
</goals>
<configuration>
<skipCache>true</skipCache>
<url>${durabletask.proto.baseurl}/orchestrator_actions.proto</url>
<outputFileName>orchestrator_actions.proto</outputFileName>
<outputDirectory>${protobuf.input.directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
Expand Down
3 changes: 2 additions & 1 deletion durabletask-client/src/main/java/io/dapr/durabletask/DurableTaskGrpcWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

package io.dapr.durabletask;

import io.dapr.durabletask.implementation.protobuf.Orchestration;
import io.dapr.durabletask.implementation.protobuf.OrchestratorService;
import io.dapr.durabletask.implementation.protobuf.TaskHubSidecarServiceGrpc;
import io.dapr.durabletask.orchestration.TaskOrchestrationFactories;
Expand Down Expand Up @@ -279,7 +280,7 @@ private Context extractTraceContext(OrchestratorService.ActivityRequest activity
return Context.current();
}

OrchestratorService.TraceContext traceContext = activityRequest.getParentTraceContext();
Orchestration.TraceContext traceContext = activityRequest.getParentTraceContext();
String traceParent = traceContext.getTraceParent();

if (traceParent.isEmpty()) {
Expand Down
2 changes: 1 addition & 1 deletion durabletask-client/src/main/java/io/dapr/durabletask/FailureDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package io.dapr.durabletask;

import com.google.protobuf.StringValue;
import io.dapr.durabletask.implementation.protobuf.OrchestratorService.TaskFailureDetails;
import io.dapr.durabletask.implementation.protobuf.Orchestration.TaskFailureDetails;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion durabletask-client/src/main/java/io/dapr/durabletask/OrchestrationMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

package io.dapr.durabletask;

import io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationState;
import io.dapr.durabletask.implementation.protobuf.OrchestratorService;
import io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationState;

import java.time.Instant;

Expand Down
22 changes: 11 additions & 11 deletions durabletask-client/src/main/java/io/dapr/durabletask/OrchestrationRuntimeStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@

package io.dapr.durabletask;

import io.dapr.durabletask.implementation.protobuf.OrchestratorService;
import io.dapr.durabletask.implementation.protobuf.Orchestration;

import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_CANCELED;
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_COMPLETED;
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_CONTINUED_AS_NEW;
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_FAILED;
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_PENDING;
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_RUNNING;
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_SUSPENDED;
import static io.dapr.durabletask.implementation.protobuf.OrchestratorService.OrchestrationStatus.ORCHESTRATION_STATUS_TERMINATED;
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_CANCELED;
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_COMPLETED;
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_CONTINUED_AS_NEW;
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_FAILED;
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_PENDING;
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_RUNNING;
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_SUSPENDED;
import static io.dapr.durabletask.implementation.protobuf.Orchestration.OrchestrationStatus.ORCHESTRATION_STATUS_TERMINATED;

/**
* Enum describing the runtime status of the orchestration.
Expand Down Expand Up @@ -75,7 +75,7 @@ public enum OrchestrationRuntimeStatus {
*/
STALLED;

static OrchestrationRuntimeStatus fromProtobuf(OrchestratorService.OrchestrationStatus status) {
static OrchestrationRuntimeStatus fromProtobuf(Orchestration.OrchestrationStatus status) {
switch (status) {
case ORCHESTRATION_STATUS_RUNNING:
return RUNNING;
Expand All @@ -100,7 +100,7 @@ static OrchestrationRuntimeStatus fromProtobuf(OrchestratorService.Orchestration
}
}

static OrchestratorService.OrchestrationStatus toProtobuf(OrchestrationRuntimeStatus status) {
static Orchestration.OrchestrationStatus toProtobuf(OrchestrationRuntimeStatus status) {
switch (status) {
case RUNNING:
return ORCHESTRATION_STATUS_RUNNING;
Expand Down
Loading
Loading