Merge branch 'master' into add-process-tags-to-tracing

Author: wantsui

.cursor/rules/architecture.mdc

@@ -0,0 +1,36 @@
+---
+description:
+globs:
+alwaysApply: false
+---
+# Architecture and Design
+
+This library provides tools to get visibility into the performance and security of Ruby applications. This includes distributed tracing, profiling, app & api protection, dynamic instrumentation, metrics emission, etc.
+
+## Project Structure
+
+- @lib/datadog/appsec - app & api protection implementation (formely known as appsec)
+- @lib/datadog/appsec/contrib - app & api protection integrations with third-party libraries
+- @lib/datadog/core - glue and shared code
+- @lib/datadog/di - dynamic instrumentation
+- @lib/datadog/profiling - profiling
+- @lib/datadog/tracing - distributed tracing
+- @lib/datadog/tracing/contrib - distributed tracing integrations with third-party libraries
+- @spec/ - Library test suite
+- @ext/datadog_profiling_native_extension - native extension for profiling
+- @ext/libdatadog_api - native extension for libdatadog apis
+- @docs/ - Developer documentation. Includes API documentation, upgrade guides, etc.
+
+## Integration Pattern
+
+Each framework integration follows a common pattern:
+1. `patcher.rb` - Modifies framework behavior
+2. `integration.rb` - Describes the integration
+3. `ext.rb` - Constants specific to the integration
+4. `configuration/settings.rb` - Integration-specific settings
+
+## Native Extensions
+
+The library uses native extensions which requires using Ruby C API.
+
+The native extension is in `ext/` directory and compiled for each Ruby version.

.cursor/rules/code-style.mdc

@@ -0,0 +1,40 @@
+---
+description:
+globs:
+alwaysApply: true
+---
+
+## Ruby usage
+
+- We use Ruby 2.5 syntax
+- Use exceptions for exceptional cases, not for control flow.
+- Implement proper error logging and user-friendly messages.
+
+## Type checking
+
+- RBS is used for static type checking
+- Type definitions are in the `sig/` directory
+- Update type definitions when modifying code
+- Run `bundle exec rake steep:check` to verify type correctness
+- Always run `bundle exec rake steep:check` after any update to RBS files
+- When deleting Ruby files, delete corresponding RBS file. Run `bundle exec rake rbs:clean` to make sure that there are no unnecessary RBS files.
+- Avoid using `untyped` type, use it only when it is not feasible to derive the correct type
+- Do not write types like `(nil | Type)`, use `Type?` instead
+- See [StaticTypingGuide.md](mdc:docs/StaticTypingGuide.md) for details
+
+## Code Quality
+
+- @standardrb is used for code style enforcement
+- Run `bundle exec standardrb` to check code quality
+- Ensure all code passes style checks before submitting
+
+## Commands
+
+- %steep run `bundle exec rake steep:check`. If there are typechecking errors, examine and fix them.
+- %rbs for the files the current context examine the current changes and fix (or create) corresponding rbs files
+
+## Commits and Pull Requests
+
+When creating a pull request and committing code, follow the [PULL_REQUEST_TEMPLATE.md](mdc:.github/PULL_REQUEST_TEMPLATE.md) template.
+
+When submitting a pull request that includes a significant amount of AI-generated code, this must be disclosed using the specific repository label "AI Generated" and at the top of the description.

.cursor/rules/testing.mdc

@@ -0,0 +1,28 @@
+---
+description: when editing or running tests
+globs:
+alwaysApply: false
+---
+# Testing Guidelines
+
+## Writing Tests
+
+- Tests are written using [RSpec](mdc:https:/rspec.info)
+- Test files should mirror the structure of `lib`
+- All changes should be covered by corresponding tests
+- If new files in the repository are created, run `git add -A` before running tests (otherwise `release_gem_spec.rb` will fail)
+- Do not use `instance_variable_set` and `instance_variable_get` in tests, use mocking when needed
+- Do not make changes to `release_gem_spec.rb` if not asked
+- Do not use focused tests feature (fit, fdescribe)
+
+## Running Tests
+
+- Run core library tests: `bundle exec rake test:main`
+- Run a specific test/file from core library tests: `bundle exec rspec <relative path to the file>`
+
+## Appraisal Groups
+
+- Dependency configurations are managed with [Appraisal](mdc:https:/github.com/thoughtbot/appraisal)
+- Group definitions are in `Appraisals`
+- Generate gemfiles with `bundle exec appraisal generate`
+- Install dependencies with `bundle exec appraisal install`

.github/workflows/_unit_test.yml

@@ -136,7 +136,7 @@ jobs:
         JRUBY_OPTS: "--dev" # Faster JVM startup: https://github.com/jruby/jruby/wiki/Improving-startup-time#use-the---dev-flag
     services:
       agent:
-        image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.18.0
+        image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.37.0
         env:
           LOG_LEVEL: DEBUG
           TRACE_LANGUAGE: ruby
@@ -206,7 +206,7 @@ jobs:
       options: --link mongodb:mongodb_secondary
     services:
       agent:
-        image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.18.0
+        image: ghcr.io/datadog/dd-apm-test-agent/ddapm-test-agent:v1.37.0
         env:
           LOG_LEVEL: DEBUG
           TRACE_LANGUAGE: ruby

.github/workflows/check.yml

@@ -142,7 +142,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Run actionlint
-        uses: docker://rhysd/actionlint:1.7.7
+        uses: docker://rhysd/actionlint:1.7.8
         with:
           args: -color
 

.github/workflows/lock-dependency.yml

@@ -37,31 +37,31 @@ jobs:
         engine:
           # ADD NEW RUBIES HERE
           - name: ruby
-            version: '3.5'
+            version: "3.5"
           - name: ruby
-            version: '3.4'
+            version: "3.4"
           - name: ruby
-            version: '3.3'
+            version: "3.3"
           - name: ruby
-            version: '3.2'
+            version: "3.2"
           - name: ruby
-            version: '3.1'
+            version: "3.1"
           - name: ruby
-            version: '3.0'
+            version: "3.0"
           - name: ruby
-            version: '2.7'
+            version: "2.7"
           - name: ruby
-            version: '2.6'
+            version: "2.6"
           - name: ruby
-            version: '2.5'
+            version: "2.5"
           - name: jruby
-            version: '9.4'
+            version: "9.4"
           - name: jruby
-            version: '9.3'
+            version: "9.3"
           - name: jruby
-            version: '9.2'
+            version: "9.2"
           - name: jruby
-            version: '10.0'
+            version: "10.0"
     container:
       image: ghcr.io/datadog/images-rb/engines/${{ matrix.engine.name }}:${{ matrix.engine.version }}-gnu-gcc
       env:
@@ -103,13 +103,17 @@ jobs:
           path: gemfiles
           pattern: lock-dependency-${{ github.run_id }}-*
           merge-multiple: true
-      - run: git diff --color=always
+      # FIXME: The ghcommit-action does not pick up untracked/unstaged files
+      #        https://github.com/planetscale/ghcommit-action/issues/43
+      - name: Stage changes
+        run: git add gemfiles
+      - run: git diff --cached --color=always
       - name: Commit changes
         uses: planetscale/ghcommit-action@f24050e41f8694750427d111b52f4ef9ca81a32d # v0.2.18
         with:
           repo: ${{ github.repository }}
           branch: ${{ github.head_ref }}
-          file_pattern: 'gemfiles/*'
+          file_pattern: "gemfiles/*"
           commit_message: "[🤖] Lock Dependency: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
         env:
           GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}

.github/workflows/nix.yml

@@ -17,12 +17,9 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-          - os: darwin
-            cpu: x86_64
-            base: macos-13 # always x86_64-darwin
           - os: darwin
             cpu: arm64
-            base: macos-14 # always arm64-darwin
+            base: macos-15 # always arm64-darwin
           - os: linux
             cpu: x86_64
             base: ubuntu-24.04 # always x86_64-linux-gnu

.github/workflows/system-tests.yml

@@ -77,7 +77,7 @@ jobs:
   test:
     needs:
       - build
-    uses: DataDog/system-tests/.github/workflows/system-tests.yml@bd28672d98576c2b07b6885ef18c6086c357d2e9  # Automated: This reference is automatically updated.
+    uses: DataDog/system-tests/.github/workflows/system-tests.yml@38b9edcd63a1158f1a51e0430770052341b9cfdb  # Automated: This reference is automatically updated.
     secrets:
       TEST_OPTIMIZATION_API_KEY: ${{ secrets.DD_API_KEY }}  # key used to pushed test results to test optim
       DD_API_KEY: ${{ secrets.DD_API_KEY }}  # key used in tests runs
@@ -91,7 +91,7 @@ jobs:
       desired_execution_time: 300  # 5 minutes
       scenarios_groups: tracer_release
       skip_empty_scenarios: true
-      ref: bd28672d98576c2b07b6885ef18c6086c357d2e9  # Automated: This reference is automatically updated.
+      ref: 38b9edcd63a1158f1a51e0430770052341b9cfdb  # Automated: This reference is automatically updated.
       force_execute: ${{ needs.build.outputs.forced_tests }}
       parametric_job_count: 8
       push_to_test_optimization: true

.github/workflows/test-macos.yaml

@@ -17,11 +17,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - macos-13
+          - macos-15
         ruby:
-          - '2.5'
-          - '2.6'
-          - '2.7'
           - '3.0'
           - '3.1'
           - '3.2'

.gitlab-ci.yml

@@ -143,7 +143,7 @@ requirements_json_test:
 
 configure_system_tests:
   variables:
-    SYSTEM_TESTS_REF: bd28672d98576c2b07b6885ef18c6086c357d2e9 # Automated: This reference is automatically updated.
+    SYSTEM_TESTS_REF: 38b9edcd63a1158f1a51e0430770052341b9cfdb # Automated: This reference is automatically updated.
     SYSTEM_TESTS_SCENARIOS_GROUPS: "simple_onboarding,lib-injection"
 
 save_versions: