docs(quoter-bot): resolve telemetry README merge conflict - #216
Open
prd-carapulse[bot] wants to merge 1 commit into
Open
prd-carapulse[bot] wants to merge 1 commit into
prd-carapulse[bot] wants to merge 1 commit into
Conversation
Keep the current main environment table and preserve the OTel rows without obsolete signer instructions or committed conflict markers. Co-authored-by: Julien <61523188+julien-devatom@users.noreply.github.com>
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
🔍 Devin Review: 1 flag
Not posted on this PR by your GitHub settings — view it in Devin Review. (Configure)
This was referenced Sep 13, 2026
haydenshively
approved these changes
Sep 14, 2026
julien-devatom
added a commit
that referenced
this pull request
Sep 14, 2026
Applies prd-carapulse's #216 (resolves the README table left with committed conflict markers by the last merge) and #217 (per-signal OTLP endpoint validation so a malformed endpoint disables that signal instead of forwarding headers to the SDK's localhost fallback, OTEL_* fixture isolation with a subprocess regression, and empty-side rate snapshots deleted using the real ladder projection). Adds a compile-time never assertion to the metric mapper's default branch and documents the transaction.lifecycle counter in the README inventory. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Collaborator
|
Absorbed into #206 at 45779db (cherry-picked verbatim) — this PR's diff should now be empty against its base; safe to close. Thanks for the focused fix. 🤖 Addressed by Claude Code |
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
2 participants
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.
Why
Reviewing #206 at 4e074e4 found committed README merge markers around two conflicting environment-variable tables. The older side still documents the removed middleware signer and contradicts the current maker/signer requirements. Green lint and format checks do not catch this;
git diff main...HEAD --checkreports the leftover markers.Change
Resolve only the environment-variable table in
bots/quoter-bot/README.md: keep the current main table verbatim in content and append the original OTLP endpoint/header rows. Remove both raw and formatter-expanded conflict markers. No runtime, signing, chart, or workflow changes.This PR is stacked onto #206 (
quoter-bot-otel-stack-99e870), not main.Verification
pnpm exec oxfmt --check bots/quoter-bot/README.mdpassed.OTEL_SERVICE_NAME=carapulseand failed thetest-botidentity assertion; rerun with inheritedOTEL_*removed passed.Requested by: @julien-devatom (GitHub), via #206 (comment)