Skip to content

Commit 12ec01f

Browse files
mhliddmhlidd
authored
Merge branch 'master' into mhlidd/migrate_to_config_helper
2 parents 6986ac8 + 17ad12a commit 12ec01f

File tree

496 files changed

+1331
-1019
lines changed

Some content is hidden

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

496 files changed

+1331
-1019
lines changed

‎.github/chainguard/self.update-system-tests.push.sts.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ subject_pattern: repo:DataDog/dd-trace-java:ref:refs/(heads/master|tags/v[0-9]+.
55
claim_pattern:
66
event_name: (push|workflow_dispatch)
77
ref: refs/(heads/master|tags/v[0-9]+\.[0-9]+\.0)
8-
ref_protected: "true"
98
job_workflow_ref: DataDog/dd-trace-java/\.github/workflows/create-release-branch\.yaml@refs/heads/master
109

1110
permissions:

‎.github/workflows/create-release-branch.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ jobs:
7979
with:
8080
token: "${{ steps.octo-sts.outputs.token }}"
8181
branch: "${{ steps.define-branch.outputs.branch }}"
82-
branch-from: "${{ github.sha }}"
82+
# for scheduled runs, sha is the tip of the default branch
83+
# for dispatched runs, sha is the tip of the branch it was dispatched on
84+
head-sha: "${{ github.sha }}"
85+
create-branch: true
8386
command: push
8487
commits: "${{ steps.create-commit.outputs.commit }}"

‎.github/workflows/update-docker-build-image.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ jobs:
7878
branch: "${{ steps.define-branch.outputs.branch }}"
7979
# for scheduled runs, sha is the tip of the default branch
8080
# for dispatched runs, sha is the tip of the branch it was dispatched on
81-
branch-from: "${{ github.sha }}"
81+
head-sha: "${{ github.sha }}"
82+
create-branch: true
8283
command: push
8384
commits: "${{ steps.create-commit.outputs.commit }}"
8485
- name: Create pull request

‎.github/workflows/update-gradle-dependencies.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ jobs:
6464
branch: "${{ steps.define-branch.outputs.branch }}"
6565
# for scheduled runs, sha is the tip of the default branch
6666
# for dispatched runs, sha is the tip of the branch it was dispatched on
67-
branch-from: "${{ github.sha }}"
67+
head-sha: "${{ github.sha }}"
68+
create-branch: true
6869
command: push
6970
commits: "${{ steps.create-commit.outputs.commit }}"
7071
- name: Create pull request

‎.github/workflows/update-jmxfetch-submodule.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ jobs:
5454
branch: "${{ steps.define-branch.outputs.branch }}"
5555
# for scheduled runs, sha is the tip of the default branch
5656
# for dispatched runs, sha is the tip of the branch it was dispatched on
57-
branch-from: "${{ github.sha }}"
57+
head-sha: "${{ github.sha }}"
58+
create-branch: true
5859
command: push
5960
commits: "${{ steps.create-commit.outputs.commit }}"
6061
- name: Create pull request

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ default:
171171
- export ORG_GRADLE_PROJECT_mavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY
172172
- export ORG_GRADLE_PROJECT_gradlePluginProxy=$GRADLE_PLUGIN_PROXY
173173
- mkdir -p .gradle
174+
- export GRADLE_USER_HOME=$(pwd)/.gradle
174175
# replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties
175176
- sed -i "s|https://repo.maven.apache.org/maven2/|$MAVEN_REPOSITORY_PROXY|g" .mvn/wrapper/maven-wrapper.properties
176177
- export GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xms$GRADLE_MEM -Xmx$GRADLE_MEM -XX:ErrorFile=/tmp/hs_err_pid%p.log -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp'"

‎.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/019c5ba11c2018bf17e06c74d6d8bc784f77bd7bf16d474d628609de91dbca29/one-pipeline.yml
4+
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/53cec1ca53804e5abff804aefdd5cffbcaa5cb546c7e6fcf4c35df6796e06bf1/one-pipeline.yml

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ com.beust:jcommander:1.78=jmhRuntimeClasspath,testRuntimeClasspath
99
com.blogspot.mydailyjava:weak-lock-free:0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
1010
com.datadoghq.okhttp3:okhttp:3.12.15=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
1111
com.datadoghq.okio:okio:1.17.6=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
12+
com.datadoghq:dd-instrument-java:0.0.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1213
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1314
com.datadoghq:java-dogstatsd-client:4.4.3=jmhRuntimeClasspath,testRuntimeClasspath
1415
com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,testRuntimeClasspath
@@ -39,7 +40,7 @@ commons-io:commons-io:2.11.0=jmhRuntimeClasspath,testCompileClasspath,testRuntim
3940
de.thetaphi:forbiddenapis:3.8=compileClasspath,jmhCompileClasspath
4041
info.picocli:picocli:4.6.3=jmhRuntimeClasspath,testRuntimeClasspath
4142
io.leangen.geantyref:geantyref:1.3.16=jmhRuntimeClasspath,testRuntimeClasspath
42-
io.sqreen:libsqreen:17.1.0=jmhRuntimeClasspath,testRuntimeClasspath
43+
io.sqreen:libsqreen:17.2.0=jmhRuntimeClasspath,testRuntimeClasspath
4344
javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
4445
jaxen:jaxen:1.2.0=spotbugs
4546
jline:jline:2.14.6=jmhRuntimeClasspath,testRuntimeClasspath

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ com.beust:jcommander:1.78=testRuntimeClasspath
99
com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1010
com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1111
com.datadoghq.okio:okio:1.17.6=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12+
com.datadoghq:dd-instrument-java:0.0.2=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1213
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,main_java11CompileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1314
com.datadoghq:java-dogstatsd-client:4.4.3=runtimeClasspath,testRuntimeClasspath
1415
com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath
@@ -39,7 +40,7 @@ commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
3940
de.thetaphi:forbiddenapis:3.8=compileClasspath
4041
info.picocli:picocli:4.6.3=testRuntimeClasspath
4142
io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath
42-
io.sqreen:libsqreen:17.1.0=testRuntimeClasspath
43+
io.sqreen:libsqreen:17.2.0=testRuntimeClasspath
4344
javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
4445
jaxen:jaxen:1.2.0=spotbugs
4546
jline:jline:2.14.6=testRuntimeClasspath

‎dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/gradle.lockfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ com.beust:jcommander:1.78=runtimeClasspath,testRuntimeClasspath
99
com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1010
com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1111
com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
12+
com.datadoghq:dd-instrument-java:0.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1213
com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
1314
com.datadoghq:java-dogstatsd-client:4.4.3=runtimeClasspath,testRuntimeClasspath
1415
com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath
@@ -45,7 +46,7 @@ commons-io:commons-io:2.11.0=compileClasspath,runtimeClasspath,testCompileClassp
4546
de.thetaphi:forbiddenapis:3.8=compileClasspath
4647
info.picocli:picocli:4.6.3=runtimeClasspath,testRuntimeClasspath
4748
io.leangen.geantyref:geantyref:1.3.16=runtimeClasspath,testRuntimeClasspath
48-
io.sqreen:libsqreen:17.1.0=runtimeClasspath,testRuntimeClasspath
49+
io.sqreen:libsqreen:17.2.0=runtimeClasspath,testRuntimeClasspath
4950
javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
5051
jaxen:jaxen:1.2.0=spotbugs
5152
jline:jline:2.14.6=runtimeClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)