You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/03/24 03:11:15 UTC
[skywalking-java] 01/01: Make sure Tomcat thread plugin working in Tomcat 9
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch tomcat-plugin
in repository https://gitbox.apache.org/repos/asf/skywalking-java.git
commit 74767ddb7dcee7348d8e51e5b6871d8343e385e7
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Thu Mar 24 11:11:06 2022 +0800
Make sure Tomcat thread plugin working in Tomcat 9
---
apm-sniffer/apm-sdk-plugin/tomcat-thread-pool-plugin/pom.xml | 11 +++++++++++
.../tomcat/thread/pool/TomcatThreadExecutorInterceptor.java | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-thread-pool-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/tomcat-thread-pool-plugin/pom.xml
index 9b5dcc7..06d03b2 100644
--- a/apm-sniffer/apm-sdk-plugin/tomcat-thread-pool-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/tomcat-thread-pool-plugin/pom.xml
@@ -31,5 +31,16 @@
<name>tomcat-thread-pool-plugin</name>
<url>http://maven.apache.org</url>
+ <properties>
+ <tomcat.version>8.0.36</tomcat.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
\ No newline at end of file
diff --git a/apm-sniffer/apm-sdk-plugin/tomcat-thread-pool-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat/thread/pool/TomcatThreadExecutorInterceptor.java b/apm-sniffer/apm-sdk-plugin/tomcat-thread-pool-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat/thread/pool/TomcatThreadExecutorInterceptor.java
index b97f219..5fd6936 100644
--- a/apm-sniffer/apm-sdk-plugin/tomcat-thread-pool-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat/thread/pool/TomcatThreadExecutorInterceptor.java
+++ b/apm-sniffer/apm-sdk-plugin/tomcat-thread-pool-plugin/src/main/java/org/apache/skywalking/apm/plugin/tomcat/thread/pool/TomcatThreadExecutorInterceptor.java
@@ -20,12 +20,12 @@ package org.apache.skywalking.apm.plugin.tomcat.thread.pool;
import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.ThreadPoolExecutor;
import java.util.function.Function;
import java.util.function.Supplier;
import org.apache.skywalking.apm.agent.core.meter.MeterFactory;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
public class TomcatThreadExecutorInterceptor implements InstanceConstructorInterceptor {