From 33e9143566b3d9a5e49f5bc2ed26d12f15e35b50 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Fri, 21 Mar 2025 06:42:38 -0400 Subject: [PATCH 1/4] move tomcat-jdbc into a javaagent folder --- .../tomcat/jdbc/DataSourceProxyInstrumentation.java | 0 .../tomcat/jdbc/TomcatConnectionPoolMetrics.java | 0 .../tomcat/jdbc/TomcatJdbcInstrumentationModule.java | 0 .../tomcat/jdbc/TomcatJdbcInstrumentationTest.java | 0 settings.gradle.kts | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) rename instrumentation/tomcat/tomcat-jdbc/{ => javaagent}/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/DataSourceProxyInstrumentation.java (100%) rename instrumentation/tomcat/tomcat-jdbc/{ => javaagent}/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatConnectionPoolMetrics.java (100%) rename instrumentation/tomcat/tomcat-jdbc/{ => javaagent}/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationModule.java (100%) rename instrumentation/tomcat/tomcat-jdbc/{ => javaagent}/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationTest.java (100%) diff --git a/instrumentation/tomcat/tomcat-jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/DataSourceProxyInstrumentation.java b/instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/DataSourceProxyInstrumentation.java similarity index 100% rename from instrumentation/tomcat/tomcat-jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/DataSourceProxyInstrumentation.java rename to instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/DataSourceProxyInstrumentation.java diff --git a/instrumentation/tomcat/tomcat-jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatConnectionPoolMetrics.java b/instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatConnectionPoolMetrics.java similarity index 100% rename from instrumentation/tomcat/tomcat-jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatConnectionPoolMetrics.java rename to instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatConnectionPoolMetrics.java diff --git a/instrumentation/tomcat/tomcat-jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationModule.java b/instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationModule.java similarity index 100% rename from instrumentation/tomcat/tomcat-jdbc/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationModule.java rename to instrumentation/tomcat/tomcat-jdbc/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationModule.java diff --git a/instrumentation/tomcat/tomcat-jdbc/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationTest.java b/instrumentation/tomcat/tomcat-jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationTest.java similarity index 100% rename from instrumentation/tomcat/tomcat-jdbc/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationTest.java rename to instrumentation/tomcat/tomcat-jdbc/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tomcat/jdbc/TomcatJdbcInstrumentationTest.java diff --git a/settings.gradle.kts b/settings.gradle.kts index 0bdfc02339ff..6222c831a762 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -587,7 +587,7 @@ include(":instrumentation:tapestry-5.4:javaagent") include(":instrumentation:tomcat:tomcat-7.0:javaagent") include(":instrumentation:tomcat:tomcat-10.0:javaagent") include(":instrumentation:tomcat:tomcat-common:javaagent") -include(":instrumentation:tomcat:tomcat-jdbc") +include(":instrumentation:tomcat:tomcat-jdbc:javaagentadd") include(":instrumentation:twilio-6.6:javaagent") include(":instrumentation:undertow-1.4:bootstrap") include(":instrumentation:undertow-1.4:javaagent") From b09bb5acc5f45324df69f88f88bd65166fba0ba9 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Fri, 21 Mar 2025 06:51:50 -0400 Subject: [PATCH 2/4] move tomcat-jdbc into a javaagent folder --- docs/instrumentation-list.yaml | 12 +++++++----- .../tomcat-jdbc/{ => javaagent}/build.gradle.kts | 0 settings.gradle.kts | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) rename instrumentation/tomcat/tomcat-jdbc/{ => javaagent}/build.gradle.kts (100%) diff --git a/docs/instrumentation-list.yaml b/docs/instrumentation-list.yaml index dd0092db16a6..f33bc363a2da 100644 --- a/docs/instrumentation-list.yaml +++ b/docs/instrumentation-list.yaml @@ -1213,11 +1213,6 @@ opensearch: target_versions: javaagent: - org.opensearch.client:opensearch-rest-client:[1.0,) - - name: opensearch-java-2.0 - srcPath: instrumentation/opensearch/opensearch-java-2.0 - scope: - name: io.opentelemetry.opensearch-java-2.0 - target_versions: {} opentelemetry: instrumentations: - name: opentelemetry-api-1.15 @@ -1959,6 +1954,13 @@ tomcat: target_versions: javaagent: - org.apache.tomcat.embed:tomcat-embed-core:[7.0.4, 10) + - name: tomcat-jdbc + srcPath: instrumentation/tomcat/tomcat-jdbc + scope: + name: io.opentelemetry.tomcat-jdbc + target_versions: + javaagent: + - org.apache.tomcat:tomcat-jdbc:[8.5.0,) twilio: instrumentations: - name: twilio-6.6 diff --git a/instrumentation/tomcat/tomcat-jdbc/build.gradle.kts b/instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts similarity index 100% rename from instrumentation/tomcat/tomcat-jdbc/build.gradle.kts rename to instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts diff --git a/settings.gradle.kts b/settings.gradle.kts index 6222c831a762..f6854f6e4ff8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -587,7 +587,7 @@ include(":instrumentation:tapestry-5.4:javaagent") include(":instrumentation:tomcat:tomcat-7.0:javaagent") include(":instrumentation:tomcat:tomcat-10.0:javaagent") include(":instrumentation:tomcat:tomcat-common:javaagent") -include(":instrumentation:tomcat:tomcat-jdbc:javaagentadd") +include(":instrumentation:tomcat:tomcat-jdbc:javaagent") include(":instrumentation:twilio-6.6:javaagent") include(":instrumentation:undertow-1.4:bootstrap") include(":instrumentation:undertow-1.4:javaagent") From 802ef1031c118f6a562fc2d64a39d4f953582f15 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Fri, 21 Mar 2025 06:58:45 -0400 Subject: [PATCH 3/4] fossa --- .fossa.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.fossa.yml b/.fossa.yml index ce66de0fded9..086f708e2631 100644 --- a/.fossa.yml +++ b/.fossa.yml @@ -273,7 +273,7 @@ targets: target: ':instrumentation:tapestry-5.4:javaagent' - type: gradle path: ./ - target: ':instrumentation:tomcat:tomcat-jdbc' + target: ':instrumentation:tomcat:tomcat-jdbc:javaagent' - type: gradle path: ./ target: ':instrumentation:twilio-6.6:javaagent' From ed1f483b6fcb1f0e512b618e1d7a2050f44fff51 Mon Sep 17 00:00:00 2001 From: Jay DeLuca Date: Fri, 21 Mar 2025 07:02:01 -0400 Subject: [PATCH 4/4] fossa --- .fossa.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.fossa.yml b/.fossa.yml index 086f708e2631..fb2c373fe00e 100644 --- a/.fossa.yml +++ b/.fossa.yml @@ -271,9 +271,6 @@ targets: - type: gradle path: ./ target: ':instrumentation:tapestry-5.4:javaagent' - - type: gradle - path: ./ - target: ':instrumentation:tomcat:tomcat-jdbc:javaagent' - type: gradle path: ./ target: ':instrumentation:twilio-6.6:javaagent' @@ -940,6 +937,9 @@ targets: - type: gradle path: ./ target: ':instrumentation:tomcat:tomcat-common:javaagent' + - type: gradle + path: ./ + target: ':instrumentation:tomcat:tomcat-jdbc:javaagent' - type: gradle path: ./ target: ':instrumentation:vertx:vertx-kafka-client-3.6:javaagent'