Merge branch 'master' into appsec-55802-add-method-name-to-libddwaf-d…

…ebug-message
DataDog · Nov 14, 2024 · 96f76c8 · 96f76c8
2 parents 99c0e5f + 34d1947
commit 96f76c8
Show file tree

Hide file tree

Showing 648 changed files with 8,057 additions and 913 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -65,7 +65,7 @@ save_bundle_checksum: &save_bundle_checksum
     command: |
       if [ "$CI_BUNDLE_CACHE_HIT" != 1 ]; then
         # Recompute gemfiles/*.lock checksum, as those files might have changed
-        cat Gemfile Gemfile.lock Appraisals gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
+        cat Gemfile Gemfile.lock Appraisals gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
       fi
       cp .circleci/bundle_checksum /usr/local/bundle/bundle_checksum
 step_bundle_install: &step_bundle_install
@@ -82,16 +82,12 @@ step_appraisal_install: &step_appraisal_install
     name: Install Appraisal gems
     command: |
       if [ "$CI_BUNDLE_CACHE_HIT" != 1 ]; then
-        bundle exec appraisal install
+        bundle exec appraisal generate
+        bundle exec rake dependency:install
       else
-        bundle exec appraisal generate # Generate the appraisal files to match the lockfiles in the tree
+        bundle exec appraisal generate
         echo "All required gems were found in cache."
       fi
-step_appraisal_update: &step_appraisal_update
-  run:
-    name: Update Appraisal gems
-    command: | # Remove all generated gemfiles and lockfiles, resolve, and install dependencies again
-      bundle exec appraisal update
 step_compute_bundle_checksum: &step_compute_bundle_checksum
   run:
     name: Compute bundle checksum
@@ -100,7 +96,7 @@ step_compute_bundle_checksum: &step_compute_bundle_checksum
     # updating the gemset lock files produces extremely large commits.
     command: |
       bundle lock # Create Gemfile.lock
-      cat Gemfile Gemfile.lock Appraisals gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
+      cat Gemfile Gemfile.lock Appraisals gemfiles/*.gemfile gemfiles/*.gemfile.lock | md5sum > .circleci/bundle_checksum
 step_run_all_tests: &step_run_all_tests
   run:
     name: Run tests
@@ -181,17 +177,7 @@ orbs:
                 - bundle-{{ .Environment.CIRCLE_CACHE_VERSION }}-{{ checksum ".circleci/images/primary/binary_version" }}-<<parameters.ruby_version>>-{{ checksum "lib/datadog/version.rb" }}
           - *check_exact_bundle_cache_hit
           - *step_bundle_install
-          - when:
-              condition:
-                equal: [ << parameters.edge >>, true ]
-              steps:
-                - *step_appraisal_update # Run on latest version of all gems we integrate with
-          - when:
-              condition:
-                not:
-                  equal: [ << parameters.edge >>, true ]
-              steps:
-                - *step_appraisal_install # Run on a stable set of gems we integrate with
+          - *step_appraisal_install # Run on a stable set of gems we integrate with
           - *save_bundle_checksum
           - save_cache:
               key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
@@ -299,6 +285,10 @@ orbs:
                 curl --silent --show-error --location --fail --retry 3 --output /usr/local/bin/dockerize $DOCKERIZE_URL
                 chmod +x /usr/local/bin/dockerize
                 dockerize --version
+          # Test agent uses `jq` to check results
+          - run:
+              name: Install jq
+              command: apt update && apt install jq -y
           # Wait for containers to start
           - docker-wait:
               port: 5432
@@ -321,10 +311,6 @@ orbs:
               host: "testagent"
               port: 9126
           - *step_run_all_tests
-          - run:
-              # Test agent uses `jq` to check results
-              name: Install jq
-              command: apt update && apt install jq -y
           - *step_get_test_agent_trace_check_results
           - store_test_results:
               path: /tmp/rspec

diff --git a/.circleci/images/primary/binary_version b/.circleci/images/primary/binary_version
@@ -1 +1 @@
-462
+463
diff --git a/.standard_todo.yml b/.standard_todo.yml
@@ -38,6 +38,7 @@ ignore:
 - spec/datadog/appsec/**/**
 - spec/datadog/benchmark/**/**
 - spec/datadog/core/**/**
+- spec/datadog/di/integration/*_test_class*.rb
 - spec/datadog/kit/**/**
 - spec/datadog/tracing/**/**
 - spec/support/**/**

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 ## [Unreleased]
 
+## [2.7.0] - 2024-11-13
+
+### Added
+
+* Profiling: Enable "heap clean after GC" profiler optimization by default ([#4085][])
+
+### Changed
+
+* Enable crashtracking by default ([#4083][])
+* Upgrade to `libdatadog` 14.1 ([#4082][])
+
+### Fixed
+
+* Fix `Process.waitall` hanging and stack overflow when crashtracking enabled ([#4082][])
+
 ## [2.6.0] - 2024-11-06
 
 ### Changed
@@ -3013,7 +3028,8 @@ Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.3.1
 Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 
 
-[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v2.6.0...master
+[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v2.7.0...master
+[2.7.0]: https://github.com/DataDog/dd-trace-rb/compare/v2.6.0...v2.7.0
 [2.6.0]: https://github.com/DataDog/dd-trace-rb/compare/v2.5.0...v2.6.0
 [2.5.0]: https://github.com/DataDog/dd-trace-rb/compare/v2.4.0...v2.5.0
 [2.4.0]: https://github.com/DataDog/dd-trace-rb/compare/v2.3.0...v2.4.0
@@ -4458,6 +4474,9 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#4033]: https://github.com/DataDog/dd-trace-rb/issues/4033
 [#4065]: https://github.com/DataDog/dd-trace-rb/issues/4065
 [#4078]: https://github.com/DataDog/dd-trace-rb/issues/4078
+[#4082]: https://github.com/DataDog/dd-trace-rb/issues/4082
+[#4083]: https://github.com/DataDog/dd-trace-rb/issues/4083
+[#4085]: https://github.com/DataDog/dd-trace-rb/issues/4085
 [@AdrianLC]: https://github.com/AdrianLC
 [@Azure7111]: https://github.com/Azure7111
 [@BabyGroot]: https://github.com/BabyGroot

diff --git a/benchmarks/di_instrument.rb b/benchmarks/di_instrument.rb
@@ -73,7 +73,11 @@ def run_benchmark
     settings = Datadog.configuration
     # We benchmark untargeted and targeted trace points; untargeted ones
     # are prohibited by default, permit them.
-    settings.dynamic_instrumentation.untargeted_trace_points = true
+    begin
+      settings.dynamic_instrumentation.internal.untargeted_trace_points = true
+    rescue NoMethodError
+      settings.dynamic_instrumentation.untargeted_trace_points = true
+    end
     redactor = Datadog::DI::Redactor.new(settings)
     serializer = Datadog::DI::Serializer.new(settings, redactor)
     logger = Logger.new(STDERR)

diff --git a/gemfiles/jruby_9.2_activesupport.gemfile.lock b/gemfiles/jruby_9.2_activesupport.gemfile.lock
diff --git a/gemfiles/jruby_9.2_aws.gemfile.lock b/gemfiles/jruby_9.2_aws.gemfile.lock
diff --git a/gemfiles/jruby_9.2_contrib.gemfile.lock b/gemfiles/jruby_9.2_contrib.gemfile.lock
diff --git a/gemfiles/jruby_9.2_contrib_old.gemfile.lock b/gemfiles/jruby_9.2_contrib_old.gemfile.lock
diff --git a/gemfiles/jruby_9.2_core_old.gemfile.lock b/gemfiles/jruby_9.2_core_old.gemfile.lock
diff --git a/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_7.gemfile.lock
diff --git a/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_8.gemfile.lock
diff --git a/gemfiles/jruby_9.2_elasticsearch_latest.gemfile.lock b/gemfiles/jruby_9.2_elasticsearch_latest.gemfile.lock
diff --git a/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock b/gemfiles/jruby_9.2_graphql_2.0.gemfile.lock
diff --git a/gemfiles/jruby_9.2_http.gemfile.lock b/gemfiles/jruby_9.2_http.gemfile.lock
diff --git a/gemfiles/jruby_9.2_opensearch_2.gemfile.lock b/gemfiles/jruby_9.2_opensearch_2.gemfile.lock
diff --git a/gemfiles/jruby_9.2_opensearch_3.gemfile.lock b/gemfiles/jruby_9.2_opensearch_3.gemfile.lock
diff --git a/gemfiles/jruby_9.2_opensearch_latest.gemfile.lock b/gemfiles/jruby_9.2_opensearch_latest.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rack_1.gemfile.lock b/gemfiles/jruby_9.2_rack_1.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rack_2.gemfile.lock b/gemfiles/jruby_9.2_rack_2.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rack_3.gemfile.lock b/gemfiles/jruby_9.2_rack_3.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rack_latest.gemfile.lock b/gemfiles/jruby_9.2_rack_latest.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock b/gemfiles/jruby_9.2_rails5_mysql2.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres_redis.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres_redis_activesupport.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2_rails5_postgres_sidekiq.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2_rails5_semantic_logger.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock b/gemfiles/jruby_9.2_rails61_mysql2.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock b/gemfiles/jruby_9.2_rails61_postgres.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock b/gemfiles/jruby_9.2_rails61_postgres_redis.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock b/gemfiles/jruby_9.2_rails61_postgres_sidekiq.gemfile.lock
diff --git a/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock b/gemfiles/jruby_9.2_rails61_semantic_logger.gemfile.lock