Skip to content

Commit 22e6656

Browse files
yuandrewyuandrew
authored
Merge branch 'master' into issue-1961-fix
2 parents 1178c4a + 28be770 commit 22e6656

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+964
-1091
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,8 @@ jobs:
124124
features-test:
125125
uses: temporalio/features/.github/workflows/go.yaml@main
126126
with:
127+
# TODO: Set back once https://github.com/temporalio/features/pull/631 is merged
128+
features-repo-ref: "versioning-breaking-changes"
127129
go-repo-path: ${{github.event.pull_request.head.repo.full_name}}
128130
version: ${{github.event.pull_request.head.ref}}
129131
version-is-repo-ref: true

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ test.log
2121
.gobincache
2222
go.work
2323
go.work.sum
24-
*~
24+
*~
25+
internal/cmd/build/*.sqlite*

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[Temporal](https://github.com/temporalio/temporal) is a distributed, scalable, durable, and highly available orchestration engine used to execute asynchronous long-running business logic in a scalable and resilient way.
44

5-
"Temporal Go SDK" is the framework for authoring workflows and activities using Go language.
5+
"Temporal Go SDK" is Temporal's framework for authoring workflows and activities using the Go language.
66

77
## How to use
88

@@ -14,7 +14,7 @@ git clone https://github.com/temporalio/sdk-go.git
1414

1515
See [samples](https://github.com/temporalio/samples-go) to get started.
1616

17-
Documentation is available [here](https://docs.temporal.io).
17+
Documentation is available [here](https://docs.temporal.io).
1818
You can also find the API documentation [here](https://pkg.go.dev/go.temporal.io/sdk).
1919

2020
## Using slog
@@ -75,7 +75,7 @@ If users used Temporal proto types in their Workflows, such as for activity outp
7575
}),
7676
```
7777

78-
While upgrading from Go SDK version `< 1.26.0` to a version `>= 1.26.0` users may want to also bias towards using
78+
While upgrading from Go SDK version `< 1.26.0` to a version `>= 1.26.0` users may want to also bias towards using
7979
proto binary to avoid any potential incompatibilities due to having clients serialize messages with incompatible `proto/json` format.
8080

8181
On clients running Go SDK `< 1.26.0`
@@ -103,7 +103,7 @@ converter.NewCompositeDataConverter(
103103
)
104104
```
105105

106-
Note: Payloads encoded with `proto/binary` will not be readable in the Temporal web UI.
106+
Note: Payloads encoded with `proto/binary` will not be readable in the Temporal web UI.
107107

108108
## License
109109
MIT License, please see [LICENSE](LICENSE) for details.

‎client/client.go‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,9 @@ const (
107107
WorkerVersioningModeUnversioned = internal.WorkerVersioningModeUnversioned
108108

109109
// WorkerVersioningModeVersioned - Workers with this mode are part of a
110-
// Worker Deployment Version which is identified as
111-
// "<deployment_name>.<build_id>".
110+
// Worker Deployment Version which is a combination of a deployment name
111+
// and a build id.
112+
//
112113
// Each Deployment Version is distinguished from other Versions for task
113114
// routing, and users can configure the Temporal Server to send tasks to a
114115
// particular Version.
@@ -595,14 +596,32 @@ type (
595596
// NOTE: Experimental
596597
WorkflowExecutionOptionsChanges = internal.WorkflowExecutionOptionsChanges
597598

599+
// VersioningOverrideChange sets or removes a versioning override when used with
600+
// [WorkflowExecutionOptionsChanges].
601+
//
602+
// NOTE: Experimental
603+
VersioningOverrideChange = internal.VersioningOverrideChange
604+
598605
// VersioningOverride is a property in [WorkflowExecutionOptions] that changes the versioning
599606
// configuration of a specific workflow execution.
600-
// If set, it takes precedence over the Versioning Behavior provided with workflow type registration, or
601-
// default worker options.
607+
//
608+
// If set, it takes precedence over the Versioning Behavior provided with workflow type
609+
// registration, or default worker options.
602610
//
603611
// NOTE: Experimental
604612
VersioningOverride = internal.VersioningOverride
605613

614+
// PinnedVersioningOverride means the workflow will be pinned to a specific deployment version.
615+
//
616+
// NOTE: Experimental
617+
PinnedVersioningOverride = internal.PinnedVersioningOverride
618+
619+
// AutoUpgradeVersioningOverride means the workflow will auto-upgrade to the current deployment
620+
// version on the next workflow task.
621+
//
622+
// NOTE: Experimental
623+
AutoUpgradeVersioningOverride = internal.AutoUpgradeVersioningOverride
624+
606625
// WorkflowUpdateHandle represents a running or completed workflow
607626
// execution update and gives the holder access to the outcome of the same.
608627
WorkflowUpdateHandle = internal.WorkflowUpdateHandle

‎contrib/datadog/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ require (
3939
github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
4040
github.com/stretchr/objx v0.5.2 // indirect
4141
github.com/tinylib/msgp v1.1.8 // indirect
42-
go.temporal.io/api v1.49.0 // indirect
42+
go.temporal.io/api v1.49.1 // indirect
4343
go.uber.org/atomic v1.11.0 // indirect
4444
go4.org/intern v0.0.0-20230525184215-6c62f75575cb // indirect
4545
go4.org/unsafe/assume-no-moving-gc v0.0.0-20230525183740-e7c30c78aeb2 // indirect

‎contrib/datadog/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
134134
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
135135
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
136136
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
137-
go.temporal.io/api v1.49.0 h1:aL+zfrdZC6iRU0Lqc1Qds83oMEj1DwhmPUdfiIenGE4=
138-
go.temporal.io/api v1.49.0/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
137+
go.temporal.io/api v1.49.1 h1:CdiIohibamF4YP9k261DjrzPVnuomRoh1iC//gZ1puA=
138+
go.temporal.io/api v1.49.1/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
139139
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
140140
go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
141141
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=

‎contrib/envconfig/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/pmezard/go-difflib v1.0.0 // indirect
2323
github.com/robfig/cron v1.2.0 // indirect
2424
github.com/stretchr/objx v0.5.2 // indirect
25-
go.temporal.io/api v1.49.0 // indirect
25+
go.temporal.io/api v1.49.1 // indirect
2626
golang.org/x/net v0.39.0 // indirect
2727
golang.org/x/sync v0.13.0 // indirect
2828
golang.org/x/sys v0.32.0 // indirect

‎contrib/envconfig/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf
7373
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
7474
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
7575
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
76-
go.temporal.io/api v1.49.0 h1:aL+zfrdZC6iRU0Lqc1Qds83oMEj1DwhmPUdfiIenGE4=
77-
go.temporal.io/api v1.49.0/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
76+
go.temporal.io/api v1.49.1 h1:CdiIohibamF4YP9k261DjrzPVnuomRoh1iC//gZ1puA=
77+
go.temporal.io/api v1.49.1/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
7878
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
7979
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
8080
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=

‎contrib/opentelemetry/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
github.com/stretchr/objx v0.5.2 // indirect
3333
go.opentelemetry.io/otel/metric v1.27.0
3434
go.opentelemetry.io/otel/sdk/metric v1.27.0
35-
go.temporal.io/api v1.49.0 // indirect
35+
go.temporal.io/api v1.49.1 // indirect
3636
golang.org/x/net v0.39.0 // indirect
3737
golang.org/x/sys v0.32.0 // indirect
3838
golang.org/x/text v0.24.0 // indirect

‎contrib/opentelemetry/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2N
8686
go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw=
8787
go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw=
8888
go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4=
89-
go.temporal.io/api v1.49.0 h1:aL+zfrdZC6iRU0Lqc1Qds83oMEj1DwhmPUdfiIenGE4=
90-
go.temporal.io/api v1.49.0/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
89+
go.temporal.io/api v1.49.1 h1:CdiIohibamF4YP9k261DjrzPVnuomRoh1iC//gZ1puA=
90+
go.temporal.io/api v1.49.1/go.mod h1:iaxoP/9OXMJcQkETTECfwYq4cw/bj4nwov8b3ZLVnXM=
9191
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
9292
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
9393
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=

0 commit comments

Comments
 (0)