ddtrace 0.44.0 → 0.45.0

data/lib/ddtrace/contrib/rake/integration.rb

@@ -18,7 +18,7 @@ module Datadog
         end
 
         def self.loaded?
-          !defined?(::Rake).nil?
+          !defined?(::Rake::Task).nil?
         end
 
         def self.compatible?

data/lib/ddtrace/contrib/rspec/integration.rb

@@ -28,6 +28,11 @@ module Datadog
           super && version >= MINIMUM_VERSION
         end
 
+        # test environments should not auto instrument test libraries
+        def auto_instrument?
+          false
+        end
+
         def default_configuration
           Configuration::Settings.new
         end

data/lib/ddtrace/ext/ci.rb

@@ -5,6 +5,8 @@ module Datadog
     # Defines constants for CI tags
     # rubocop:disable Metrics/ModuleLength:
     module CI
+      TAG_STAGE_NAME = 'ci.stage.name'.freeze
+      TAG_JOB_NAME = 'ci.job.name'.freeze
       TAG_JOB_URL = 'ci.job.url'.freeze
       TAG_PIPELINE_ID = 'ci.pipeline.id'.freeze
       TAG_PIPELINE_NAME = 'ci.pipeline.name'.freeze
@@ -23,7 +25,8 @@ module Datadog
         ['GITLAB_CI'.freeze, :extract_gitlab],
         ['JENKINS_URL'.freeze, :extract_jenkins],
         ['TEAMCITY_VERSION'.freeze, :extract_teamcity],
-        ['TRAVIS'.freeze, :extract_travis]
+        ['TRAVIS'.freeze, :extract_travis],
+        ['BITRISE_BUILD_SLUG'.freeze, :extract_bitrise]
       ].freeze
 
       module_function
@@ -37,7 +40,6 @@ module Datadog
         tags[Git::TAG_TAG] = normalize_ref(tags[Git::TAG_TAG])
         tags.delete(Git::TAG_BRANCH) unless tags[Git::TAG_TAG].nil?
         tags[Git::TAG_BRANCH] = normalize_ref(tags[Git::TAG_BRANCH])
-        tags[Git::TAG_DEPRECATED_COMMIT_SHA] = tags[Git::TAG_COMMIT_SHA]
         tags[Git::TAG_REPOSITORY_URL] = filter_sensitive_info(tags[Git::TAG_REPOSITORY_URL])
 
         # Expand ~
@@ -63,26 +65,34 @@ module Datadog
 
       def extract_appveyor(env)
         url = "https://ci.appveyor.com/project/#{env['APPVEYOR_REPO_NAME']}/builds/#{env['APPVEYOR_BUILD_ID']}"
+
+        if env['APPVEYOR_REPO_PROVIDER'] == 'github'
+          repository = "https://github.com/#{env['APPVEYOR_REPO_NAME']}.git"
+          commit = env['APPVEYOR_REPO_COMMIT']
+          branch = (env['APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH'] || env['APPVEYOR_REPO_BRANCH'])
+          tag = env['APPVEYOR_REPO_TAG_NAME']
+        end
+
         {
           TAG_PROVIDER_NAME => 'appveyor',
-          Git::TAG_REPOSITORY_URL =>  "https://github.com/#{env['APPVEYOR_REPO_NAME']}.git",
-          Git::TAG_COMMIT_SHA => env['APPVEYOR_REPO_COMMIT'],
+          Git::TAG_REPOSITORY_URL =>  repository,
+          Git::TAG_COMMIT_SHA => commit,
           TAG_WORKSPACE_PATH => env['APPVEYOR_BUILD_FOLDER'],
           TAG_PIPELINE_ID => env['APPVEYOR_BUILD_ID'],
           TAG_PIPELINE_NAME => env['APPVEYOR_REPO_NAME'],
           TAG_PIPELINE_NUMBER => env['APPVEYOR_BUILD_NUMBER'],
           TAG_PIPELINE_URL => url,
           TAG_JOB_URL => url,
-          Git::TAG_BRANCH => (env['APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH'] || env['APPVEYOR_REPO_BRANCH']),
-          Git::TAG_TAG => env['APPVEYOR_REPO_TAG_NAME']
+          Git::TAG_BRANCH => branch,
+          Git::TAG_TAG => tag
         }
       end
 
       def extract_azure_pipelines(env)
-        if env['SYSTEM_TEAMFOUNDATIONSERVERURI'] && env['SYSTEM_TEAMPROJECT'] && env['BUILD_BUILDID']
-          base_url = "#{env['SYSTEM_TEAMFOUNDATIONSERVERURI']}#{env['SYSTEM_TEAMPROJECT']}" \
+        if env['SYSTEM_TEAMFOUNDATIONSERVERURI'] && env['SYSTEM_TEAMPROJECTID'] && env['BUILD_BUILDID']
+          base_url = "#{env['SYSTEM_TEAMFOUNDATIONSERVERURI']}#{env['SYSTEM_TEAMPROJECTID']}" \
             "/_build/results?buildId=#{env['BUILD_BUILDID']}"
-          pipeline_url = base_url + '&_a=summary'
+          pipeline_url = base_url
           job_url = base_url + "&view=logs&j=#{env['SYSTEM_JOBID']}&t=#{env['SYSTEM_TASKINSTANCEID']}"
         else
           pipeline_url = job_url = nil
@@ -194,6 +204,8 @@ module Datadog
           Git::TAG_COMMIT_SHA => env['CI_COMMIT_SHA'],
           Git::TAG_REPOSITORY_URL => env['CI_REPOSITORY_URL'],
           Git::TAG_TAG => env['CI_COMMIT_TAG'],
+          TAG_STAGE_NAME => env['CI_JOB_STAGE'],
+          TAG_JOB_NAME => env['CI_JOB_NAME'],
           TAG_JOB_URL => env['CI_JOB_URL'],
           TAG_PIPELINE_ID => env['CI_PIPELINE_ID'],
           TAG_PIPELINE_NAME => env['CI_PROJECT_PATH'],
@@ -259,6 +271,27 @@ module Datadog
           TAG_WORKSPACE_PATH => env['TRAVIS_BUILD_DIR']
         }
       end
+
+      def extract_bitrise(env)
+        commit = (
+          env['BITRISE_GIT_COMMIT'] || env['GIT_CLONE_COMMIT_HASH']
+        )
+        branch = (
+          env['BITRISEIO_GIT_BRANCH_DEST'] || env['BITRISE_GIT_BRANCH']
+        )
+        {
+          TAG_PROVIDER_NAME => 'bitrise',
+          TAG_PIPELINE_ID => env['BITRISE_BUILD_SLUG'],
+          TAG_PIPELINE_NAME => env['BITRISE_APP_TITLE'],
+          TAG_PIPELINE_NUMBER => env['BITRISE_BUILD_NUMBER'],
+          TAG_PIPELINE_URL => env['BITRISE_BUILD_URL'],
+          TAG_WORKSPACE_PATH => env['BITRISE_SOURCE_DIR'],
+          Git::TAG_REPOSITORY_URL => env['GIT_REPOSITORY_URL'],
+          Git::TAG_COMMIT_SHA => commit,
+          Git::TAG_BRANCH => branch,
+          Git::TAG_TAG => env['BITRISE_GIT_TAG']
+        }
+      end
     end
   end
 end

data/lib/ddtrace/ext/git.rb

@@ -4,7 +4,6 @@ module Datadog
     module Git
       TAG_BRANCH = 'git.branch'.freeze
       TAG_COMMIT_SHA = 'git.commit.sha'.freeze
-      TAG_DEPRECATED_COMMIT_SHA = 'git.commit_sha'.freeze
       TAG_REPOSITORY_URL = 'git.repository_url'.freeze
       TAG_TAG = 'git.tag'.freeze
     end

data/lib/ddtrace/propagation/http_propagator.rb

@@ -26,7 +26,14 @@ module Datadog
       # Inject all configured propagation styles
       ::Datadog.configuration.distributed_tracing.propagation_inject_style.each do |style|
         propagator = PROPAGATION_STYLES[style]
-        propagator.inject!(context, env) unless propagator.nil?
+        begin
+          propagator.inject!(context, env) unless propagator.nil?
+        rescue => e
+          Datadog.logger.error(
+            'Error injecting propagated context into the environment. ' \
+            "Cause: #{e} Location: #{e.backtrace.first}"
+          )
+        end
       end
     end
 
@@ -42,7 +49,15 @@ module Datadog
 
         # Extract context
         # DEV: `propagator.extract` will return `nil`, where `HTTPPropagator#extract` will not
-        extracted_context = propagator.extract(env)
+        begin
+          extracted_context = propagator.extract(env)
+        rescue => e
+          Datadog.logger.error(
+            'Error extracting propagated context from the environment. ' \
+            "Cause: #{e} Location: #{e.backtrace.first}"
+          )
+        end
+
         # Skip this style if no valid headers were found
         next if extracted_context.nil?
 

data/lib/ddtrace/version.rb

@@ -1,7 +1,7 @@
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 44
+    MINOR = 45
     PATCH = 0
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.44.0
+  version: 0.45.0
 platform: ruby
 authors:
 - Datadog, Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -262,6 +262,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -456,6 +470,8 @@ files:
 - lib/ddtrace/augmentation/method_wrapper.rb
 - lib/ddtrace/augmentation/method_wrapping.rb
 - lib/ddtrace/augmentation/shim.rb
+- lib/ddtrace/auto_instrument.rb
+- lib/ddtrace/auto_instrument_base.rb
 - lib/ddtrace/buffer.rb
 - lib/ddtrace/chunker.rb
 - lib/ddtrace/configuration.rb
@@ -529,6 +545,7 @@ files:
 - lib/ddtrace/contrib/active_support/notifications/subscription.rb
 - lib/ddtrace/contrib/active_support/patcher.rb
 - lib/ddtrace/contrib/analytics.rb
+- lib/ddtrace/contrib/auto_instrument.rb
 - lib/ddtrace/contrib/aws/configuration/settings.rb
 - lib/ddtrace/contrib/aws/ext.rb
 - lib/ddtrace/contrib/aws/instrumentation.rb
@@ -612,6 +629,11 @@ files:
 - lib/ddtrace/contrib/http/integration.rb
 - lib/ddtrace/contrib/http/patcher.rb
 - lib/ddtrace/contrib/http_annotation_helper.rb
+- lib/ddtrace/contrib/httpclient/configuration/settings.rb
+- lib/ddtrace/contrib/httpclient/ext.rb
+- lib/ddtrace/contrib/httpclient/instrumentation.rb
+- lib/ddtrace/contrib/httpclient/integration.rb
+- lib/ddtrace/contrib/httpclient/patcher.rb
 - lib/ddtrace/contrib/httprb/configuration/settings.rb
 - lib/ddtrace/contrib/httprb/ext.rb
 - lib/ddtrace/contrib/httprb/instrumentation.rb
@@ -680,6 +702,7 @@ files:
 - lib/ddtrace/contrib/rack/middlewares.rb
 - lib/ddtrace/contrib/rack/patcher.rb
 - lib/ddtrace/contrib/rack/request_queue.rb
+- lib/ddtrace/contrib/rails/auto_instrument_railtie.rb
 - lib/ddtrace/contrib/rails/configuration/settings.rb
 - lib/ddtrace/contrib/rails/ext.rb
 - lib/ddtrace/contrib/rails/framework.rb
@@ -888,7 +911,7 @@ licenses:
 - BSD-3-Clause
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -903,8 +926,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.2.3
-signing_key:
+rubygems_version: 3.1.2
+signing_key: 
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications
 test_files: []