Skip to content

🌱 chore: remove unreachable MITM cancellation guard - #15345

Merged
hivecommons-hive[bot] merged 4 commits into
v5from
hive/adopt-15159
Oct 29, 2026
Merged

hivecommons-hive[bot] merged 4 commits into
v5from
hive/adopt-15159

Conversation

@hivecommons-hive

Copy link
Copy Markdown
Contributor

Supersedes #15159 (adopted after CI went red and the contributor was unavailable; original commits by @thatguywob preserved).

Fixes #15089

This branch is #15159's head 8438229dd6ec as pushed by @thatguywob (fork thatguywob/hive), unchanged. Last lane reason on the original: contributor-lane:changes-requested.

Hive fix agent: rebase this branch on v5, fix the failing checks / review asks, and push to THIS branch. Keep the original author's commits and their Signed-off-by; add your own sign-off on your commits. Do not open another PR.

Requests parsed by http.ReadRequest have no cancellation context attached in the MITM path, so this guard cannot fire. Retain caller-cancellation handling in the HTTP translator handler.

Hive-Run: #15089
Hive-Plan: MITM cancellation dead-code cleanup
Hive-Spec: #15089#unreachable-mitm-guard
Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
Record the MITM dead-code cleanup so changelog-fragment-guard passes without requiring label permissions.

Hive-Run: #15089
Hive-Plan: MITM cancellation dead-code cleanup
Hive-Spec: #15089#unreachable-mitm-guard
Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
The guard exhausted its ten-minute job budget while the optional Bob CLI download was retrying, before reaching its containerd assertions. Match the existing docker job budget because both build the full src/Dockerfile image.

Hive-Run: #15089
Hive-Plan: MITM cancellation dead-code cleanup
Hive-Spec: #15089#unreachable-mitm-guard
Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
Drop the unrelated overlayfs CI timeout increase as requested by maintainers. Retain only the unreachable MITM cancellation guard removal and its changelog fragment in the PR diff.

Hive-Run: #15089
Hive-Plan: MITM cancellation dead-code cleanup
Hive-Spec: #15089#unreachable-mitm-guard
Signed-off-by: thatguywob <thatguywob@users.noreply.github.com>
@kubestellar-prow kubestellar-prow Bot added the dco-signoff: yes Indicates the PR's author has signed the DCO. label Oct 29, 2026
@kubestellar-prow

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign kellyaa for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kubestellar-prow kubestellar-prow Bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 29, 2026
@github-actions

Copy link
Copy Markdown
Contributor

Open PR overlap check

Base branch: v5

Conflicts are checked with every PR merged onto the current tip of v5, so a PR that only needs a rebase is not reported as conflicting with its siblings.

PR Title Relation Files
#15159 🌱 chore: remove unreachable MITM cancellation guard same files changelog.d/changed-15159-mitm-cancellation-guard.md
src/crux/proxy/github_proxy_inference.go

@hivecommons-hive hivecommons-hive Bot added author/hive This repository's own hive (the App or one of its agent lanes) authored this PR dco All commits are DCO signed-off role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 29, 2026

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Reviewed — no findings from this perspective.

— hive: agent=ci-maintainer backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Reviewed — no findings from this perspective.

— hive: agent=adjudicator-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Reviewed — no findings from this perspective.

— hive: agent=adjudicator backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive hivecommons-hive Bot left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Looks correct to me — the removed branch is unreachable, as the body says.

Evidence (read at v5 HEAD and the PR head 8438229):

  • src/crux/proxy/github_proxy_inference.go:623 — req is produced by http.ReadRequest(clientBuf), which never attaches a context, so req.Context() is context.Background() and req.Context().Err() is always nil. The errors.Is(req.Context().Err(), context.Canceled) half of the removed condition at :687 could never be true.
  • src/crux/proxy/github_proxy_inference.go:448 — the HTTP-translator handler builds its upstream request from r.Context() (a net/http server context), so its cancellation guard is reachable and is correctly left alone.
  • Everything else in the error path (RecordEndpointError, recordAgentInferenceError, writeHTTPError) is unchanged; the diff is a pure dead-code removal plus a changed- changelog fragment.

Two notes for whoever merges:

  • This head is byte-identical to #15159 (same SHA 8438229dd6ec). Only one of the two should land; since this branch is the one the hive can push to, #15159 is the one to close once this merges. I have not closed anything.
  • The adoption body says CI had gone red on the original, but on this head every check is green (test, coverage, golangci-lint, changelog-fragment-guard, DCO; only the arm64 build was still in progress when I looked). No fix-agent rebase appears to be needed.

— hive: agent=reviewer-2 backend=copilot model=claude-fable-5.1 copilot=1.0.88

@hivecommons-hive
hivecommons-hive Bot merged commit 5e91160 into v5 Oct 29, 2026
138 of 142 checks passed
@kubestellar-prow
kubestellar-prow Bot deleted the hive/adopt-15159 branch October 29, 2026 07:30
@hivecommons-hive

Copy link
Copy Markdown
Contributor Author
Evidence bundle `#153458438229` sha256:27db549632996383922027b9511e200b2d0fc9eecee343c2fcdfe2adf8a8eb93 — download from the dashboard or `hivectl review evidence #15345`.

@github-actions

Copy link
Copy Markdown
Contributor

Thank you for your contribution! Your PR has been merged.

We'd love to hear how your experience was: share feedback

@hivecommons-hive hivecommons-hive Bot removed role/trusted Author is trusted for unattended merge (trusted-author role or registry/claim tier in require_tiers) stage/050-review-pending Review swarm requested; awaiting a verdict for the current head labels Oct 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author/hive This repository's own hive (the App or one of its agent lanes) authored this PR copilot dco All commits are DCO signed-off dco-signoff: yes Indicates the PR's author has signed the DCO. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Review backlog (security): MITM-path cancellation guard is unreachable (informational)

1 participant