Skip to content

Guard InternalTagAdder against null prebuilt tagmap entry - #11962

Merged
amarziali merged 1 commit into
release/v1.64.xfrom
andrea.marziali/backport-pr-11958
Jul 15, 2026
Merged

Guard InternalTagAdder against null prebuilt tagmap entry#11962
amarziali merged 1 commit into
release/v1.64.xfrom
andrea.marziali/backport-pr-11958

Conversation

@amarziali

Copy link
Copy Markdown
Contributor

Backport #11958 to release/v1.64.x

@amarziali
amarziali requested a review from a team as a code ownerJuly 15, 2026 13:51
@amarzialiamarziali added type: bug fix Bug fix comp: core Tracer core labels Jul 15, 2026
@amarziali
amarziali requested a review from mhliddJuly 15, 2026 13:51

@datadog-prod-us1-3datadog-prod-us1-3Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Datadog Autotest: PASS

More details

This backport adds defensive null-checking for the baseServiceEntry field before setting it on the tag map. The fix is correct and necessary: Entry.create() can return null if the service name is empty, and without this guard, calling set(null) would cause a NullPointerException. The fix has no impact on normal execution paths and doesn't alter behavior for non-empty service names.

Was this helpful? React 👍 or 👎

📊 Validated against 3 scenarios · Open Bits AI session

🤖 Datadog Autotest · Commit beee258 · What is Autotest? · Any feedback? Reach out in #autotest

@amarzialiamarziali added this to the 1.64.1 milestone Jul 15, 2026
@amarziali
amarziali enabled auto-merge (squash) July 15, 2026 14:03
@datadog-prod-us1-3

datadog-prod-us1-3Bot commented Jul 15, 2026

Copy link
Copy Markdown

🎯 Code Coverage (details)
Patch Coverage: 50.00%
Overall Coverage: 56.44% (-0.49%)

This comment will be updated automatically if new data arrives.
🔗 Commit SHA: beee258 | Docs | Datadog PR Page | Give us feedback!

@dd-octo-sts

Copy link
Copy Markdown
Contributor

🟢 Java Benchmark SLOs — All performance SLOs passed

SuiteStatus
Startup🟢 pass

SLO thresholds are defined here based on automatically generated metrics. A warning is raised when results are within 5% of the threshold.

PR vs. master results
ScenarioCandidatemasterΔ (95% CI of mean)
startup:insecure-bank:iast:Agent13.90 s13.98 s[-1.3%; +0.1%] (no difference)
startup:insecure-bank:tracing:Agent12.94 s12.99 s[-1.0%; +0.2%] (no difference)
startup:petclinic:appsec:Agent16.92 s16.82 s[-0.3%; +1.5%] (no difference)
startup:petclinic:iast:Agent16.30 s16.93 s[-8.0%; +0.5%] (no difference)
startup:petclinic:profiling:Agent16.68 s16.85 s[-2.5%; +0.5%] (no difference)
startup:petclinic:sca:Agent16.97 s16.90 s[-0.5%; +1.4%] (no difference)
startup:petclinic:tracing:Agent16.14 s15.65 s[-1.3%; +7.5%] (no difference)

Commit:beee258a · CI Pipeline · Benchmarking Platform UI


Load and DaCapo benchmarks can be triggered manually in the GitLab pipeline. Results will appear in the Benchmarking Platform UI after completion.

@amarziali
amarziali merged commit 5b36a52 into release/v1.64.xJul 15, 2026
585 of 588 checks passed
@amarziali
amarziali deleted the andrea.marziali/backport-pr-11958 branch July 15, 2026 15:25
@dougqhdougqh changed the title 🍒 11958 - InternalTagAdder: defensively guard against null prebuilt tagmap entryGuard InternalTagAdder against null prebuilt tagmap entryJul 16, 2026
@dougqhdougqh added tag: ai generated Largely based on code generated by an AI or LLM and removed tag: ai generated Largely based on code generated by an AI or LLM labels Jul 16, 2026
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

comp: coreTracer coretype: bug fixBug fix

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@amarziali@mcculls@dougqh