Skip to content

Commit 2f50239

Browse files
sethsamuelsethsamuel
committed
Merge remote-tracking branch 'origin/master' into seth.samuel/DBMON-4656-mysql-jdbc
2 parents 188d110 + eadf0cc commit 2f50239

File tree

67 files changed

+2114
-469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+2114
-469
lines changed

‎dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath
55
ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath
66
com.beust:jcommander:1.78=testRuntimeClasspath
77
com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8-
com.datadoghq:ddprof:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
8+
com.datadoghq:ddprof:1.15.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
99
com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
1010
com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
1111
com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs

‎dd-java-agent/instrumentation/aerospike-4/gradle.lockfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ com.datadoghq:dd-javac-plugin-client:0.1.7=compileClasspath,instrumentPluginClas
1616
com.datadoghq:java-dogstatsd-client:4.4.0=instrumentPluginClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
1717
com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
1818
com.fasterxml.jackson.core:jackson-annotations:2.10.3=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
19-
com.github.docker-java:docker-java-api:3.3.4=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
20-
com.github.docker-java:docker-java-transport-zerodep:3.3.4=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
21-
com.github.docker-java:docker-java-transport:3.3.4=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
19+
com.github.docker-java:docker-java-api:3.4.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
20+
com.github.docker-java:docker-java-transport-zerodep:3.4.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
21+
com.github.docker-java:docker-java-transport:3.4.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2222
com.github.javaparser:javaparser-core:3.25.1=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
2323
com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
2424
com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
@@ -162,7 +162,7 @@ org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
162162
org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
163163
org.spockframework:spock-core:2.2-groovy-3.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
164164
org.spockframework:spock-junit4:2.2-groovy-3.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
165-
org.testcontainers:testcontainers:1.19.3=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
165+
org.testcontainers:testcontainers:1.20.1=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
166166
org.testng:testng:7.5=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
167167
org.webjars:jquery:3.5.1=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
168168
org.xmlresolver:xmlresolver:4.4.3=spotbugs

‎dd-java-agent/instrumentation/akka-http/akka-http-10.0/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ com.typesafe.akka:akka-actor_2.12:2.5.32=version101ForkedTestCompileClasspath,ve
9898
com.typesafe.akka:akka-actor_2.12:2.6.21=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath
9999
com.typesafe.akka:akka-actor_2.13:2.6.21=version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath
100100
com.typesafe.akka:akka-actor_2.13:2.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
101-
com.typesafe.akka:akka-actor_2.13:2.8.6=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath
101+
com.typesafe.akka:akka-actor_2.13:2.8.7=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath
102102
com.typesafe.akka:akka-cluster-sharding_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath
103103
com.typesafe.akka:akka-cluster-tools_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath
104104
com.typesafe.akka:akka-cluster_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath
@@ -144,7 +144,7 @@ com.typesafe.akka:akka-persistence_2.11:2.5.9=lagomTestCompileClasspath,lagomTes
144144
com.typesafe.akka:akka-protobuf-v3_2.12:2.6.21=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath
145145
com.typesafe.akka:akka-protobuf-v3_2.13:2.6.21=version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath
146146
com.typesafe.akka:akka-protobuf-v3_2.13:2.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
147-
com.typesafe.akka:akka-protobuf-v3_2.13:2.8.6=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath
147+
com.typesafe.akka:akka-protobuf-v3_2.13:2.8.7=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath
148148
com.typesafe.akka:akka-protobuf_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath
149149
com.typesafe.akka:akka-protobuf_2.12:2.5.32=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath
150150
com.typesafe.akka:akka-remote_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath
@@ -157,7 +157,7 @@ com.typesafe.akka:akka-stream_2.12:2.5.32=version101ForkedTestCompileClasspath,v
157157
com.typesafe.akka:akka-stream_2.12:2.6.21=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath
158158
com.typesafe.akka:akka-stream_2.13:2.6.21=version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath
159159
com.typesafe.akka:akka-stream_2.13:2.7.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
160-
com.typesafe.akka:akka-stream_2.13:2.8.6=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath
160+
com.typesafe.akka:akka-stream_2.13:2.8.7=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath
161161
com.typesafe.akka:akka-testkit_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath
162162
com.typesafe.netty:netty-reactive-streams:2.0.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath
163163
com.typesafe.play:build-link:2.6.11=lagomTestCompileClasspath,lagomTestRuntimeClasspath

0 commit comments

Comments
 (0)