ddtrace 0.48.0 → 0.49.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9418700e29312fa4efc67e04b7ff901950a5ee0d942cc7fe06a49adbf694f08a
-  data.tar.gz: 348acc764a300c51c3e99b02001b0dc238775c6afd7b07fd3ee4c31758e1e906
+  metadata.gz: 0e85a4cb4edf7f4d545f54faf32eb97183a88e66c6726317239bd9e1f152005d
+  data.tar.gz: b76468765ea5ba2202e5650d14f320cd6ca16456eed4c5b301bcec81018e70ce
 SHA512:
-  metadata.gz: f1cdbcdef68b68901a5737c3bfae8797709448a6db0b92ee2f1a7e59c64c6610bf327b1d847bd2cd0d18e651807d9c6cead347516f258f7f62169ca71315d7e1
-  data.tar.gz: 4c9e69ff9418143fff7734c2fd7ae2973d230a58e5173e8a1a6e128733a5bdb3fda11874f63b87840fc7e60098c94c746dce7d527726166345e4ca1e4a4b95a2
+  metadata.gz: b3731205a2a8bbac1c1489154f3d48a1d120177f6e45f57cc0636b55c27c09552c0d9fc66b8220be648bb5ae4775e34515c0831c551cff13f9d4f7d5db6c648f
+  data.tar.gz: cbc68cfece89a9728770cd227a1184543c494c58669ba589c80523d497c57ecc3cf0ba1129b8699d5f7527483cf7d55764272f37b60277f4837e2be29a1c8c10

data/.circleci/config.yml

@@ -25,6 +25,10 @@ test_containers:
         description: Resource class to use
         type: string
         default: medium
+      edge:
+        description: Use latest version of dependencies during testing
+        type: boolean
+        default: false
   - &container_base_environment
     BUNDLE_GEMFILE: /app/Gemfile
     JRUBY_OPTS: --dev # Faster JVM startup: https://github.com/jruby/jruby/wiki/Improving-startup-time#use-the---dev-flag
@@ -97,8 +101,27 @@ step_appraisal_install: &step_appraisal_install
   run:
     name: Install Appraisal gems
     command: |
-      bundle exec appraisal clean # Ensure we fetch the latest version of dependencies
       bundle exec appraisal install
+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
+ensure_lockfile_committed: &ensure_lockfile_committed
+  run:
+    name: Ensure Gem lock files are commited
+    command: |
+      CHANGED_FILES=$(git status gemfiles/ --porcelain)
+      if [[ $CHANGED_FILES ]]
+      then
+        >&2 echo "Gem lock files were modified or new lock files were created during"
+        >&2 echo "'bundle install' and 'bundle appraisal install' installation in CI."
+        >&2 echo "You need to check in those changes in your branch."
+        >&2 echo "Affected files:"
+        >&2 echo $CHANGED_FILES
+        >&2 GIT_PAGER=cat git diff HEAD
+        exit 1
+      fi
 step_compute_bundle_checksum: &step_compute_bundle_checksum
   run:
     name: Compute bundle checksum
@@ -154,7 +177,18 @@ orbs:
               keys:
                 - '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundle-<<parameters.ruby_version>>-{{ checksum ".circleci/bundle_checksum" }}'
           - *step_bundle_install
-          - *step_appraisal_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
+                - *ensure_lockfile_committed
           - *step_compute_bundle_checksum
           - save_cache:
               key: '{{ .Environment.CIRCLE_CACHE_VERSION }}-bundled-repo-<<parameters.ruby_version>>-{{ .Environment.CIRCLE_SHA1 }}'
@@ -685,3 +719,176 @@ workflows:
             - test-jruby-9.2.0.0
             - test-jruby-9.2-latest
             # soon™️ - test-truffleruby-21.0.0
+  # This workflow runs the same `build` and `test` jobs as above on a schedule.
+  # Tasks related to housekeeping (e.g. prerelease) are not relevant
+  # to this daily check, as they are not expected to be impacted here.
+  edge:
+    triggers:
+      - schedule:
+          cron: "0 0 * * 1-5" # Every weekday
+          filters:
+            branches:
+              only:
+                - master
+    jobs:
+      # Integration
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.0
+          integration_apps: 'ruby rack'
+          ruby_version: '2.0'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.1
+          integration_apps: 'ruby rack'
+          ruby_version: '2.1'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.2
+          integration_apps: 'ruby rack'
+          ruby_version: '2.2'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.3
+          integration_apps: 'ruby rack rails-five'
+          ruby_version: '2.3'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.4
+          integration_apps: 'ruby rack rails-five'
+          ruby_version: '2.4'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.5
+          integration_apps: 'ruby rack rails-five'
+          ruby_version: '2.5'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.6
+          integration_apps: 'ruby rack rails-five'
+          ruby_version: '2.6'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-2.7
+          integration_apps: 'ruby rack rails-five'
+          ruby_version: '2.7'
+          <<: *filters_all_branches_and_tags
+      - orb/build_and_test_integration:
+          name: build_and_test_integration-3.0
+          # TODO: Get Rack & Rails apps working with Ruby 3.0
+          integration_apps: 'ruby'
+          ruby_version: '3.0'
+          <<: *filters_all_branches_and_tags
+      # MRI
+      - orb/build:
+          <<: *config-2_0
+          name: build-2.0
+          edge: true
+      - orb/test:
+          <<: *config-2_0
+          name: test-2.0
+          requires:
+            - build-2.0
+      - orb/build:
+          <<: *config-2_1
+          name: build-2.1
+      - orb/test:
+          <<: *config-2_1
+          name: test-2.1
+          requires:
+            - build-2.1
+      - orb/build:
+          <<: *config-2_2
+          name: build-2.2
+      - orb/test:
+          <<: *config-2_2
+          name: test-2.2
+          requires:
+            - build-2.2
+      - orb/build:
+          <<: *config-2_3
+          name: build-2.3
+      - orb/test:
+          <<: *config-2_3
+          name: test-2.3
+          requires:
+            - build-2.3
+      - orb/benchmark:
+          <<: *config-2_3
+          name: benchmark-2.3
+          requires:
+            - build-2.3
+      - orb/build:
+          <<: *config-2_4
+          name: build-2.4
+      - orb/test:
+          <<: *config-2_4
+          name: test-2.4
+          requires:
+            - build-2.4
+      - orb/build:
+          <<: *config-2_5
+          name: build-2.5
+      - orb/test:
+          <<: *config-2_5
+          name: test-2.5
+          requires:
+            - build-2.5
+      - orb/build:
+          <<: *config-2_6
+          name: build-2.6
+      - orb/test:
+          <<: *config-2_6
+          name: test-2.6
+          requires:
+            - build-2.6
+      - orb/build:
+          <<: *config-2_7
+          name: build-2.7
+      - orb/test:
+          <<: *config-2_7
+          name: test-2.7
+          requires:
+            - build-2.7
+      - orb/build:
+          <<: *config-3_0
+          name: build-3.0
+      - orb/test:
+          <<: *config-3_0
+          name: test-3.0
+          requires:
+            - build-3.0
+      - orb/build:
+          <<: *config-3_0-jit
+          name: build-3.0-jit
+      - orb/test:
+          <<: *config-3_0-jit
+          name: test-3.0-jit
+          requires:
+            - build-3.0-jit
+      # JRuby
+      - orb/build:
+          <<: *config-jruby-9_2_0_0
+          name: build-jruby-9.2.0.0
+      - orb/test:
+          <<: *config-jruby-9_2_0_0
+          name: test-jruby-9.2.0.0
+          requires:
+            - build-jruby-9.2.0.0
+      - orb/build:
+          <<: *config-jruby-9_2-latest
+          name: build-jruby-9.2-latest
+      - orb/test:
+          <<: *config-jruby-9_2-latest
+          name: test-jruby-9.2-latest
+          requires:
+            - build-jruby-9.2-latest
+      # TruffleRuby
+      # soon™️
+      # - orb/build:
+      #     <<: *config-truffleruby-21_0_0
+      #     name: build-truffleruby-21.0.0
+      # - orb/test:
+      #     <<: *config-truffleruby-21_0_0
+      #     name: test-truffleruby-21.0.0
+      #     requires:
+      #       - build-truffleruby-21.0.0

data/.dockerignore

@@ -1 +0,0 @@
-gemfiles/*

data/.gitignore

@@ -55,7 +55,8 @@ build-iPhoneSimulator/
 
 # lock files
 Gemfile.lock
-gemfiles/*
 
 # bundle config
 gemfiles/.bundle
+# Appraisal artifact file, always empty
+gemfiles/_.gemfile.lock

data/.rubocop.yml

@@ -5,7 +5,7 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.4 # Lowest version supported currently
+  TargetRubyVersion: 2.5 # Lowest version supported as of Rubocop 0.13.0
   Include:
     - 'lib/**/*.rb'
     - 'test/**/*.rb'
@@ -206,6 +206,14 @@ Style/CollectionCompact:
 Performance/RegexpMatch:
   Enabled: false
 
+# Requires Ruby 2.5
+Style/RedundantBegin:
+  Enabled: false
+
+# Requires Ruby 2.5
+Style/HashTransformKeys:
+  Enabled: false
+
 # Enforces negative/positive branching order,
 # which can hurt readability.
 Style/NegatedIfElseCondition:
@@ -231,6 +239,10 @@ RSpec/LeadingSubject:
 RSpec/ImplicitSubject:
   Enabled: false
 
+# Enforces empty line after hook declaration.
+RSpec/EmptyLineAfterHook:
+  Enabled: false
+
 # Enforces empty line after subject declaration.
 RSpec/EmptyLineAfterSubject:
   Enabled: false

data/Appraisals

@@ -1417,3 +1417,13 @@ elsif Gem::Version.new('3.0.0') <= Gem::Version.new(RUBY_VERSION)
     gem 'dogstatsd-ruby', '~> 4'
   end
 end
+
+ruby_runtime = if defined?(RUBY_ENGINE_VERSION)
+                 "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}"
+               else
+                 "#{RUBY_ENGINE}-#{RUBY_VERSION}" # For Ruby < 2.3
+               end
+
+appraisals.each do |appraisal|
+  appraisal.name.prepend("#{ruby_runtime}-")
+end

data/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 ## [Unreleased]
 
+## [0.49.0] - 2021-05-12
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.49.0
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.48.0...v0.49.0
+
+### Added
+
+- Add cause to error stack trace ([#1472][])
+
+### Changed
+
+### Fixed
+
+- Prevent double initialization when auto instrumenting non-Rails applications ([#1497][])
+- Support kwargs in Ruby 3.0 for sucker_punch ([#1495][]) ([@lloeki][])
+- Fargate fixes and Container parsing for CGroups ([#1487][][#1480][][#1475][])
+- Fix ActionPack instrumentation `#starts_with?` error([#1489][])
+- Doc fixes ([#1473][]) ([@kexoth][])
+
+### Refactored
+
 ## [0.48.0] - 2021-04-19
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.48.0
@@ -2343,6 +2365,14 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#1456]: https://github.com/DataDog/dd-trace-rb/issues/1456
 [#1457]: https://github.com/DataDog/dd-trace-rb/issues/1457
 [#1461]: https://github.com/DataDog/dd-trace-rb/issues/1461
+[#1472]: https://github.com/DataDog/dd-trace-rb/issues/1472
+[#1473]: https://github.com/DataDog/dd-trace-rb/issues/1473
+[#1475]: https://github.com/DataDog/dd-trace-rb/issues/1475
+[#1480]: https://github.com/DataDog/dd-trace-rb/issues/1480
+[#1487]: https://github.com/DataDog/dd-trace-rb/issues/1487
+[#1489]: https://github.com/DataDog/dd-trace-rb/issues/1489
+[#1495]: https://github.com/DataDog/dd-trace-rb/issues/1495
+[#1497]: https://github.com/DataDog/dd-trace-rb/issues/1497
 [@AdrianLC]: https://github.com/AdrianLC
 [@Azure7111]: https://github.com/Azure7111
 [@BabyGroot]: https://github.com/BabyGroot
@@ -2411,10 +2441,12 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [@jpaulgs]: https://github.com/jpaulgs
 [@jvalanen]: https://github.com/jvalanen
 [@kelvin-acosta]: https://github.com/kelvin-acosta
+[@kexoth]: https://github.com/kexoth
 [@kissrobber]: https://github.com/kissrobber
 [@kitop]: https://github.com/kitop
 [@letiesperon]: https://github.com/letiesperon
 [@link04]: https://github.com/link04
+[@lloeki]: https://github.com/lloeki
 [@mantrala]: https://github.com/mantrala
 [@matchbookmac]: https://github.com/matchbookmac
 [@mberlanda]: https://github.com/mberlanda

data/Rakefile

@@ -19,6 +19,8 @@ namespace :spec do
     t.pattern = 'spec/**/*_spec.rb'
     t.exclude_pattern = 'spec/**/{contrib,benchmark,redis,opentracer,opentelemetry,auto_instrument}/**/*_spec.rb,'\
                         ' spec/**/auto_instrument_spec.rb'
+    # Profiler is Ruby 2.1+ only
+    t.exclude_pattern += ',spec/**/profiling/**/*_spec.rb' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1.0')
     t.rspec_opts = args.to_a.join(' ')
   end
 
@@ -191,6 +193,14 @@ def declare(*args)
   total_executors = ENV.key?('CIRCLE_NODE_TOTAL') ? ENV['CIRCLE_NODE_TOTAL'].to_i : nil
   current_executor = ENV.key?('CIRCLE_NODE_INDEX') ? ENV['CIRCLE_NODE_INDEX'].to_i : nil
 
+  ruby_runtime = if defined?(RUBY_ENGINE_VERSION)
+                   "#{RUBY_ENGINE}-#{RUBY_ENGINE_VERSION}"
+                 else
+                   "#{RUBY_ENGINE}-#{RUBY_VERSION}" # For Ruby < 2.3
+                 end
+
+  args[0].sub!(/^bundle exec appraisal /, "bundle exec appraisal #{ruby_runtime}-")
+
   if total_executors && current_executor && total_executors > 1
     @execution_count ||= 0
     @execution_count += 1

data/benchmarks/profiler_sample_loop.rb

@@ -0,0 +1,69 @@
+require 'benchmark/ips'
+require 'ddtrace'
+require 'pry'
+
+# This benchmark measures the performance of the main stack sampling loop of the profiler
+
+class ProfilerSampleLoopBenchmark
+  def create_profiler
+    Datadog.configure do |c|
+      # c.diagnostics.debug = true
+      c.profiling.enabled = true
+      c.tracer.transport_options = proc { |t| t.adapter :test }
+    end
+
+    # Stop background threads
+    Datadog.profiler.shutdown!
+
+    # Call collection directly
+    @stack_collector = Datadog.profiler.collectors.first
+    @recorder = @stack_collector.recorder
+  end
+
+  def thread_with_very_deep_stack(depth: 500)
+    deep_stack = proc do |n|
+      if n > 0
+        deep_stack.call(n - 1)
+      else
+        sleep
+      end
+    end
+
+    Thread.new { deep_stack.call(depth) }.tap { |t| t.name = "Deep stack #{depth}" }
+  end
+
+  def run_benchmark
+    Benchmark.ips do |x|
+      x.config(time: 10, warmup: 2)
+
+      x.report("stack collector #{ENV['CONFIG']}") do
+        @stack_collector.collect_and_wait
+      end
+
+      x.save! 'profiler-sample-loop-results'
+      x.compare!
+    end
+
+    @recorder.flush
+  end
+
+  def run_forever
+    while true
+      1000.times { @stack_collector.collect_and_wait }
+      @recorder.flush
+      print '.'
+    end
+  end
+end
+
+puts "Current pid is #{Process.pid}"
+
+ProfilerSampleLoopBenchmark.new.instance_exec do
+  create_profiler
+  4.times { thread_with_very_deep_stack }
+  if ARGV.include?('--forever')
+    run_forever
+  else
+    run_benchmark
+  end
+end