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

Gogoproto coded etcd #1260

Merged
merged 7 commits into from
Feb 2, 2022
Merged

Gogoproto coded etcd #1260

merged 7 commits into from
Feb 2, 2022

Conversation

mapno
Copy link
Member

@mapno mapno commented Jan 31, 2022

What this PR does:

Registers etcd's server proto in gogoproto codec

Which issue(s) this PR fixes:
Fixes #1213

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

@@ -23,6 +23,7 @@ const (
jaegerProtoGenPkgPath = "github.com/jaegertracing/jaeger/proto-gen"
jaegerModelPkgPath = "github.com/jaegertracing/jaeger/model"
otelProtoPkgPath = "go.opentelemetry.io/collector"
etcdProtoPkgPath = "go.etcd.io/etcd/api/v3/etcdserverpb"
Copy link
Member

Choose a reason for hiding this comment

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

nice fix, but i'm wondering if we can just update our etcd dependency instead of adding it here?

does the most recent etcd support latest grpc/proto?

also, we will definitely need to cut a 1.3.1 with this. good catch.

Copy link
Member Author

Choose a reason for hiding this comment

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

The gogocodec hack for etcd can be removed once it's upgraded to grpc >v1.38 is released (tentatively next release from v3.5.1). We're stuck with this for a bit I'm afraid.

Copy link
Member Author

Choose a reason for hiding this comment

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

FWIW, it's updated in main, but still unreleased

@mapno mapno marked this pull request as ready for review February 2, 2022 12:39
Copy link
Contributor

@annanay25 annanay25 left a comment

Choose a reason for hiding this comment

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

Nice work, LGTM! 🚀

// wait for active ingesters
time.Sleep(1 * time.Second)
matchers := []*labels.Matcher{
func TestMicroservicesWithKVStores(t *testing.T) {
Copy link
Member

Choose a reason for hiding this comment

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

fantastic addition 👍

@mapno mapno merged commit 27549c7 into grafana:main Feb 2, 2022
@mapno mapno deleted the gogoproto-coded-etcd branch February 2, 2022 15:36
mapno added a commit that referenced this pull request Feb 2, 2022
* Register etcd's server proto path in gogoproto codec

* Upgrade etcd api patch version and add changelog entry

* Extend e2e to test all kv stores

* Serverles go mod tidy

* Typo

* Config hostname from suite

* Remove docker namespace from hostname
mapno added a commit that referenced this pull request Feb 2, 2022
* Register etcd's server proto path in gogoproto codec

* Upgrade etcd api patch version and add changelog entry

* Extend e2e to test all kv stores

* Serverles go mod tidy

* Typo

* Config hostname from suite

* Remove docker namespace from hostname
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants