Fix TOCTOU race causing NPE in Hibernate closeScope

[amarziali]

What Does This Do

SessionMethodUtils.closeScope read SessionState.methodScope twice (once to check null, once to use) with no lock between the reads. A concurrent call could null it out in between, causing

Error : Failed to handle exception in instrumentation for org.hibernate.internal.CriteriaImpl - datadog.trace.instrumentation.hibernate.core.v4_0.CriteriaInstrumentation$CriteriaMethodAdvice
java.lang.NullPointerException
  at datadog.trace.instrumentation.hibernate.SessionMethodUtils.closeScope(SessionMethodUtils.java:73)
  at (redacted: 29 frames)
  at sun.reflect.GeneratedMethodAccessor5142.invoke(Unknown Source)
  at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
  at java.lang.reflect.Method.invoke(Method.java:498)
  at (redacted: 16 frames)
  at sun.reflect.GeneratedMethodAccessor5141.invoke(Unknown Source)
  at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
  at java.lang.reflect.Method.invoke(Method.java:498)
  at (redacted: 11 frames)
  at sun.reflect.GeneratedMethodAccessor5731.invoke(Unknown Source)
  at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMet

Motivation

Additional Notes

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
  Use solves instead, and assign the PR milestone to the 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]

[datadog-prod-us1-3]

More details

The single-read fix correctly eliminates the NPE: capturing methodScope once into a local variable makes it immune to concurrent nullification by another thread. The reordering of setMethodScope(null) to before scope.close() is a strict improvement — it prevents a stale scope reference if close() throws and reduces a pre-existing window where same-thread re-entry during span finishing could leak a newly-created scope. Zero NPEs across 1,000 concurrent-nullification iterations.

Was this helpful? React 👍 or 👎

_{📊 Validated against 6 scenarios · Open Bits AI session}

_{🤖 Datadog Autotest · Commit fe6db89 · What is Autotest? · Any feedback? Reach out in #autotest}

[datadog-prod-us1-3]

🎯 Code Coverage (details)
• Patch Coverage: 100.00%
• Overall Coverage: 69.73% (+12.56%)

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

[dd-octo-sts]

🟢 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	14.01 s	14.03 s	[-0.8%; +0.5%] (no difference)
startup:insecure-bank:tracing:Agent	12.96 s	13.06 s	[-1.5%; +0.1%] (no difference)
startup:petclinic:appsec:Agent	16.99 s	16.72 s	[+0.5%; +2.8%] (maybe worse)
startup:petclinic:iast:Agent	16.92 s	16.86 s	[-0.5%; +1.2%] (no difference)
startup:petclinic:profiling:Agent	16.67 s	16.80 s	[-1.9%; +0.4%] (no difference)
startup:petclinic:sca:Agent	16.87 s	16.72 s	[-0.4%; +2.2%] (no difference)
startup:petclinic:tracing:Agent	16.04 s	16.01 s	[-0.7%; +1.1%] (no difference)

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

[dd-octo-sts]

/merge

[gh-worker-devflow-routing-ef8351]

View all feedbacks in Devflow UI.

2026-07-15 10:56:31 UTC ℹ️ Start processing command /merge

---

2026-07-15 10:56:36 UTC ℹ️ MergeQueue: pull request added to the queue

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

---

2026-07-15 12:57:21 UTC ❌ MergeQueue: The build pipeline has timeout

The merge request has been interrupted because the build 3377249345649551824 took longer than expected. The current limit for the base branch 'master' is 120 minutes.

Possible reasons:

• some mandatory checkruns are failing:
  • Check pull request labels
  • Check pull requests
  • Enforce Groovy migration

[amarziali]

/merge

[gh-worker-devflow-routing-ef8351]

View all feedbacks in Devflow UI.

2026-07-16 10:24:18 UTC ℹ️ Start processing command /merge

---

2026-07-16 10:24:22 UTC ℹ️ MergeQueue: pull request added to the queue

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

---

2026-07-16 11:30:07 UTC ℹ️ MergeQueue: This merge request was merged