fix(contrib/mark3labs/mcp-go): avoid map race when normalizing RawInputSchema#4940
Merged
gh-worker-dd-mergequeue-cf854d[bot] merged 1 commit intoJul 2, 2026
Merged
Conversation
github-actions
Bot
added
the
apm:ecosystem
Contributor
Author
This was referenced Jun 24, 2026
|
This was referenced Jun 24, 2026
BenchmarksBenchmark execution time: 2026-07-01 16:35:45 Comparing candidate commit fe6b3cb in PR branch Found 0 performance improvements and 0 performance regressions! Performance is the same for 321 metrics, 2 unstable metrics, 1 flaky benchmarks without significant changes.
|
2 tasks
thomasvnoort
approved these changes
Jun 25, 2026
kakkoyun
approved these changes
Jun 25, 2026
sabrenner
approved these changes
Jun 30, 2026
…utSchema Follow-up to the previous commit. Unmarshalling RawInputSchema directly into &t.InputSchema left shared nested map references from server-reused tool definitions. Under concurrent tools/list requests this could cause 'fatal error: concurrent map writes' in production. Unmarshal into a fresh local mcp.ToolInputSchema value, then assign it to t.InputSchema. The existing maps.Clone of InputSchema.Properties remains as defense in depth. Ported from internal dd-source PR #469693.
jboolean
force-pushed
the
jb/mcp-raw-input-schema
branch
from
a164286 to
f53b282
Compare
jboolean
force-pushed
the
jb/mcp-raw-input-schema-race-fix
branch
from
b88a735 to
fe6b3cb
Compare
Contributor
Config Audit |
jboolean
force-pushed
the
jb/mcp-raw-input-schema-race-fix
branch
4 times, most recently
from
2993eeb to
a164286
Compare
jboolean
changed the base branch from
jb/mcp-raw-input-schema
to
graphite-base/4940
jboolean
force-pushed
the
jb/mcp-raw-input-schema-race-fix
branch
from
a164286 to
fe6b3cb
Compare
jboolean
changed the base branch from
graphite-base/4940
to
jb/mcp-raw-input-schema
gh-worker-dd-devflow-36fce6
Bot
added
mergequeue-status: queued
mergequeue-status: in_progress
and removed
mergequeue-status: queued
labels
gh-worker-dd-mergequeue-cf854d
Bot
merged commit 74e067c
into
main
669 of 686 checks passed
gh-worker-dd-devflow-36fce6
Bot
added
mergequeue-status: done
and removed
mergequeue-status: in_progress
labels
gh-worker-dd-mergequeue-cf854d
Bot
deleted the
jb/mcp-raw-input-schema-race-fix
branch
gh-worker-dd-mergequeue-cf854d Bot
added a commit
that referenced
this pull request
Jul 2, 2026
…tent injection (#4946) ## Summary `mcp.ToolInputSchema` only models `type`, `properties`, `required`, and `$defs`. Tools registered via `NewToolWithRawSchema` may declare other JSON Schema keywords (`additionalProperties`, `oneOf`, `patternProperties`, `pattern`, `enum`, `minimum`, `$schema`, …) — the previous round-trip through `ToolInputSchema` dropped all of them, so enabling intent capture quietly relaxed every raw-schema tool. Fix: inject telemetry into the raw JSON as a generic `map[string]any` and re-marshal. Unknown keys pass through verbatim. Same bug exists in the dd-source copy (not fixed there). Found by codex-connector on #4939. ## Test plan - [x] `TestIntentCaptureRawInputSchemaPreservesUnknownFields` — raw schema with `additionalProperties: false` and `oneOf` survives injection. - [x] All existing intent-capture tests still pass. Stacked on #4940. Co-authored-by: jboolean <julian.boilen@datadoghq.com>
gh-worker-dd-mergequeue-cf854d Bot
added a commit
that referenced
this pull request
Jul 2, 2026
…rs via context (#4941) This PR stack ports functionality added in the clone of this contrib in dd-source back to dd-trace-go so that the clone can be removed. ## Summary The intent-capture middleware annotates the LLMObs span with the client-supplied `telemetry.intent`, but tool handlers had no way to read it without re-parsing the telemetry blob — which the same middleware strips before the handler runs. This change: - Stashes the captured intent on `context.Context` alongside the existing LLMObs annotation. - Exports `IntentFromContext(ctx) (string, bool)` and `ContextWithIntent(ctx, intent) context.Context` so tool handlers can forward the intent downstream (e.g. to a search API for retrieval/ranking experiments). - Refactors the previous `processTelemetry` into `extractIntent` + `annotateIntentOnSpan` for clarity; behavior is otherwise unchanged. Ported from internal dd-source PR [#443664](DataDog/dd-source#443664). ## Test plan - [x] `TestIntentFromContext` — round-trip + empty-intent + missing-key behavior. - [x] `TestIntentCaptureStashesIntentOnContext` — end-to-end: a `tools/call` with `telemetry.intent` makes the value visible to the handler via `IntentFromContext`. - [x] Existing intent-capture tests still pass. Stacked on #4940. Co-authored-by: jboolean <julian.boilen@datadoghq.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
4 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.
This PR stack ports functionality added in the clone of this contrib in dd-source back to dd-trace-go.
Summary
Follow-up to #4939. That change unmarshalled
RawInputSchemadirectly into&t.InputSchema, which could leave shared nested map references from server-reused tool definitions. Under true parallelism, concurrenttools/listrequests could write the same map and crash withfatal error: concurrent map writes.This change unmarshals into a fresh local
mcp.ToolInputSchemavalue, then assigns it tot.InputSchema. The existingmaps.CloneofInputSchema.Propertiesremains as defense in depth.Ported from internal dd-source PR #469693.
Test plan
TestIntentCaptureConcurrentListToolsRawInputSchema— 10 goroutines × 100tools/listcalls against a raw-schema tool, run under-race.go test -race ./...incontrib/mark3labs/mcp-go/v2is green.Stacked on #4939.