Skip to content

Commit ca4502f

Browse files
Merge branch 'master' into alexeyk/debug-ci-freeze
2 parents 3c7db63 + 7528bd7 commit ca4502f

59 files changed

Lines changed: 3148 additions & 779 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
issuer: https://gitlab.ddbuild.io
2+
3+
subject_pattern: "project_path:DataDog/apm-reliability/dd-trace-java:ref_type:(branch|tag):ref:.*"
4+
5+
permissions:
6+
contents: read
7+

.gitlab/macrobenchmarks.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
include:
2-
project: 'DataDog/benchmarking-platform-tools'
3-
file: 'images/templates/gitlab/notify-slo-breaches.template.yml'
4-
ref: '925e0a3e7dd628885f6fc69cdaea5c8cc9e212bc'
2+
- project: 'DataDog/benchmarking-platform-tools'
3+
file: 'images/templates/gitlab/notify-slo-breaches.template.yml'
4+
- project: 'DataDog/benchmarking-platform-tools'
5+
file: 'images/templates/gitlab/check-slo-breaches.template.yml'
56

67
.macrobenchmarks:
78
stage: macrobenchmarks
@@ -76,10 +77,9 @@ otel-latest:
7677

7778

7879
check-slo-breaches:
80+
extends: .check-slo-breaches
7981
stage: macrobenchmarks
8082
interruptible: true
81-
tags: ["arch:amd64"]
82-
image: registry.ddbuild.io/images/benchmarking-platform-tools-ubuntu:latest
8383
rules:
8484
- if: $POPULATE_CACHE
8585
when: never
@@ -127,6 +127,7 @@ check-slo-breaches:
127127
- platform/artifacts/
128128
expire_in: 1 week
129129
variables:
130+
DDOCTOSTS_POLICY: "self.gitlab.github-access.read"
130131
UPSTREAM_PROJECT_ID: $CI_PROJECT_ID # The ID of the current project. This ID is unique across all projects on the GitLab instance.
131132
UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME # "dd-trace-java"
132133
UPSTREAM_BRANCH: $CI_COMMIT_REF_NAME # The branch or tag name for which project is built.

dd-java-agent/instrumentation/aws-java/aws-java-dynamodb-2.0/gradle.lockfile

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -189,57 +189,57 @@ org.testng:testng:7.5.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntime
189189
org.webjars:jquery:3.5.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath
190190
org.xmlresolver:xmlresolver:4.4.3=spotbugs
191191
software.amazon.awssdk:annotations:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
192-
software.amazon.awssdk:annotations:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
192+
software.amazon.awssdk:annotations:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
193193
software.amazon.awssdk:apache-client:2.30.22=testRuntimeClasspath
194-
software.amazon.awssdk:apache-client:2.33.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
194+
software.amazon.awssdk:apache-client:2.33.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
195195
software.amazon.awssdk:auth:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
196-
software.amazon.awssdk:auth:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
196+
software.amazon.awssdk:auth:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
197197
software.amazon.awssdk:aws-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
198-
software.amazon.awssdk:aws-core:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
198+
software.amazon.awssdk:aws-core:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
199199
software.amazon.awssdk:aws-json-protocol:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
200-
software.amazon.awssdk:aws-json-protocol:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
200+
software.amazon.awssdk:aws-json-protocol:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
201201
software.amazon.awssdk:checksums-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
202-
software.amazon.awssdk:checksums-spi:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
202+
software.amazon.awssdk:checksums-spi:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
203203
software.amazon.awssdk:checksums:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
204-
software.amazon.awssdk:checksums:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
204+
software.amazon.awssdk:checksums:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
205205
software.amazon.awssdk:dynamodb:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
206-
software.amazon.awssdk:dynamodb:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
206+
software.amazon.awssdk:dynamodb:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
207207
software.amazon.awssdk:endpoints-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
208-
software.amazon.awssdk:endpoints-spi:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
208+
software.amazon.awssdk:endpoints-spi:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
209209
software.amazon.awssdk:http-auth-aws-eventstream:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
210-
software.amazon.awssdk:http-auth-aws-eventstream:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
210+
software.amazon.awssdk:http-auth-aws-eventstream:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
211211
software.amazon.awssdk:http-auth-aws:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
212-
software.amazon.awssdk:http-auth-aws:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
212+
software.amazon.awssdk:http-auth-aws:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
213213
software.amazon.awssdk:http-auth-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
214-
software.amazon.awssdk:http-auth-spi:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
214+
software.amazon.awssdk:http-auth-spi:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
215215
software.amazon.awssdk:http-auth:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
216-
software.amazon.awssdk:http-auth:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
216+
software.amazon.awssdk:http-auth:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
217217
software.amazon.awssdk:http-client-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
218-
software.amazon.awssdk:http-client-spi:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
218+
software.amazon.awssdk:http-client-spi:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
219219
software.amazon.awssdk:identity-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
220-
software.amazon.awssdk:identity-spi:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
220+
software.amazon.awssdk:identity-spi:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
221221
software.amazon.awssdk:json-utils:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
222-
software.amazon.awssdk:json-utils:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
222+
software.amazon.awssdk:json-utils:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
223223
software.amazon.awssdk:metrics-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
224-
software.amazon.awssdk:metrics-spi:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
224+
software.amazon.awssdk:metrics-spi:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
225225
software.amazon.awssdk:netty-nio-client:2.30.22=testRuntimeClasspath
226-
software.amazon.awssdk:netty-nio-client:2.33.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
226+
software.amazon.awssdk:netty-nio-client:2.33.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath
227227
software.amazon.awssdk:profiles:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
228-
software.amazon.awssdk:profiles:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
228+
software.amazon.awssdk:profiles:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
229229
software.amazon.awssdk:protocol-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
230-
software.amazon.awssdk:protocol-core:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
230+
software.amazon.awssdk:protocol-core:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
231231
software.amazon.awssdk:regions:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
232-
software.amazon.awssdk:regions:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
232+
software.amazon.awssdk:regions:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
233233
software.amazon.awssdk:retries-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
234-
software.amazon.awssdk:retries-spi:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
234+
software.amazon.awssdk:retries-spi:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
235235
software.amazon.awssdk:retries:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
236-
software.amazon.awssdk:retries:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
236+
software.amazon.awssdk:retries:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
237237
software.amazon.awssdk:sdk-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
238-
software.amazon.awssdk:sdk-core:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
238+
software.amazon.awssdk:sdk-core:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
239239
software.amazon.awssdk:third-party-jackson-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
240-
software.amazon.awssdk:third-party-jackson-core:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
240+
software.amazon.awssdk:third-party-jackson-core:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
241241
software.amazon.awssdk:utils:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath
242-
software.amazon.awssdk:utils:2.33.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
242+
software.amazon.awssdk:utils:2.33.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
243243
software.amazon.eventstream:eventstream:1.0.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
244244
xml-apis:xml-apis:1.4.01=spotbugs
245245
empty=spotbugsPlugins

0 commit comments

Comments
 (0)