Skip to content

gorilla-merger: Thanos Info service + no duplicate external labels - #314

Merged
zzylol merged 1 commit into
mainfrom
fix/merger-thanos-compat
May 24, 2026
Merged

zzylol merged 1 commit into
mainfrom
fix/merger-thanos-compat

Conversation

@zzylol

@zzylol zzylol commented May 24, 2026

Copy link
Copy Markdown
Contributor

Two thanos-query interop fixes from #24 validation: (1) register the Thanos Info gRPC service so thanos-query can discover the merger; (2) stop double-stamping external labels at ingest (the TSDBStore + shipper add them) — fixes duplicate cluster/merger labels. Build + merger unit tests green. NOTE: the live StoreAPI query still crashes on a separate deeper thanos v0.41.0 bug (#39, ReAllocZLabelsStrings under Go 1.25); keep the merger unregistered from thanos-query until #39 is fixed. Archive (ingest→shipper→S3) path is unaffected.

…xternal labels

Two thanos-query interop fixes found during #24 validation:

1) storeapi.go: register the Thanos Info gRPC service alongside Store. thanos-
   query (v0.41) discovers endpoints via Info; a Store-only server is reachable
   but undiscoverable ("neither info nor store client found"). Mirrors the
   sidecar wiring (LabelSet + StoreInfo from the TSDBStore).
2) ingest.go: do NOT stamp external labels (cluster/merger) into stored series
   at ingest — the TSDBStore adds them at query and the shipper writes them to
   block meta. Stamping at ingest too produced DUPLICATE cluster/merger labels.
   Tests updated to assert ingest stores only __name__ + attrs.

NOTE: the live StoreAPI query still crashes on a separate, deeper thanos v0.41.0
bug (ReAllocZLabelsStrings corrupt-length OOM under Go 1.25; #39). These fixes
are necessary but not sufficient — keep the merger unregistered from thanos-
query until #39 is resolved. The ingest -> shipper -> S3 archive path is
unaffected and works.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@zzylol
zzylol merged commit aada156 into main May 24, 2026
@zzylol
zzylol deleted the fix/merger-thanos-compat branch July 17, 2026 20:05
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