open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Limit latest dep version for tomcat-jdbc (#9643)

This commit is contained in:
Lauri Tulmin 2023-10-10 16:15:51 +03:00 committed by GitHub
parent 6f0fd8e631
commit 6980b693dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
instrumentation/jdbc/javaagent/build.gradle.kts
View File

@ -40,6 +40,7 @@ dependencies {
testImplementation("org.scala-lang:scala-library:2.11.12")
testImplementation("com.typesafe.slick:slick_2.11:3.2.0")
testImplementation("com.h2database:h2:1.4.197")
latestDepTestLibrary("org.apache.tomcat:tomcat-jdbc:10.1.13")
}
sourceSets {

2
instrumentation/jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/jdbc/PreparedStatementInstrumentation.java
View File

@ -92,7 +92,7 @@ public class PreparedStatementInstrumentation implements TypeInstrumentation {
@Advice.Local("otelRequest") DbRequest request,
@Advice.Local("otelContext") Context context,
@Advice.Local("otelScope") Scope scope) {
if (callDepth.decrementAndGet() > 0) {
if (callDepth == null || callDepth.decrementAndGet() > 0) {
return;
}