Skip to content

[dbnode] Rename embed.Config URL fields, bump etcd to 3.5.8 - #4407

Merged
justinhwang merged 2 commits into
masterfrom
justinhwang/etcd-embed-field-rename
Sep 17, 2026
Merged

justinhwang merged 2 commits into
masterfrom
justinhwang/etcd-embed-field-rename

Conversation

@justinhwang

Copy link
Copy Markdown
Collaborator

What this PR does / why we need it:

Fixes compilation against etcd >= 3.5.8. etcd renamed embed.Config's LPUrls/LCUrls/APUrls/ACUrls fields to ListenPeerUrls/ListenClientUrls/AdvertisePeerUrls/AdvertiseClientUrls in v3.5.8, a breaking rename with no aliases. Master pins etcd 3.5.5 and uses the old names in NewEtcdEmbedConfig (src/cmd/services/m3dbnode/config/config.go), so any downstream consumer whose module graph forces etcd server v3.5.8+ (for example via a replace directive) cannot compile m3.

This reopens #4404 from a branch on this repository rather than a fork, rebased onto current master.

Special notes for your reviewer:

  • Why 3.5.8 and not latest (3.5.16+): etcd server v3.5.14+ requires grpc >= 1.59 / protobuf >= 1.33, which forces the OpenTelemetry module constellation forward and breaks m3's current otel v1.4.1 / opentelemetry-collector usage (go.opentelemetry.io/otel/metric/global was removed from newer otel releases, so go mod tidy fails). 3.5.8 requires only grpc 1.41, so nothing else in the module graph moves. Going further is a separate otel-modernization effort.
  • The go.mod diff is confined to the etcd bump and its MVS consequences: bbolt 1.3.6 to 1.3.7, golang.org/x/net 0.1.0 to 0.7.0, golang.org/x/sys 0.1.0 to 0.5.0, golang.org/x/text 0.4.0 to 0.7.0, and form3tech-oss/jwt-go replaced by golang-jwt/jwt/v4 v4.4.2 (etcd 3.5.8 switched JWT libraries).
  • No behavior change: the fields were renamed upstream with identical semantics.
  • Verified: builds src/cmd/services/m3dbnode/... and src/dbnode/server/..., and src/cmd/services/m3dbnode/config tests pass.

Does this PR introduce a user-facing and/or backwards incompatible change?:

m3's etcd dependency is bumped from 3.5.5 to 3.5.8. Binaries now embed etcd 3.5.8 for embedded-etcd (seed node) mode, and projects importing m3 as a Go module will have their go.etcd.io/etcd/* modules resolved to >= 3.5.8. No change is required for external etcd clusters, as client wire compatibility across the 3.x line is unaffected.

Does this PR require updating code package or user-facing documentation?:

NONE

@justinhwang
justinhwang force-pushed the justinhwang/etcd-embed-field-rename branch 2 times, most recently from ccffe30 to 8fee6ed Compare September 16, 2026 17:31
etcd renamed embed.Config's LPUrls/LCUrls/APUrls/ACUrls fields to
ListenPeerUrls/ListenClientUrls/AdvertisePeerUrls/AdvertiseClientUrls
in v3.5.8 (a breaking rename with no aliases). Master currently pins
etcd 3.5.5 and uses the old names, which means m3 fails to compile
against any etcd >= 3.5.8 forced by a downstream replace directive.

Bump to 3.5.8 specifically: 3.5.14+ requires grpc >= 1.59 and
protobuf >= 1.33, which drags the module graph past otel v1.4.1 and
breaks m3's opentelemetry-collector usage (otel/metric/global was
removed from newer otel releases). 3.5.8 requires only grpc 1.41, so
nothing else in the graph moves.

Also drop the stale etcd comment above the require block. It claimed
etcd was pinned to an alpha to accommodate a gRPC upgrade and described
a 3.5.2 vs opentelemetry conflict; m3 has been on stable 3.5.x for some
time, so none of it still applies. The followup it referenced,
#4090 (update etcd past 3.6.0-alpha.0
once stable), is still open and tracked there.

The gopkg.in/yaml.v3 indirect requirement is now dropped by go mod tidy:
etcd 3.5.8, bbolt 1.3.7, etcd/pkg/v3 and etcd/client/pkg/v3 each require
yaml.v3 v3.0.1 themselves, so the explicit entry is redundant. Selected
version is unchanged at v3.0.1.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@justinhwang
justinhwang force-pushed the justinhwang/etcd-embed-field-rename branch from 8fee6ed to a3d4030 Compare September 16, 2026 21:55
@justinhwang
justinhwang merged commit 65b8427 into master Sep 17, 2026
5 checks passed
@justinhwang
justinhwang deleted the justinhwang/etcd-embed-field-rename branch September 17, 2026 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant