Skip to content

Commit 06b8d5d

Browse files
AlexeyKuznetsov-DDAlexeyKuznetsov-DD
committed
Merge branch 'master' into alexeyk/refactored-env-vars-to-be-testable
2 parents d8b5aec + 9d0688a commit 06b8d5d

File tree

631 files changed

+3384
-2646
lines changed

Some content is hidden

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

631 files changed

+3384
-2646
lines changed

‎.gitlab-ci.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -318,14 +318,12 @@ populate_dep_cache:
318318
CACHE_TYPE: "base"
319319
- GRADLE_TARGET: ":profilingTest"
320320
CACHE_TYPE: "profiling"
321-
# FIXME: Gitlab doesn't support s3 based caches >5GB. Fixed in Gitlab 17.5
322-
# See: https://gitlab.com/gitlab-org/gitlab-runner/-/issues/26921#note_2132307223
323-
# - GRADLE_TARGET: ":instrumentationTest"
324-
# CACHE_TYPE: "inst"
325-
# - GRADLE_TARGET: ":instrumentationLatestDepTest"
326-
# CACHE_TYPE: "latestdep"
327-
# - GRADLE_TARGET: ":smokeTest"
328-
# CACHE_TYPE: "smoke"
321+
- GRADLE_TARGET: ":instrumentationTest"
322+
CACHE_TYPE: "inst"
323+
- GRADLE_TARGET: ":instrumentationLatestDepTest"
324+
CACHE_TYPE: "latestdep"
325+
- GRADLE_TARGET: ":smokeTest"
326+
CACHE_TYPE: "smoke"
329327

330328
publish-artifacts-to-s3:
331329
image: registry.ddbuild.io/images/mirror/amazon/aws-cli:2.4.29
@@ -640,7 +638,7 @@ test_inst_latest:
640638
extends: .test_job_with_test_agent
641639
variables:
642640
GRADLE_TARGET: ":instrumentationLatestDepTest"
643-
CACHE_TYPE: "latestDep"
641+
CACHE_TYPE: "latestdep"
644642
parallel:
645643
matrix:
646644
- testJvm: ["8", "17", "21", "25"] # the latest "stable" version is LTS v25

‎.gitlab/one-pipeline.locked.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# DO NOT EDIT THIS FILE MANUALLY
22
# This file is auto-generated by automation.
33
include:
4-
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/5ced630f3f6b2cebc27ede08cf30543a05b7d0bc069b18efd70d9eb0f756762a/one-pipeline.yml
4+
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/019c5ba11c2018bf17e06c74d6d8bc784f77bd7bf16d474d628609de91dbca29/one-pipeline.yml

‎build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ plugins {
1313
id("com.gradleup.shadow") version "8.3.6" apply false
1414
id("me.champeau.jmh") version "0.7.3" apply false
1515
id("org.gradle.playframework") version "0.13" apply false
16+
kotlin("jvm") version libs.versions.kotlin.plugin apply false
1617
}
1718

1819
description = "dd-trace-java"

‎buildSrc/src/main/groovy/InstrumentPlugin.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class InstrumentPlugin implements Plugin<Project> {
3535
InstrumentExtension extension = project.extensions.create('instrument', InstrumentExtension)
3636

3737
project.tasks.matching {
38-
it.name in ['compileJava', 'compileScala', 'compileKotlin', 'compileGroovy'] ||
38+
it.name in ['compileJava', 'compileScala', 'compileGroovy'] ||
3939
it.name =~ /compileMain_.+Java/
4040
}.all {
4141
AbstractCompile compileTask = it as AbstractCompile

‎communication/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jaxen:jaxen:1.2.0=spotbugs
4949
jline:jline:2.14.6=testRuntimeClasspath
5050
junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
5151
junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
52-
net.bytebuddy:byte-buddy-agent:1.17.5=testCompileClasspath,testRuntimeClasspath
53-
net.bytebuddy:byte-buddy:1.17.5=testCompileClasspath,testRuntimeClasspath
52+
net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath
53+
net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath
5454
net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
5555
net.sf.saxon:Saxon-HE:11.4=spotbugs
5656
org.apache.ant:ant-antlr:1.10.14=codenarc

‎dd-java-agent/agent-aiguard/gradle.lockfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ jaxen:jaxen:1.2.0=spotbugs
4343
jline:jline:2.14.6=testRuntimeClasspath
4444
junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
4545
junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
46-
net.bytebuddy:byte-buddy-agent:1.17.5=testCompileClasspath,testRuntimeClasspath
47-
net.bytebuddy:byte-buddy:1.17.5=testCompileClasspath,testRuntimeClasspath
46+
net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath
47+
net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath,testRuntimeClasspath
4848
net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
4949
net.sf.saxon:Saxon-HE:11.4=spotbugs
5050
org.apache.ant:ant-antlr:1.10.14=codenarc

‎dd-java-agent/agent-bootstrap/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
apply from: "$rootDir/gradle/java.gradle"
1010
apply plugin: "idea"
1111

12-
tasks.named("compileJava", JavaCompile).configure {
12+
tasks.named("compileJava", JavaCompile) {
1313
configureCompiler(it, 8, JavaVersion.VERSION_1_8, "Need access to sun.* packages")
1414
}
1515

‎dd-java-agent/agent-bootstrap/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ commons-io:commons-io:2.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntim
4040
de.thetaphi:forbiddenapis:3.8=compileClasspath,jmhCompileClasspath
4141
info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testRuntimeClasspath
4242
io.leangen.geantyref:geantyref:1.3.16=jmhRuntimeClasspath,testRuntimeClasspath
43-
io.sqreen:libsqreen:16.0.0=jmhRuntimeClasspath,testRuntimeClasspath
43+
io.sqreen:libsqreen:17.1.0=jmhRuntimeClasspath,testRuntimeClasspath
4444
javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4545
jaxen:jaxen:1.2.0=spotbugs
4646
jline:jline:2.14.6=jmhRuntimeClasspath,testRuntimeClasspath
4747
junit:junit-dep:4.11=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4848
junit:junit:4.13.2=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
49-
net.bytebuddy:byte-buddy-agent:1.17.5=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
50-
net.bytebuddy:byte-buddy:1.17.5=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
49+
net.bytebuddy:byte-buddy-agent:1.17.7=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
50+
net.bytebuddy:byte-buddy:1.17.7=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
5151
net.java.dev.jna:jna-platform:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
5252
net.java.dev.jna:jna:5.8.0=jmhRuntimeClasspath,testRuntimeClasspath
5353
net.jcip:jcip-annotations:1.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/agent-builder/gradle.lockfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
4040
de.thetaphi:forbiddenapis:3.8=compileClasspath
4141
info.picocli:picocli:4.6.3=testRuntimeClasspath
4242
io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
43-
io.sqreen:libsqreen:16.0.0=testRuntimeClasspath
43+
io.sqreen:libsqreen:17.1.0=testRuntimeClasspath
4444
javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
4545
jaxen:jaxen:1.2.0=spotbugs
4646
jline:jline:2.14.6=testRuntimeClasspath
4747
junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
4848
junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
49-
net.bytebuddy:byte-buddy-agent:1.17.5=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
50-
net.bytebuddy:byte-buddy:1.17.5=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
49+
net.bytebuddy:byte-buddy-agent:1.17.7=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
50+
net.bytebuddy:byte-buddy:1.17.7=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5151
net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testRuntimeClasspath
5252
net.java.dev.jna:jna:5.8.0=runtimeClasspath,testRuntimeClasspath
5353
net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath

‎dd-java-agent/agent-ci-visibility/build.gradle‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,8 @@
11
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
22

3-
buildscript {
4-
repositories {
5-
mavenLocal()
6-
if (project.rootProject.hasProperty("gradlePluginProxy")) {
7-
maven {
8-
url project.rootProject.property("gradlePluginProxy")
9-
allowInsecureProtocol = true
10-
}
11-
}
12-
if (project.rootProject.hasProperty("mavenRepositoryProxy")) {
13-
maven {
14-
url project.rootProject.property("mavenRepositoryProxy")
15-
allowInsecureProtocol = true
16-
}
17-
}
18-
gradlePluginPortal()
19-
mavenCentral()
20-
}
21-
22-
dependencies {
23-
classpath group: 'org.jetbrains.kotlin', name: 'kotlin-gradle-plugin', version: libs.versions.kotlin.get()
24-
}
25-
}
26-
273
plugins {
284
id 'com.gradleup.shadow'
5+
id 'org.jetbrains.kotlin.jvm' version libs.versions.kotlin.plugin
296
}
307

318
apply from: "$rootDir/gradle/java.gradle"

0 commit comments

Comments
 (0)