Skip to content

Commit 74535b9

Browse files
wantsuiwantsui
authored
Merge branch 'master' into revert-5290-revert-5208-add-process-tags-to-dbm
2 parents 8c79738 + 8f4c16d commit 74535b9

File tree

865 files changed

+1654
-1044
lines changed

Some content is hidden

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

865 files changed

+1654
-1044
lines changed

‎.github/workflows/system-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
test:
7878
needs:
7979
- build
80-
uses: DataDog/system-tests/.github/workflows/system-tests.yml@bafc8bc606d76170d98ce3cdb13c75a1ea9cf924 # Automated: This reference is automatically updated.
80+
uses: DataDog/system-tests/.github/workflows/system-tests.yml@107798bd55a6d4ca247b88d01a1316549b8bafe9 # Automated: This reference is automatically updated.
8181
secrets:
8282
TEST_OPTIMIZATION_API_KEY: ${{ secrets.DD_API_KEY }} # key used to pushed test results to test optim
8383
DD_API_KEY: ${{ secrets.DD_API_KEY }} # key used in tests runs
@@ -91,7 +91,7 @@ jobs:
9191
desired_execution_time: 300 # 5 minutes
9292
scenarios_groups: tracer_release
9393
skip_empty_scenarios: true
94-
ref: bafc8bc606d76170d98ce3cdb13c75a1ea9cf924 # Automated: This reference is automatically updated.
94+
ref: 107798bd55a6d4ca247b88d01a1316549b8bafe9 # Automated: This reference is automatically updated.
9595
force_execute: ${{ needs.build.outputs.forced_tests }}
9696
parametric_job_count: 8
9797
push_to_test_optimization: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}

‎.gitlab-ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ build-image-amd64:
5858

5959
build-image-arm64:
6060
extends: .build-image-base
61-
tags: ["docker-in-docker:microvm-arm64"]
61+
tags: ["docker-in-docker:arm64"]
6262
variables:
6363
ARCHITECTURE: arm64
6464

@@ -148,8 +148,8 @@ requirements_json_test:
148148

149149
configure_system_tests:
150150
variables:
151-
SYSTEM_TESTS_REF: bafc8bc606d76170d98ce3cdb13c75a1ea9cf924 # Automated: This reference is automatically updated.
152-
SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,lib-injection,docker_ssi"
151+
SYSTEM_TESTS_REF: 107798bd55a6d4ca247b88d01a1316549b8bafe9 # Automated: This reference is automatically updated.
152+
SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,simple_onboarding_appsec,lib-injection,docker_ssi"
153153
SYSTEM_TEST_BUILD_ATTEMPTS: 3
154154

155155
save_versions:

‎.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/35232333af9db0dce47f0f829e012fe3d90c31dbd88103fa2ff910c3d421fb0f/one-pipeline.yml
4+
- remote: https://gitlab-templates.ddbuild.io/libdatadog/one-pipeline/ca/75745fafbee537a84b24d8d5fe735299438cbe46d6949d686cd73818296c5f44/one-pipeline.yml

‎CHANGELOG.md‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,20 @@
22

33
## [Unreleased]
44

5+
## [2.28.0] - 2026-02-04
6+
7+
### Added
8+
9+
* AI Guard: Add instrumentation for `ruby_llm` gem. ([#5273][])
10+
11+
### Changed
12+
13+
* Core: Bump minimum version of datadog-ruby_core_source to 3.5.2 ([#5278][])
14+
15+
### Fixed
16+
17+
* AppSec: Fix exception in Rails contrib `:after_routes_loaded` hook when routes are reloaded. ([#5283][])
18+
519
## [2.27.0] - 2026-01-21
620

721
### Added
@@ -3472,7 +3486,8 @@ Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.3.1
34723486
Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
34733487
34743488
3475-
[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v2.27.0...master
3489+
[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v2.28.0...master
3490+
[2.28.0]: https://github.com/DataDog/dd-trace-rb/compare/v2.27.0...v2.28.0
34763491
[2.27.0]: https://github.com/DataDog/dd-trace-rb/compare/v2.26.0...v2.27.0
34773492
[2.26.0]: https://github.com/DataDog/dd-trace-rb/compare/v2.25.0...v2.26.0
34783493
[2.25.0]: https://github.com/DataDog/dd-trace-rb/compare/v2.24.0...v2.25.0
@@ -5148,6 +5163,9 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
51485163
[#5246]: https://github.com/DataDog/dd-trace-rb/issues/5246
51495164
[#5247]: https://github.com/DataDog/dd-trace-rb/issues/5247
51505165
[#5254]: https://github.com/DataDog/dd-trace-rb/issues/5254
5166+
[#5273]: https://github.com/DataDog/dd-trace-rb/issues/5273
5167+
[#5278]: https://github.com/DataDog/dd-trace-rb/issues/5278
5168+
[#5283]: https://github.com/DataDog/dd-trace-rb/issues/5283
51515169
[@AdrianLC]: https://github.com/AdrianLC
51525170
[@Azure7111]: https://github.com/Azure7111
51535171
[@BabyGroot]: https://github.com/BabyGroot

‎Steepfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ target :datadog do
3838
ignore 'lib/datadog/appsec/contrib/auto_instrument.rb'
3939
ignore 'lib/datadog/appsec/contrib/devise/configuration.rb'
4040
ignore 'lib/datadog/appsec/contrib/devise/data_extractor.rb'
41-
ignore 'lib/datadog/appsec/contrib/devise/ext.rb'
4241
ignore 'lib/datadog/appsec/contrib/devise/integration.rb'
4342
ignore 'lib/datadog/appsec/contrib/devise/patcher.rb'
4443
ignore 'lib/datadog/appsec/contrib/devise/patches/signin_tracking_patch.rb'
@@ -55,15 +54,13 @@ target :datadog do
5554
ignore 'lib/datadog/appsec/contrib/graphql/gateway/watcher.rb'
5655
ignore 'lib/datadog/appsec/contrib/graphql/integration.rb'
5756
ignore 'lib/datadog/appsec/contrib/graphql/patcher.rb'
58-
ignore 'lib/datadog/appsec/contrib/rack/ext.rb'
5957
ignore 'lib/datadog/appsec/contrib/rack/gateway/request.rb'
6058
ignore 'lib/datadog/appsec/contrib/rack/gateway/response.rb'
6159
ignore 'lib/datadog/appsec/contrib/rack/gateway/watcher.rb'
6260
ignore 'lib/datadog/appsec/contrib/rack/integration.rb'
6361
ignore 'lib/datadog/appsec/contrib/rack/patcher.rb'
6462
ignore 'lib/datadog/appsec/contrib/rack/request_body_middleware.rb'
6563
ignore 'lib/datadog/appsec/contrib/rack/request_middleware.rb'
66-
ignore 'lib/datadog/appsec/contrib/rails/ext.rb'
6764
ignore 'lib/datadog/appsec/contrib/rails/framework.rb'
6865
ignore 'lib/datadog/appsec/contrib/rails/gateway/request.rb'
6966
ignore 'lib/datadog/appsec/contrib/rails/gateway/watcher.rb'

‎gemfiles/jruby_10.0_activesupport.gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gemfiles/jruby_10.0_aws.gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gemfiles/jruby_10.0_contrib.gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gemfiles/jruby_10.0_contrib_old.gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gemfiles/jruby_10.0_core_old.gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)