Move tomcat-jdbc into a javaagent folder (#13567)

2025-03-21 08:20:38 -04:00 · 2025-03-21 08:20:38 -04:00 · 917538c80e
parent 9b2abce591
commit 917538c80e
8 changed files with 11 additions and 9 deletions
--- 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'
    - 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'
--- 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
--- a/instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts
+++ b/instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts
--- a/instrumentation/tomcat/tomcat-jdbc/javaagent/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
--- a/instrumentation/tomcat/tomcat-jdbc/javaagent/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
--- a/instrumentation/tomcat/tomcat-jdbc/javaagent/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
--- a/instrumentation/tomcat/tomcat-jdbc/javaagent/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
--- 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:javaagent")
 include(":instrumentation:twilio-6.6:javaagent")
 include(":instrumentation:undertow-1.4:bootstrap")
 include(":instrumentation:undertow-1.4:javaagent")