Skip to content

Commit 42ed9b7

Browse files
bric3bric3
authored
Merge branch 'master' into bdu/fix-jetty-leaking-out-of-testing
2 parents 9f78da2 + 0204feb commit 42ed9b7

File tree

270 files changed

+103
-221
lines changed

Some content is hidden

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

270 files changed

+103
-221
lines changed

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ validate_supported_configurations_v2_local_file:
10021002
extends: .validate_supported_configurations_v2_local_file
10031003
variables:
10041004
LOCAL_JSON_PATH: "metadata/supported-configurations.json"
1005-
BACKFILLED: "true"
1005+
BACKFILLED: "false"
10061006

10071007
update_central_configurations_version_range_v2:
10081008
extends: .update_central_configurations_version_range_v2

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ dependencies {
106106
testImplementation group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.6.0'
107107
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
108108
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
109-
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
110-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.10')
111-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
109+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
110+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.10')
111+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
112112

113113
baseTestImplementation project(':utils:test-utils')
114114
baseTestImplementation libs.scala211

‎dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ dependencies {
6666
testImplementation libs.scala213
6767
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
6868
testImplementation project(':dd-java-agent:instrumentation:akka:akka-actor-2.5')
69-
testImplementation project(':dd-java-agent:instrumentation:scala-concurrent')
69+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-concurrent-2.8')
7070
testImplementation project(':dd-java-agent:instrumentation:akka:akka-http:akka-http-10.0')
71-
testImplementation project(':dd-java-agent:instrumentation:scala-promise:scala-promise-2.13')
71+
testImplementation project(':dd-java-agent:instrumentation:scala:scala-promise:scala-promise-2.13')
7272

7373
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-http_2.13', version: '+'
7474
latestDepTestImplementation group: 'com.typesafe.akka', name: 'akka-stream_2.13', version: '+'

dd-java-agent/instrumentation/avro/build.gradle renamed to dd-java-agent/instrumentation/avro-1.11.3/build.gradle

File renamed without changes.

dd-java-agent/instrumentation/avro/gradle.lockfile renamed to dd-java-agent/instrumentation/avro-1.11.3/gradle.lockfile

File renamed without changes.

dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/GenericDatumReaderInstrumentation.java renamed to dd-java-agent/instrumentation/avro-1.11.3/src/main/java/datadog/trace/instrumentation/avro/GenericDatumReaderInstrumentation.java

File renamed without changes.

dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/GenericDatumWriterInstrumentation.java renamed to dd-java-agent/instrumentation/avro-1.11.3/src/main/java/datadog/trace/instrumentation/avro/GenericDatumWriterInstrumentation.java

File renamed without changes.

dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/SchemaExtractor.java renamed to dd-java-agent/instrumentation/avro-1.11.3/src/main/java/datadog/trace/instrumentation/avro/SchemaExtractor.java

File renamed without changes.

dd-java-agent/instrumentation/avro/src/test/groovy/AvroDatumReaderTest.groovy renamed to dd-java-agent/instrumentation/avro-1.11.3/src/test/groovy/AvroDatumReaderTest.groovy

File renamed without changes.

dd-java-agent/instrumentation/caffeine/build.gradle renamed to dd-java-agent/instrumentation/caffeine-1.0/build.gradle

File renamed without changes.

0 commit comments

Comments
 (0)