Skip to content

Commit f2998c3

Browse files
authored
Merge branch 'master' into alejandro.gonzalez/APPSEC-61873-3
2 parents e2d5ed0 + 65b9b8a commit f2998c3

File tree

328 files changed

+13642
-1884
lines changed

Some content is hidden

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

328 files changed

+13642
-1884
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
contents: write
7070
id-token: write # required for OIDC token federation
7171
steps:
72-
- uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
72+
- uses: DataDog/dd-octo-sts-action@96a25462dbcb10ebf0bfd6e2ccc917d2ab235b9a # v1.0.4
7373
id: octo-sts
7474
with:
7575
scope: DataDog/dd-trace-java

.github/workflows/enforce-datadog-merge-queue.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
exit 1
2222
- name: Get OIDC token
2323
if: github.event.action == 'enqueued'
24-
uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
24+
uses: DataDog/dd-octo-sts-action@96a25462dbcb10ebf0bfd6e2ccc917d2ab235b9a # v1.0.4
2525
id: octo-sts
2626
with:
2727
scope: DataDog/dd-trace-java

.github/workflows/run-system-tests.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,20 @@ jobs:
6363
- build
6464
# If you change the following comment, update the pattern in the update_system_test_reference.sh script to match.
6565
uses: DataDog/system-tests/.github/workflows/system-tests.yml@main # system tests are pinned on release branches only
66-
secrets:
67-
TEST_OPTIMIZATION_API_KEY: ${{ secrets.DATADOG_API_KEY_PROD }}
6866
permissions:
6967
contents: read
7068
id-token: write
7169
packages: write
7270
with:
7371
library: java
7472
# If you change the following comment, update the pattern in the update_system_test_reference.sh script to match.
75-
ref: main # system tests are pinned on release branches only
73+
ref: "main" # system tests are pinned on release branches only
7674
binaries_artifact: binaries
7775
desired_execution_time: 900 # 15 minutes
7876
scenarios_groups: tracer-release
7977
excluded_scenarios: APM_TRACING_E2E_OTEL,APM_TRACING_E2E_SINGLE_SPAN,PROFILING # exclude flaky scenarios
8078
skip_empty_scenarios: true
81-
push_to_test_optimization: true
79+
push_to_test_optimization: false # disabled to avoid pushing to Test Optimization while API key is transitioning to system-tests
8280

8381
# Ensure the main job is run to completion
8482
check:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
contents: read
1313
id-token: write # Required for OIDC token federation
1414
steps:
15-
- uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
15+
- uses: DataDog/dd-octo-sts-action@96a25462dbcb10ebf0bfd6e2ccc917d2ab235b9a # v1.0.4
1616
id: octo-sts
1717
with:
1818
scope: DataDog/dd-trace-java

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
contents: read
1313
id-token: write # Required for OIDC token federation
1414
steps:
15-
- uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
15+
- uses: DataDog/dd-octo-sts-action@96a25462dbcb10ebf0bfd6e2ccc917d2ab235b9a # v1.0.4
1616
id: octo-sts
1717
with:
1818
scope: DataDog/dd-trace-java

.github/workflows/update-smoke-test-latest-versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
contents: read
1313
id-token: write # Required for OIDC token federation
1414
steps:
15-
- uses: DataDog/dd-octo-sts-action@acaa02eee7e3bb0839e4272dacb37b8f3b58ba80 # v1.0.3
15+
- uses: DataDog/dd-octo-sts-action@96a25462dbcb10ebf0bfd6e2ccc917d2ab235b9a # v1.0.4
1616
id: octo-sts
1717
with:
1818
scope: DataDog/dd-trace-java

.gitlab-ci.yml

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@ muzzle-dep-report:
647647
CI_USE_TEST_AGENT: "true"
648648
CI_AGENT_HOST: local-agent
649649
services:
650-
- name: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.33.1
650+
- name: registry.ddbuild.io/images/mirror/dd-apm-test-agent/ddapm-test-agent:v1.44.0
651651
alias: local-agent
652652
variables:
653653
LOG_LEVEL: "DEBUG"
@@ -848,32 +848,6 @@ deploy_to_profiling_backend:
848848
UPSTREAM_BRANCH: $CI_COMMIT_BRANCH
849849
UPSTREAM_TAG: $CI_COMMIT_TAG
850850

851-
trigger_tibco_tests:
852-
stage: tests
853-
needs: [ build ]
854-
rules:
855-
- if: '$POPULATE_CACHE'
856-
when: never
857-
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
858-
when: on_success
859-
- if: '$CI_COMMIT_TAG =~ /^v.*/'
860-
when: on_success
861-
- when: manual
862-
allow_failure: true
863-
trigger:
864-
project: DataDog/tibco-testing
865-
branch: main
866-
strategy: depend
867-
variables:
868-
UPSTREAM_PACKAGE_JOB: $BUILD_JOB_NAME
869-
UPSTREAM_PACKAGE_JOB_ID: $BUILD_JOB_ID
870-
UPSTREAM_PROJECT_ID: $CI_PROJECT_ID
871-
UPSTREAM_PROJECT_NAME: $CI_PROJECT_NAME
872-
UPSTREAM_PIPELINE_ID: $CI_PIPELINE_ID
873-
UPSTREAM_BRANCH: $CI_COMMIT_BRANCH
874-
UPSTREAM_TAG: $CI_COMMIT_TAG
875-
FORCE_TRIGGER: $FORCE_TRIGGER
876-
877851
deploy_to_di_backend:manual:
878852
stage: publish
879853
needs: [ build ]
@@ -1071,7 +1045,7 @@ publishing-gate:
10711045

10721046
configure_system_tests:
10731047
variables:
1074-
SYSTEM_TESTS_REF: main # system tests are pinned on release branches only
1048+
SYSTEM_TESTS_REF: "main" # system tests are pinned on release branches only
10751049
SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_profiling,simple_onboarding_appsec,docker-ssi,lib-injection"
10761050

10771051
create_key:

.gitlab/benchmarks/bp-runner.fail-on-breach.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
1-
# Thresholds set based on guidance in https://datadoghq.atlassian.net/wiki/x/LgI1LgE#How-to-choose-thresholds-for-pre-release-gates%3F
1+
# Auto-generated SLO Thresholds
2+
# Generated: 2026-03-31
3+
#
4+
# Generation Strategy: tight
5+
# Formula: CI_bound / (1 ± T) (T = 10.0%)
6+
#
7+
# SLO Checking:
8+
# - BREACH: 90% CI boundary crosses threshold
9+
# - WARNING: 90% CI boundary crosses warning_threshold (constant)
10+
#
11+
# DO NOT EDIT MANUALLY - Regenerate using:
12+
# benchmark_analyzer generate slos --help
13+
#
14+
# link to documentation on autogenerated thresholds https://github.com/DataDog/relenv-benchmark-analyzer/blob/main/README.md#generate-slo-thresholds
215

316
experiments:
417
- name: Run SLO breach check
@@ -18,7 +31,7 @@ experiments:
1831
# https://benchmarking.us1.prod.dog/trends?projectId=4&branch=master&trendsTab=per_scenario&scenario=normal_operation%2Fonly-tracing&trendsType=scenario
1932
- name: normal_operation/only-tracing
2033
thresholds:
21-
- agg_http_req_duration_p50 < 2.6 ms
34+
- agg_http_req_duration_p50 < 2.526 ms
2235
- agg_http_req_duration_p99 < 8.5 ms
2336
# https://benchmarking.us1.prod.dog/trends?projectId=4&branch=master&trendsTab=per_scenario&scenario=normal_operation%2Fotel-latest&trendsType=scenario
2437
- name: normal_operation/otel-latest

.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/9cf7d7609ff62e4723c9cbc061ca2a25345ce5d6055b9acad9a13dbf736261f0/one-pipeline.yml
4+
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/4667b01c6ae983f92ecf106e110ced3dac798b229cf2a0539c58aa22e95a99d5/one-pipeline.yml

ARCHITECTURE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ to `.classdata` to prevent unintended loading. See [`docs/how_to_work_with_gradl
5454
utilities. Visible to all classloaders, so instrumentation advice and helpers can use them directly.
5555
See [`docs/bootstrap_design_guidelines.md`](docs/bootstrap_design_guidelines.md).
5656

57-
- **`agent-builder/`** — ByteBuddy integration layer. Class transformer pipeline:
57+
- **`agent-installer/`** Product installers and ByteBuddy integration layer. Class transformer pipeline:
5858
`DDClassFileTransformer` intercepts every class load, `GlobalIgnoresMatcher` applies early
5959
filtering, `CombiningMatcher` evaluates instrumentation matchers, `SplittingTransformer`
6060
applies matched transformations. The `ignored_class_name.trie` is a compiled trie built at

0 commit comments

Comments
 (0)