Skip to content

Move tomcat-jdbc into a javaagent folder #13567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laurit merged 4 commits into from
Mar 21, 2025
Merged

Move tomcat-jdbc into a javaagent folder #13567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33e9143
move tomcat-jdbc into a javaagent folder
jaydeluca Mar 21, 2025
b09bb5a
move tomcat-jdbc into a javaagent folder
jaydeluca Mar 21, 2025
802ef10
fossa
jaydeluca Mar 21, 2025
ed1f483
fossa
jaydeluca Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .fossa.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
12 changes: 7 additions & 5 deletions docs/instrumentation-list.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {}
Copy link
Member Author

@jaydeluca jaydeluca Mar 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was just from me experimenting with writing new instrumentation and it got committed by mistake so i am removing it

opentelemetry:
instrumentations:
- name: opentelemetry-api-1.15
Expand Down Expand Up @@ -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
Expand Down
0 ...ation/tomcat/tomcat-jdbc/build.gradle.kts → ...at/tomcat-jdbc/javaagent/build.gradle.kts
View file
Open in desktop
File renamed without changes.
0 .../jdbc/DataSourceProxyInstrumentation.java → .../jdbc/DataSourceProxyInstrumentation.java
View file
Open in desktop
File renamed without changes.
0 ...cat/jdbc/TomcatConnectionPoolMetrics.java → ...cat/jdbc/TomcatConnectionPoolMetrics.java
View file
Open in desktop
File renamed without changes.
0 ...jdbc/TomcatJdbcInstrumentationModule.java → ...jdbc/TomcatJdbcInstrumentationModule.java
View file
Open in desktop
File renamed without changes.
0 ...t/jdbc/TomcatJdbcInstrumentationTest.java → ...t/jdbc/TomcatJdbcInstrumentationTest.java
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading