Fix NPE in JDBC instrumentation when connection has no database type by dougqh · Pull Request #12371 · DataDog/dd-trace-java

dougqh · 2026-09-01T21:41:26Z

What Does This Do

Guards DatabaseClientDecorator.processDatabaseType() and dbService() against a null dbType, instead of letting them NPE.

CACHE.computeIfAbsent(dbType, NamingEntry::new) returns null for a null key without invoking the producer (FixedSizeCache.computeIfAbsent, internal-api/.../FixedSizeCache.java:71-73). When dbType is null — e.g. JDBCDecorator.onConnection passing a DBInfo.getType() that couldn't be determined — the returned NamingEntry was dereferenced immediately afterward, throwing an NPE inside tracer instrumentation instead of degrading gracefully.

processDatabaseType/dbService: check dbType == null up front and return early, rather than inferring the null case from the cache's return value.
Added DatabaseClientDecoratorNullDbTypeTest covering both methods with a null dbType.

Motivation

Fixes a NullPointerException reported in Error Tracking (issue, 1300+ occurrences, first seen 2026-02-16, service mainframe-gateway via JDBC instrumentation):

java.lang.NullPointerException
  at DatabaseClientDecorator$NamingEntry.access$000(DatabaseClientDecorator.java:25)
  at DatabaseClientDecorator.processDatabaseType(DatabaseClientDecorator.java:148)
  at JDBCDecorator.onConnection(JDBCDecorator.java:158)

Additional Notes

/techdebt and /perf-review both came back clean: no duplication/complexity concerns, and the null-guards are a strict improvement on the previously-crashing path with no added cost on the normal path.

🤖 Generated with Claude Code

Contributor Checklist

Format the title according to the contribution guidelines
Assign the type: and (comp: or inst:) labels in addition to any other useful labels
Avoid using close, fix, or any linking keywords when referencing an issue
Update the CODEOWNERS file on source file addition, migration, or deletion
Update public documentation with any new configuration flags or behaviors
Once approved, use merge queue to merge the PR

Jira ticket: [PROJ-IDENT]

dd-octo-sts · 2026-09-01T22:24:58Z

🟢 Java Benchmark SLOs — All performance SLOs passed

Suite	Status
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

Scenario	Candidate	master	Δ (95% CI of mean)
startup:insecure-bank:iast:Agent	13.91 s	13.97 s	[-1.2%; +0.3%] (no difference)
startup:insecure-bank:tracing:Agent	12.87 s	12.95 s	[-1.1%; -0.2%] (maybe better)
startup:petclinic:appsec:Agent	17.49 s	16.78 s	[-0.1%; +8.5%] (no difference)
startup:petclinic:iast:Agent	17.37 s	17.59 s	[-2.4%; -0.2%] (maybe better)
startup:petclinic:profiling:Agent	17.43 s	17.44 s	[-1.1%; +1.0%] (no difference)
startup:petclinic:sca:Agent	17.01 s	17.44 s	[-6.8%; +1.8%] (no difference)
startup:petclinic:tracing:Agent	16.75 s	16.71 s	[-0.6%; +1.0%] (no difference)

Commit: a73dddf0 · 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.

processDatabaseType/dbService dereferenced the NamingEntry returned by CACHE.computeIfAbsent(dbType, NamingEntry::new) without checking for null. FixedSizeCache.computeIfAbsent returns null for a null key without invoking the producer, so a null dbType() (e.g. an undetermined DBInfo.getType()) led to a NullPointerException in tracing instrumentation instead of a graceful no-op. Guard on dbType == null directly instead of inferring it from the cache's return value, and add a test exercising both methods with a null dbType. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

datadog-datadog-prod-us1-2

More details

The null guards prevent both null dereferences. They keep the existing behavior for non-null database types.

Was this helpful? React 👍 or 👎

_{Open Bits AI session}

_{🤖 Datadog Autotest · Commit 0dd0abe · What is Autotest? · @DataDog review to ask questions · Any feedback? Reach out in #autotest}

dd-octo-sts · 2026-09-02T23:49:52Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-09-02T23:49:56Z

View all feedbacks in Devflow UI.

2026-09-02 23:49:56 UTC ℹ️ Start processing command /merge

2026-09-02 23:50:01 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).

2026-09-03 00:05:00 UTC ❌ MergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for 28d87a9:

check_inst 3/4

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

Investigate the failures and when ready, re-add your pull request to the queue!
If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
Any question, go check the FAQ.

Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

dd-octo-sts · 2026-09-10T12:42:44Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-09-10T12:42:48Z

View all feedbacks in Devflow UI.

2026-09-10 12:42:48 UTC ℹ️ Start processing command /merge

2026-09-10 12:42:54 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).

2026-09-10 13:40:23 UTC ❌ MergeQueue: The build pipeline contains failing jobs for this merge request

Build pipeline has failing jobs for 3abda34:

test_inst: [zulu11, 5/8]

⚠️ Do NOT retry failed jobs directly (why?).

What to do next?

Investigate the failures and when ready, re-add your pull request to the queue!
If your PR checks are green, try to rebase/merge. It might be because the CI run is a bit old.
Any question, go check the FAQ.

Details

Since those jobs are not marked as being allowed to fail, the pipeline will most likely fail.
Therefore, and to allow other builds to be processed, this merge request has been rejected and the pipeline got canceled.

dd-octo-sts · 2026-09-10T17:37:13Z

/merge

gh-worker-devflow-routing-ef8351 · 2026-09-10T17:37:17Z

View all feedbacks in Devflow UI.

2026-09-10 17:37:16 UTC ℹ️ Start processing command /merge

2026-09-10 17:37:22 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in master is approximately 1h (p90).

2026-09-10 18:37:25 UTC ℹ️ MergeQueue: This merge request was merged

#12371) Fix NPE in DatabaseClientDecorator when JDBC connection has no db type processDatabaseType/dbService dereferenced the NamingEntry returned by CACHE.computeIfAbsent(dbType, NamingEntry::new) without checking for null. FixedSizeCache.computeIfAbsent returns null for a null key without invoking the producer, so a null dbType() (e.g. an undetermined DBInfo.getType()) led to a NullPointerException in tracing instrumentation instead of a graceful no-op. Guard on dbType == null directly instead of inferring it from the cache's return value, and add a test exercising both methods with a null dbType. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Merge branch 'master' into dougqh/fix-database-client-decorator-npe Merge branch 'master' into dougqh/fix-database-client-decorator-npe Merge branch 'master' into dougqh/fix-database-client-decorator-npe Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>

dougqh added tag: ai generated Largely based on code generated by an AI or LLM type: bug fix Bug fix comp: database Database Monitoring labels Sep 1, 2026

dougqh force-pushed the dougqh/fix-database-client-decorator-npe branch from 343288d to bec931e Compare September 2, 2026 01:10

dougqh force-pushed the dougqh/fix-database-client-decorator-npe branch from bec931e to 0dd0abe Compare September 2, 2026 01:20

dougqh marked this pull request as ready for review September 2, 2026 01:28

dougqh requested a review from a team as a code owner September 2, 2026 01:28

dougqh requested review from bric3 and removed request for a team September 2, 2026 01:28

This comment has been minimized.

Sign in to view

datadog-datadog-prod-us1-2 Bot reviewed Sep 2, 2026

View reviewed changes

sarahchen6 approved these changes Sep 2, 2026

View reviewed changes

dougqh added this pull request to the merge queue Sep 2, 2026

github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Sep 2, 2026

dougqh added 3 commits September 3, 2026 08:04

Merge branch 'master' into dougqh/fix-database-client-decorator-npe

da99ee3

Merge branch 'master' into dougqh/fix-database-client-decorator-npe

8fa7447

Merge branch 'master' into dougqh/fix-database-client-decorator-npe

a73dddf

dougqh enabled auto-merge September 4, 2026 14:06

dougqh requested a review from ValentinZakharov September 10, 2026 12:12

ValentinZakharov approved these changes Sep 10, 2026

View reviewed changes

dougqh added this pull request to the merge queue Sep 10, 2026

github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Sep 10, 2026

dougqh added this pull request to the merge queue Sep 10, 2026

github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Sep 10, 2026

gh-worker-dd-mergequeue-cf854d Bot merged commit 7c6ce51 into master Sep 10, 2026
602 checks passed

gh-worker-dd-mergequeue-cf854d Bot deleted the dougqh/fix-database-client-decorator-npe branch September 10, 2026 18:37

github-actions Bot added this to the 1.67.0 milestone Sep 10, 2026

ValentinZakharov changed the title ~~Fix NPE in DatabaseClientDecorator when JDBC connection has no db type~~ Fix NPE in JDBC instrumentation when connection has no database type Oct 5, 2026

Navigation Menu

Repository navigation

Fix NPE in JDBC instrumentation when connection has no database type - #12371

Fix NPE in JDBC instrumentation when connection has no database type#12371
gh-worker-dd-mergequeue-cf854d[bot] merged 4 commits into
masterfrom
dougqh/fix-database-client-decorator-npe

dougqh commented Sep 1, 2026 •

edited

Loading

Uh oh!

dd-octo-sts Bot commented Sep 1, 2026 •

edited

Loading

Uh oh!

This comment has been minimized.

datadog-datadog-prod-us1-2 Bot left a comment

Uh oh!

dd-octo-sts Bot commented Sep 2, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 2, 2026 •

edited

Loading

Uh oh!

Uh oh!

dd-octo-sts Bot commented Sep 10, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 10, 2026 •

edited

Loading

Uh oh!

Uh oh!

dd-octo-sts Bot commented Sep 10, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 10, 2026 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

dougqh commented Sep 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What Does This Do

Motivation

Additional Notes

Contributor Checklist

Uh oh!

dd-octo-sts Bot commented Sep 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🟢 Java Benchmark SLOs — All performance SLOs passed

Uh oh!

This comment has been minimized.

datadog-datadog-prod-us1-2 Bot left a comment

Choose a reason for hiding this comment

Uh oh!

dd-octo-sts Bot commented Sep 2, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What to do next?

Uh oh!

Uh oh!

dd-octo-sts Bot commented Sep 10, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What to do next?

Uh oh!

Uh oh!

dd-octo-sts Bot commented Sep 10, 2026

Uh oh!

gh-worker-devflow-routing-ef8351 Bot commented Sep 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

dougqh commented Sep 1, 2026 •

edited

Loading

dd-octo-sts Bot commented Sep 1, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Sep 2, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Sep 10, 2026 •

edited

Loading

gh-worker-devflow-routing-ef8351 Bot commented Sep 10, 2026 •

edited

Loading