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

Instrument tomcat executor (#3789)

This commit is contained in:
Lauri Tulmin 2021-08-07 20:07:42 +03:00 committed by GitHub
parent f80d0ae189
commit 9df06868fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
instrumentation/executors/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/javaconcurrent/AbstractExecutorInstrumentation.java
View File

@ -87,6 +87,7 @@ public abstract class AbstractExecutorInstrumentation implements TypeInstrumenta
"java.util.concurrent.ForkJoinPool", "java.util.concurrent.ForkJoinPool",
"java.util.concurrent.ScheduledThreadPoolExecutor", "java.util.concurrent.ScheduledThreadPoolExecutor",
"java.util.concurrent.ThreadPoolExecutor", "java.util.concurrent.ThreadPoolExecutor",
"org.apache.tomcat.util.threads.ThreadPoolExecutor",
"org.eclipse.jetty.util.thread.QueuedThreadPool", // dispatch() is covered in the jetty "org.eclipse.jetty.util.thread.QueuedThreadPool", // dispatch() is covered in the jetty
// module // module
"org.eclipse.jetty.util.thread.ReservedThreadExecutor", "org.eclipse.jetty.util.thread.ReservedThreadExecutor",

8
instrumentation/tomcat/tomcat-7.0/javaagent/build.gradle.kts
View File

@ -13,15 +13,15 @@ muzzle {
} }
dependencies { dependencies {
library("org.apache.tomcat.embed:tomcat-embed-core:7.0.4") compileOnly("org.apache.tomcat.embed:tomcat-embed-core:7.0.4")
implementation(project(":instrumentation:tomcat:tomcat-common:javaagent")) implementation(project(":instrumentation:tomcat:tomcat-common:javaagent"))
implementation(project(":instrumentation:servlet:servlet-3.0:javaagent")) implementation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent")) testInstrumentation(project(":instrumentation:servlet:servlet-javax-common:javaagent"))
// Make sure nothing breaks due to both 7.0 and 10.0 modules being present together // Make sure nothing breaks due to both 7.0 and 10.0 modules being present together
testInstrumentation(project(":instrumentation:tomcat:tomcat-10.0:javaagent")) testInstrumentation(project(":instrumentation:tomcat:tomcat-10.0:javaagent"))
// Tests need at least version 9 to have necessary classes to configure the embedded tomcat... testLibrary("org.apache.tomcat.embed:tomcat-embed-core:8.0.41")
// ... but not newer that version 10, because its servlet 5. testLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:8.0.41")
testLibrary("org.apache.tomcat.embed:tomcat-embed-core:[9.+, 10)")
latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-core:[9.+, 10)") latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-core:[9.+, 10)")
latestDepTestLibrary("org.apache.tomcat.embed:tomcat-embed-jasper:[9.+, 10)")
} }