Merge branch 'master' into gocql_config

cadence-workflow · Mar 26, 2024 · 89efbd7 · 89efbd7
2 parents fcd8e7d + 4332db6
commit 89efbd7
Show file tree

Hide file tree

Showing 13 changed files with 440 additions and 362 deletions.
diff --git a/.gen/go/shared/shared.go b/.gen/go/shared/shared.go
diff --git a/.gen/proto/history/v1/service.pb.yarpc.go b/.gen/proto/history/v1/service.pb.yarpc.go
diff --git a/.gen/proto/matching/v1/service.pb.yarpc.go b/.gen/proto/matching/v1/service.pb.yarpc.go
diff --git a/.gen/proto/shared/v1/history.pb.yarpc.go b/.gen/proto/shared/v1/history.pb.yarpc.go
diff --git a/cmd/server/go.mod b/cmd/server/go.mod
@@ -43,7 +43,7 @@ require (
 	github.com/startreedata/pinot-client-go v0.2.0 // latest release supports pinot v0.12.0 which is also internal version
 	github.com/stretchr/testify v1.8.3
 	github.com/uber-go/tally v3.3.15+incompatible // indirect
-	github.com/uber/cadence-idl v0.0.0-20240323004316-cd945be66562
+	github.com/uber/cadence-idl v0.0.0-20240325212241-24fabe86029e
 	github.com/uber/ringpop-go v0.8.5 // indirect
 	github.com/uber/tchannel-go v1.22.2 // indirect
 	github.com/urfave/cli v1.22.4

diff --git a/cmd/server/go.sum b/cmd/server/go.sum
@@ -397,8 +397,8 @@ github.com/uber-go/tally v3.3.12+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyu
 github.com/uber-go/tally v3.3.15+incompatible h1:9hLSgNBP28CjIaDmAuRTq9qV+UZY+9PcvAkXO4nNMwg=
 github.com/uber-go/tally v3.3.15+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU=
 github.com/uber/cadence-idl v0.0.0-20211111101836-d6b70b60eb8c/go.mod h1:oyUK7GCNCRHCCyWyzifSzXpVrRYVBbAMHAzF5dXiKws=
-github.com/uber/cadence-idl v0.0.0-20240323004316-cd945be66562 h1:/G/9GZPDEfZOgKIwjIIuEtFqLh4i4RDySpVvcx6jERY=
-github.com/uber/cadence-idl v0.0.0-20240323004316-cd945be66562/go.mod h1:oyUK7GCNCRHCCyWyzifSzXpVrRYVBbAMHAzF5dXiKws=
+github.com/uber/cadence-idl v0.0.0-20240325212241-24fabe86029e h1:sCUBUGniM233OpvhRYFowYLOWJ8P2SsUTB9OhewCA34=
+github.com/uber/cadence-idl v0.0.0-20240325212241-24fabe86029e/go.mod h1:oyUK7GCNCRHCCyWyzifSzXpVrRYVBbAMHAzF5dXiKws=
 github.com/uber/jaeger-client-go v2.22.1+incompatible h1:NHcubEkVbahf9t3p75TOCR83gdUHXjRJvjoBh1yACsM=
 github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw=

diff --git a/common/types/mapper/proto/api.go b/common/types/mapper/proto/api.go
@@ -991,6 +991,7 @@ func FromDecisionTaskTimedOutEventAttributes(t *types.DecisionTaskTimedOutEventA
 		ForkEventVersion: t.ForkEventVersion,
 		Reason:           t.Reason,
 		Cause:            FromDecisionTaskTimedOutCause(t.Cause),
+		RequestId:        t.RequestID,
 	}
 }
 
@@ -1007,6 +1008,7 @@ func ToDecisionTaskTimedOutEventAttributes(t *apiv1.DecisionTaskTimedOutEventAtt
 		ForkEventVersion: t.ForkEventVersion,
 		Reason:           t.Reason,
 		Cause:            ToDecisionTaskTimedOutCause(t.Cause),
+		RequestID:        t.RequestId,
 	}
 }
 

diff --git a/common/types/mapper/thrift/shared.go b/common/types/mapper/thrift/shared.go
@@ -1386,6 +1386,7 @@ func FromDecisionTaskTimedOutEventAttributes(t *types.DecisionTaskTimedOutEventA
 		ForkEventVersion: &t.ForkEventVersion,
 		Reason:           &t.Reason,
 		Cause:            FromDecisionTaskTimedOutCause(t.Cause),
+		RequestId:        &t.RequestID,
 	}
 }
 
@@ -1403,6 +1404,7 @@ func ToDecisionTaskTimedOutEventAttributes(t *shared.DecisionTaskTimedOutEventAt
 		ForkEventVersion: t.GetForkEventVersion(),
 		Reason:           t.GetReason(),
 		Cause:            ToDecisionTaskTimedOutCause(t.Cause),
+		RequestID:        t.GetRequestId(),
 	}
 }
 

diff --git a/common/types/shared.go b/common/types/shared.go
@@ -1312,6 +1312,7 @@ type DecisionTaskTimedOutEventAttributes struct {
 	ForkEventVersion int64                      `json:"forkEventVersion,omitempty"`
 	Reason           string                     `json:"reason,omitempty"`
 	Cause            *DecisionTaskTimedOutCause `json:"cause,omitempty"`
+	RequestID        string                     `json:"requestId,omitempty"`
 }
 
 // GetScheduledEventID is an internal getter (TBD...)
@@ -1362,6 +1363,14 @@ func (v *DecisionTaskTimedOutEventAttributes) GetCause() (o DecisionTaskTimedOut
 	return
 }
 
+// GetRequestID is an internal getter (TBD...)
+func (v *DecisionTaskTimedOutEventAttributes) GetRequestID() (o string) {
+	if v != nil {
+		return v.RequestID
+	}
+	return
+}
+
 // DecisionType is an internal type (TBD...)
 type DecisionType int32
 

diff --git a/common/types/testdata/history.go b/common/types/testdata/history.go
@@ -314,6 +314,7 @@ var (
 		ForkEventVersion: Version1,
 		Reason:           Reason,
 		Cause:            &DecisionTaskTimedOutCause,
+		RequestID:        RequestID,
 	}
 	DecisionTaskFailedEventAttributes = types.DecisionTaskFailedEventAttributes{
 		ScheduledEventID: EventID1,

diff --git a/go.mod b/go.mod
@@ -40,7 +40,7 @@ require (
 	github.com/startreedata/pinot-client-go v0.2.0 // latest release supports pinot v0.12.0 which is also internal version
 	github.com/stretchr/testify v1.8.3
 	github.com/uber-go/tally v3.3.15+incompatible
-	github.com/uber/cadence-idl v0.0.0-20240323004316-cd945be66562
+	github.com/uber/cadence-idl v0.0.0-20240325212241-24fabe86029e
 	github.com/uber/ringpop-go v0.8.5
 	github.com/uber/tchannel-go v1.22.2
 	github.com/urfave/cli v1.22.4

diff --git a/go.sum b/go.sum
@@ -444,8 +444,8 @@ github.com/uber-go/tally v3.3.12+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyu
 github.com/uber-go/tally v3.3.15+incompatible h1:9hLSgNBP28CjIaDmAuRTq9qV+UZY+9PcvAkXO4nNMwg=
 github.com/uber-go/tally v3.3.15+incompatible/go.mod h1:YDTIBxdXyOU/sCWilKB4bgyufu1cEi0jdVnRdxvjnmU=
 github.com/uber/cadence-idl v0.0.0-20211111101836-d6b70b60eb8c/go.mod h1:oyUK7GCNCRHCCyWyzifSzXpVrRYVBbAMHAzF5dXiKws=
-github.com/uber/cadence-idl v0.0.0-20240323004316-cd945be66562 h1:/G/9GZPDEfZOgKIwjIIuEtFqLh4i4RDySpVvcx6jERY=
-github.com/uber/cadence-idl v0.0.0-20240323004316-cd945be66562/go.mod h1:oyUK7GCNCRHCCyWyzifSzXpVrRYVBbAMHAzF5dXiKws=
+github.com/uber/cadence-idl v0.0.0-20240325212241-24fabe86029e h1:sCUBUGniM233OpvhRYFowYLOWJ8P2SsUTB9OhewCA34=
+github.com/uber/cadence-idl v0.0.0-20240325212241-24fabe86029e/go.mod h1:oyUK7GCNCRHCCyWyzifSzXpVrRYVBbAMHAzF5dXiKws=
 github.com/uber/jaeger-client-go v2.22.1+incompatible h1:NHcubEkVbahf9t3p75TOCR83gdUHXjRJvjoBh1yACsM=
 github.com/uber/jaeger-client-go v2.22.1+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk=
 github.com/uber/jaeger-lib v2.2.0+incompatible h1:MxZXOiR2JuoANZ3J6DE/U0kSFv/eJ/GfSYVCjK7dyaw=

diff --git a/idls b/idls