Skip to content
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.

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

Replace gogo protobuf #1256

Merged
merged 46 commits into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
d507797
Begin converting the SDK off of gogo/protobuf
tdeebswihart Sep 27, 2023
becd938
Convert more over to google's protobuf
tdeebswihart Oct 2, 2023
789c142
Repoint all other modules at my forks
tdeebswihart Oct 2, 2023
94c5bff
Fix copying of retry policies
tdeebswihart Oct 2, 2023
4e3f025
Update converter tests and explicitly test gogo
tdeebswihart Oct 2, 2023
39c3a58
Move history loading to api-go repo and update tests
tdeebswihart Oct 3, 2023
19d9a24
Fix more tests that relied on old enum naming
tdeebswihart Oct 3, 2023
f0508cf
Use common duration and timestamp conversion helpers
tdeebswihart Oct 3, 2023
d26360f
Replace a new reference to gogo's any type
tdeebswihart Oct 3, 2023
720b77e
Use useful replace directives and tidy all modules
tdeebswihart Oct 3, 2023
213fd0d
Address review comments
tdeebswihart Oct 9, 2023
66817b8
Fix fmt call I made unnecessarily complex
tdeebswihart Oct 9, 2023
5e9c4c6
Remove unused helper function
tdeebswihart Oct 9, 2023
a626c00
Use the new api-go jsonpb code
tdeebswihart Oct 10, 2023
59e8215
Use the newly renamed temporalproto code
tdeebswihart Oct 10, 2023
b642ecd
Bump api-go and fix test metrics
tdeebswihart Oct 12, 2023
8d4cfc0
Update go-api dep
tdeebswihart Oct 17, 2023
e0317be
Use my fork of our features repo
tdeebswihart Oct 18, 2023
f407630
Don't use my fork of the features repo
tdeebswihart Oct 20, 2023
1309c0b
Bump dependencies
tdeebswihart Oct 24, 2023
fc3a5c7
Missed a go.mod, whoops.
tdeebswihart Oct 24, 2023
d26cde7
Fix how we check if times are specified
tdeebswihart Oct 25, 2023
3717ab9
I can't replicate this locally so need to do so in CI...
tdeebswihart Oct 25, 2023
f3b6f59
See previous commit...
tdeebswihart Oct 25, 2023
191aee1
This will be a long project
tdeebswihart Oct 25, 2023
b48ff6d
Use my features repo once more
tdeebswihart Oct 25, 2023
40c1f96
Let's see if this is enough
tdeebswihart Oct 25, 2023
bc3a74f
Fix time bugs
tdeebswihart Oct 25, 2023
7ca2c2a
Those aren't times but durations
tdeebswihart Oct 25, 2023
60326cd
Don't print private fields in proto objects
tdeebswihart Oct 26, 2023
2c2c5d2
I flipped the logic without flipping the regexp...
tdeebswihart Oct 26, 2023
73c3aaa
Add some debugging
tdeebswihart Oct 26, 2023
0d40b87
Try a new format
tdeebswihart Oct 26, 2023
c1bfc6b
Update how we print
tdeebswihart Oct 27, 2023
f42a9db
Bump api-go dependency
tdeebswihart Oct 27, 2023
c47df1f
Specify DiscardUnknown on our history json decoders
tdeebswihart Oct 30, 2023
d083a5f
Address review comments
tdeebswihart Oct 30, 2023
99988e4
Fix replay workflow error message
tdeebswihart Oct 30, 2023
49eced6
Bump go-api version
tdeebswihart Nov 19, 2023
9e29e05
Bump api-go dependency
tdeebswihart Nov 20, 2023
31d0607
I forgot the test directory
tdeebswihart Nov 20, 2023
edc4bbe
Bump all go versions to 1.20 and tidy
tdeebswihart Nov 21, 2023
e73f11e
math/rand has been deprecated and errcheck fails on it
tdeebswihart Nov 21, 2023
d440028
Handle the error from rand.Read
tdeebswihart Nov 21, 2023
07a2c7e
Bump version of api-go
tdeebswihart Nov 21, 2023
a11ee59
Remove references to my fork of api-go
tdeebswihart Nov 21, 2023
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,5 @@ jobs:
go-repo-path: ${{github.event.pull_request.head.repo.full_name}}
version: ${{github.event.pull_request.head.ref}}
version-is-repo-ref: true
features-repo-path: "tdeebswihart/temporal-features"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Goes without saying, just making reminder to update this and similar places when temporalio/api-go#119 is merged

features-repo-ref: "nomo-gogo"
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: test bins clean cover cover-ci check errcheck staticcheck lint fmt
.PHONY: test bins clean cover cover-ci check errcheck staticcheck lint fmt gomodtidy check

# default target
default: check test
Expand Down Expand Up @@ -55,7 +55,7 @@ integration-test-normal-cache: $(BUILD)/dummy
(cd "$$dir" && go test $(TEST_ARG) . -coverprofile=$(INTEG_NORMAL_CACHE_COVER_FILE) -coverpkg=./...) || exit 1; \
done;

test: unit-test integration-test-zero-cache integration-test-normal-cache
test: gomodtidy unit-test integration-test-zero-cache integration-test-normal-cache

merge-coverage:
@echo "mode: atomic"
Expand Down Expand Up @@ -90,3 +90,6 @@ clean:
rm -rf $(BUILD)

check: vet errcheck staticcheck copyright bins

gomodtidy:
$(shell find . -name go.mod | xargs dirname | xargs -P 4 -I{} bash -c 'cd {} && go mod tidy')
44 changes: 43 additions & 1 deletion contrib/datadog/go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,53 @@
module go.temporal.io/sdk/contrib/datadog

go 1.16
go 1.20

require (
github.com/stretchr/testify v1.8.4
go.temporal.io/sdk v1.12.0
gopkg.in/DataDog/dd-trace-go.v1 v1.42.0
)

require (
github.com/DataDog/datadog-agent/pkg/obfuscate v0.0.0-20211129110424-6491aa3bf583 // indirect
github.com/DataDog/datadog-go v4.8.2+incompatible // indirect
github.com/DataDog/datadog-go/v5 v5.0.2 // indirect
github.com/DataDog/sketches-go v1.2.1 // indirect
github.com/Microsoft/go-winio v0.5.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dgraph-io/ristretto v0.1.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.1.2 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/pborman/uuid v1.2.1 // indirect
github.com/philhofer/fwd v1.1.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/robfig/cron v1.2.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/tinylib/msgp v1.1.2 // indirect
go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0 // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace go.temporal.io/sdk => ../../
2,293 changes: 27 additions & 2,266 deletions contrib/datadog/go.sum

Large diffs are not rendered by default.

29 changes: 28 additions & 1 deletion contrib/opentelemetry/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module go.temporal.io/sdk/contrib/opentelemetry

go 1.16
go 1.20

require (
github.com/stretchr/testify v1.8.4
Expand All @@ -10,4 +10,31 @@ require (
go.temporal.io/sdk v1.12.0
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
github.com/pborman/uuid v1.2.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/robfig/cron v1.2.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
go.temporal.io/api v1.26.1-0.20231121220434-5a4d95cc60c0 // indirect
go.uber.org/atomic v1.9.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

replace go.temporal.io/sdk => ../../
Loading
Loading