eval(deploy): Dockerfile.backend build-context + accuracy_reduce regex post-#266 - #268
Merged
Merged
Conversation
…y_reduce regex post-#266 Surfaced from the big-sweep dispatch; both are clean fixes that enable running the sweep harness end-to-end: 1. `Dockerfile.backend` — adds `--build-context asap-precompute-rs=...` and `--build-context asap-sketchlib=...` so the backend image build can resolve sibling-repo path-deps (`/src/{ASAPQuery-backend,ASAPCollector, asap_sketchlib}` layout). Without this the build fails with `failed to read /src/ASAPCollector/asap-precompute-rs/Cargo.toml`. 2. `accuracy_reduce.py` — adds regex patterns matching the post-#266 queries-e2e.json shapes (`quantile_over_time(...)`, `count(metric)`, `sum_over_time(...)`). The original `histogram_quantile` / `sum(metric)` regexes wouldn't match a single row in the new query set even if the smoke had passed. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
zzylol
added a commit
that referenced
this pull request
May 16, 2026
#379) Two-part sync with asapquery-backend. 1. **Migrate CMS / CountSketch streaming-configs to canonical `w` / `d`** — sibling of asapquery-backend PR #268. The backend's `cms_params` helpers now read `w` (=cols) / `d` (=rows) first with `row_num` / `col_num` as legacy fallback, matching what the controller's `sketch_params_to_json` emits and what the OTLP policy_fp content match (`derive_sketch_policy_fp`) uses. The static asapcollector YAMLs were stuck on the older `row_num` / `col_num` form, which broke OTLP policy_fp lookup for sids ingested against these configs. Migrating to `w` / `d` aligns the static configs with the runtime expectation. 2. **Retire `SetAggregator` references** in inference-config doc comments. The exact-set-membership family (`SetAggregator` / `DeltaSetAggregator`) was retired wholesale in asapquery-backend PR #264. Comments here pointed at the retired family as a "tracked upstream" limitation for per-key top-K enumeration; updated to point at the actual solution (heap-bearing `CountSketchWithHeap` / `CountMinSketchWithHeap` from PR #258). No behavior change for the runtime — the backend's compat path (PR #268) keeps the legacy keys working, and the SetAggregator retirement (PR #264) doesn't affect any of the policies in these files. This is the static-config side of the cross-repo sync. Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
zzylol
added a commit
that referenced
this pull request
May 17, 2026
…380) * deploy(configs): canonical w/d param keys + retire SetAggregator notes Two-part sync with asapquery-backend. 1. **Migrate CMS / CountSketch streaming-configs to canonical `w` / `d`** — sibling of asapquery-backend PR #268. The backend's `cms_params` helpers now read `w` (=cols) / `d` (=rows) first with `row_num` / `col_num` as legacy fallback, matching what the controller's `sketch_params_to_json` emits and what the OTLP policy_fp content match (`derive_sketch_policy_fp`) uses. The static asapcollector YAMLs were stuck on the older `row_num` / `col_num` form, which broke OTLP policy_fp lookup for sids ingested against these configs. Migrating to `w` / `d` aligns the static configs with the runtime expectation. 2. **Retire `SetAggregator` references** in inference-config doc comments. The exact-set-membership family (`SetAggregator` / `DeltaSetAggregator`) was retired wholesale in asapquery-backend PR #264. Comments here pointed at the retired family as a "tracked upstream" limitation for per-key top-K enumeration; updated to point at the actual solution (heap-bearing `CountSketchWithHeap` / `CountMinSketchWithHeap` from PR #258). No behavior change for the runtime — the backend's compat path (PR #268) keeps the legacy keys working, and the SetAggregator retirement (PR #264) doesn't affect any of the policies in these files. This is the static-config side of the cross-repo sync. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(deploy): MVP smoke-test blockers — image build + agent OpAMP URL Three deploy-side bugs found while bringing up the single-node MVP demo (controller → backend → gateway → 1 agent → 1 fake-exporter): 1. Dockerfile.backend: rename build targets to the post-reorg binary names (`query_engine_rust` → `data_plane`, `controller` → `control_plane`). The May 2026 data-plane reorg renamed the workspace's `[[bin]]` packages; the Dockerfile still asked cargo for the old names and `docker build` failed at the `cargo build` step. Runtime install paths (`/usr/local/bin/asap-query-backend`, `/usr/local/bin/controller`) are preserved so existing compose stacks work unmodified. 2. All static agent configs hardcoded `ws://backend:4320/v1/opamp` for the OpAMP server. Post Phase-9 single-binary refactor the controller and backend share the `asap/query-backend:dev` image but bind separate listeners under separate compose service names; the OpAMP server is on `controller`, not `backend`. With the old URL the agent never connects, so `/api/v1/agents` is empty and the controller can't push runtime config. Sweep across all 17 affected `asap-otel-agent-*.yaml` (singlenode + multinode). 3. opentelemetry-go-patch's exporter/transform/metricdata.go and series/dictionary.go reference proto fields that the 2026-05 sketch proto refactor removed (`Count`, `Sum`, `Min`, `Max` on DDSketch/KLL/HLL DPs; `Dimension`/`Epsilon`/`Delta` on CountSketch DP; `SampleCount`/`Rows`/`Cols` on CountMinSketch DP; `seriesEntry.seriesID` renamed to `.id`). Without this fix `docker build -f Dockerfile.fake-exporter` fails at `go build` with a wall of `undefined: mpb.DDSketchDataPoint_SumAsInt` etc. A walkthrough of the smoke test (4 axes: controller→agent OpAMP, controller→backend streaming-config, end-to-end PromQL, sketch wire-format roundtrip) is at /mydata/mvp-smoke-test/REPORT.md. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Two small fixes surfaced from the big-sweep dispatch (#16); see commit message for details. Unblocks backend image build under sibling-repo path-deps + accuracy reducer match against post-#266 queries.
🤖 Generated with Claude Code