ddtrace 0.50.0 → 0.51.0

data/gemfiles/{ruby_3.0.0_resque2_redis4.gemfile → ruby_3.0.1_resque2_redis4.gemfile}

@@ -13,11 +13,12 @@ gem "memory_profiler", "~> 0.9"
 gem "minitest", "= 5.10.1"
 gem "minitest-around", "0.5.0"
 gem "minitest-stub_any_instance", "1.0.2"
+gem "os", "~> 1.1"
 gem "pimpmychangelog", ">= 0.1.2"
 gem "pry"
 gem "pry-byebug"
 gem "pry-stack_explorer"
-gem "rake", ">= 10.5"
+gem "rake", ">= 10.5", "< 13.0.4"
 gem "redcarpet", "~> 3.4"
 gem "rspec", "~> 3.10"
 gem "rspec-collection_matchers", "~> 1.1"
@@ -32,7 +33,7 @@ gem "yard", "~> 0.9"
 gem "rubocop", "~> 1.10", require: false
 gem "rubocop-performance", "~> 1.9", require: false
 gem "rubocop-rspec", "~> 2.2", require: false
-gem "dogstatsd-ruby", ">= 3.3.0"
+gem "dogstatsd-ruby", ">= 3.3.0", "!= 5.0.0", "!= 5.0.1", "!= 5.1.0"
 gem "opentracing", ">= 0.4.1"
 gem "google-protobuf", ["~> 3.0", "!= 3.7.0", "!= 3.7.1"]
 gem "redis", ">= 4.0"

data/gemfiles/{ruby_3.0.0_resque2_redis4.gemfile.lock → ruby_3.0.1_resque2_redis4.gemfile.lock}

@@ -24,7 +24,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.2)
-    benchmark-ips (2.8.4)
+    benchmark-ips (2.9.1)
     benchmark-memory (0.1.2)
       memory_profiler (~> 0.9)
     binding_of_caller (1.0.0)
@@ -34,16 +34,16 @@ GEM
     climate_control (0.2.0)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
     cri (2.15.11)
     debug_inspector (1.1.0)
     diff-lcs (1.4.4)
-    docile (1.3.5)
-    dogstatsd-ruby (5.0.1)
-    ffi (1.15.0)
-    google-protobuf (3.15.8-x86_64-linux)
+    docile (1.4.0)
+    dogstatsd-ruby (4.8.3)
+    ffi (1.15.3)
+    google-protobuf (3.17.3-x86_64-linux)
     hashdiff (1.0.1)
     memory_profiler (0.9.14)
     method_source (1.0.0)
@@ -57,8 +57,9 @@ GEM
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     opentracing (0.5.0)
+    os (1.1.1)
     parallel (1.20.1)
-    parser (3.0.1.0)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
     pimpmychangelog (0.1.3)
     pry (0.14.1)
@@ -76,7 +77,7 @@ GEM
     rainbow (3.0.0)
     rake (13.0.3)
     redcarpet (3.5.1)
-    redis (4.2.5)
+    redis (4.3.1)
     redis-namespace (1.8.1)
       redis (>= 3.0.4)
     regexp_parser (2.1.1)
@@ -104,31 +105,31 @@ GEM
     rspec-support (3.10.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rspec_n (1.3.0)
+    rspec_n (1.4.0)
       colorize (~> 0.8.0)
       cri (~> 2.15.3)
-    rubocop (1.12.1)
+    rubocop (1.18.3)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.10.2)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.3)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.2.0)
+    rubocop-rspec (2.4.0)
       rubocop (~> 1.0)
       rubocop-ast (>= 1.1.0)
     ruby-prof (1.4.3)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.4)
     simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
+    simplecov_json_formatter (0.1.3)
     sinatra (2.1.0)
       mustermann (~> 1.0)
       rack (~> 2.2)
@@ -140,7 +141,7 @@ GEM
     vegas (0.1.11)
       rack (>= 1.0.0)
     warning (1.2.0)
-    webmock (3.12.2)
+    webmock (3.13.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -159,18 +160,19 @@ DEPENDENCIES
   climate_control (~> 0.2.0)
   concurrent-ruby
   ddtrace!
-  dogstatsd-ruby (>= 3.3.0)
+  dogstatsd-ruby (>= 3.3.0, != 5.1.0, != 5.0.1, != 5.0.0)
   google-protobuf (~> 3.0, != 3.7.1, != 3.7.0)
   memory_profiler (~> 0.9)
   minitest (= 5.10.1)
   minitest-around (= 0.5.0)
   minitest-stub_any_instance (= 1.0.2)
   opentracing (>= 0.4.1)
+  os (~> 1.1)
   pimpmychangelog (>= 0.1.2)
   pry
   pry-byebug
   pry-stack_explorer
-  rake (>= 10.5)
+  rake (>= 10.5, < 13.0.4)
   redcarpet (~> 3.4)
   redis (>= 4.0)
   resque (>= 2.0)
@@ -189,4 +191,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.2.4
+   2.2.19

data/integration/apps/rspec/bin/setup

@@ -14,4 +14,10 @@ chdir APP_ROOT do
   puts "\n== Installing dependencies =="
   system! 'gem install bundler --conservative'
   system('bundle check') || system!('bundle install')
+
+  # Create an non-trivial git repository, to augment test payload information.
+  system! 'git init'
+  system! 'GIT_AUTHOR_NAME="Test Author" GIT_AUTHOR_EMAIL=author@local.test ' \
+          'GIT_COMMITTER_NAME="Test Committer" GIT_COMMITTER_EMAIL=committer@local.test ' \
+          'git commit --allow-empty -m "Test message"'
 end

data/integration/apps/rspec/docker-compose.yml

@@ -27,6 +27,7 @@ services:
     tty: true
     volumes:
       - .:/app
+      - /app/.git
       - ./data/app:/data/app
       - bundle:/usr/local/bundle
       - ../../images/include:/vendor/dd-demo

data/integration/images/include/datadog/demo_env.rb

@@ -1,15 +1,16 @@
 module Datadog
+  # Helpers to read the application environment
   module DemoEnv
     module_function
 
     def gem_spec(gem_name, defaults = {})
-      args =  if local_gem(gem_name)
-                [local_gem(gem_name)]
-              elsif git_gem(gem_name)
-                [git_gem(gem_name)]
-              else
-                []
-              end
+      args = if local_gem(gem_name)
+               [local_gem(gem_name)]
+             elsif git_gem(gem_name)
+               [git_gem(gem_name)]
+             else
+               []
+             end
 
       yield(args) if block_given?
 
@@ -17,7 +18,7 @@ module Datadog
     end
 
     def gem_env_name(gem_name)
-      gem_name.upcase.gsub('-', '_')
+      gem_name.upcase.tr('-', '_')
     end
 
     def local_gem(gem_name)
@@ -55,11 +56,11 @@ module Datadog
       puts "Features: #{features}"
       puts "Rails env: #{ENV['RAILS_ENV']}" if ENV['RAILS_ENV']
       puts "PID: #{Process.pid}"
-      if ddtrace = Gem.loaded_specs['ddtrace']
-        puts "Runtime ID: #{Datadog::Runtime::Identity.id}" if defined?(Datadog::Runtime::Identity)
+      if (ddtrace = Gem.loaded_specs['ddtrace'])
+        puts "Runtime ID: #{Datadog::Core::Environment::Identity.id}" if defined?(Datadog::Core::Environment::Identity)
         puts "ddtrace version: #{ddtrace.version}"
         puts "ddtrace path: #{ddtrace.full_gem_path}"
-        if git_spec = git_gem('ddtrace')
+        if (git_spec = git_gem('ddtrace'))
           puts "ddtrace git: #{git_spec[:git]}"
           puts "ddtrace ref: #{git_spec[:ref]}"
         end
@@ -69,10 +70,10 @@ module Datadog
 
     def profiler_file_transport(dump_path = "/data/profile-pid-#{Process.pid}.pprof")
       Datadog::Profiling::Transport::IO.default(
-        write: ->(out, data) do
+        write: lambda do |_out, data|
           result = nil
           puts "Writing pprof #{dump_path}..."
-          File.open(dump_path, "w") { |f| result = f.write(data) }
+          File.open(dump_path, 'w') { |f| result = f.write(data) }
           puts "Pprof #{dump_path} written!"
           result
         end
@@ -86,7 +87,7 @@ module Datadog
 
     def finish_mem_dump!(dump_path = "/data/mem-pid-#{Process.pid}.dump")
       File.delete(dump_path) if File.exist?(dump_path)
-      File.open(dump_path, "w") do |io|
+      File.open(dump_path, 'w') do |io|
         ObjectSpace.dump_all(output: io)
       end
     end

data/lib/datadog/ci/contrib/cucumber/configuration/settings.rb

@@ -14,7 +14,7 @@ module Datadog
             end
 
             option :service_name do |o|
-              o.default { Datadog.configuration.service || Ext::SERVICE_NAME }
+              o.default { Datadog.configuration.service_without_fallback || Ext::SERVICE_NAME }
               o.lazy
             end
 

data/lib/datadog/ci/contrib/rspec/configuration/settings.rb

@@ -14,7 +14,7 @@ module Datadog
             end
 
             option :service_name do |o|
-              o.default { Datadog.configuration.service || Ext::SERVICE_NAME }
+              o.default { Datadog.configuration.service_without_fallback || Ext::SERVICE_NAME }
               o.lazy
             end
 

data/lib/datadog/ci/ext/environment.rb

@@ -1,53 +1,65 @@
+# frozen_string_literal: true
+
 require 'ddtrace/ext/git'
 
+require 'open3'
+
 module Datadog
   module CI
     module Ext
       # Defines constants for CI tags
       # rubocop:disable Metrics/ModuleLength:
       module Environment
-        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
-        TAG_PIPELINE_NUMBER = 'ci.pipeline.number'.freeze
-        TAG_PIPELINE_URL = 'ci.pipeline.url'.freeze
-        TAG_PROVIDER_NAME = 'ci.provider.name'.freeze
-        TAG_WORKSPACE_PATH = 'ci.workspace_path'.freeze
+        TAG_JOB_NAME = 'ci.job.name'
+        TAG_JOB_URL = 'ci.job.url'
+        TAG_PIPELINE_ID = 'ci.pipeline.id'
+        TAG_PIPELINE_NAME = 'ci.pipeline.name'
+        TAG_PIPELINE_NUMBER = 'ci.pipeline.number'
+        TAG_PIPELINE_URL = 'ci.pipeline.url'
+        TAG_PROVIDER_NAME = 'ci.provider.name'
+        TAG_STAGE_NAME = 'ci.stage.name'
+        TAG_WORKSPACE_PATH = 'ci.workspace_path'
 
         PROVIDERS = [
-          ['APPVEYOR'.freeze, :extract_appveyor],
-          ['TF_BUILD'.freeze, :extract_azure_pipelines],
-          ['BITBUCKET_COMMIT'.freeze, :extract_bitbucket],
-          ['BUILDKITE'.freeze, :extract_buildkite],
-          ['CIRCLECI'.freeze, :extract_circle_ci],
-          ['GITHUB_SHA'.freeze, :extract_github_actions],
-          ['GITLAB_CI'.freeze, :extract_gitlab],
-          ['JENKINS_URL'.freeze, :extract_jenkins],
-          ['TEAMCITY_VERSION'.freeze, :extract_teamcity],
-          ['TRAVIS'.freeze, :extract_travis],
-          ['BITRISE_BUILD_SLUG'.freeze, :extract_bitrise]
+          ['APPVEYOR', :extract_appveyor],
+          ['TF_BUILD', :extract_azure_pipelines],
+          ['BITBUCKET_COMMIT', :extract_bitbucket],
+          ['BUILDKITE', :extract_buildkite],
+          ['CIRCLECI', :extract_circle_ci],
+          ['GITHUB_SHA', :extract_github_actions],
+          ['GITLAB_CI', :extract_gitlab],
+          ['JENKINS_URL', :extract_jenkins],
+          ['TEAMCITY_VERSION', :extract_teamcity],
+          ['TRAVIS', :extract_travis],
+          ['BITRISE_BUILD_SLUG', :extract_bitrise]
         ].freeze
 
         module_function
 
         def tags(env)
-          provider = PROVIDERS.find { |c| env.key? c[0] }
-          return {} if provider.nil?
+          _, extractor = PROVIDERS.find { |provider_env_var, _| env.key?(provider_env_var) }
+          if extractor
+            tags = public_send(extractor, env)
 
-          tags = send(provider[1], env)
+            tags[Datadog::Ext::Git::TAG_TAG] = normalize_ref(tags[Datadog::Ext::Git::TAG_TAG])
+            tags.delete(Datadog::Ext::Git::TAG_BRANCH) unless tags[Datadog::Ext::Git::TAG_TAG].nil?
+            tags[Datadog::Ext::Git::TAG_BRANCH] = normalize_ref(tags[Datadog::Ext::Git::TAG_BRANCH])
+            tags[Datadog::Ext::Git::TAG_REPOSITORY_URL] = filter_sensitive_info(tags[Datadog::Ext::Git::TAG_REPOSITORY_URL])
 
-          tags[Datadog::Ext::Git::TAG_TAG] = normalize_ref(tags[Datadog::Ext::Git::TAG_TAG])
-          tags.delete(Datadog::Ext::Git::TAG_BRANCH) unless tags[Datadog::Ext::Git::TAG_TAG].nil?
-          tags[Datadog::Ext::Git::TAG_BRANCH] = normalize_ref(tags[Datadog::Ext::Git::TAG_BRANCH])
-          tags[Datadog::Ext::Git::TAG_REPOSITORY_URL] = filter_sensitive_info(tags[Datadog::Ext::Git::TAG_REPOSITORY_URL])
+            # Expand ~
+            workspace_path = tags[TAG_WORKSPACE_PATH]
+            if !workspace_path.nil? && (workspace_path == '~' || workspace_path.start_with?('~/'))
+              tags[TAG_WORKSPACE_PATH] = File.expand_path(workspace_path)
+            end
+          else
+            tags = {}
+          end
 
-          # Expand ~
-          workspace_path = tags[TAG_WORKSPACE_PATH]
-          if !workspace_path.nil? && (workspace_path == '~' || workspace_path.start_with?('~/'))
-            tags[TAG_WORKSPACE_PATH] = File.expand_path(workspace_path)
+          # Fill out tags from local git as fallback
+          extract_local_git.each do |key, value|
+            tags[key] ||= value
           end
+
           tags.reject { |_, v| v.nil? }
         end
 
@@ -85,44 +97,45 @@ module Datadog
             TAG_PIPELINE_URL => url,
             TAG_JOB_URL => url,
             Datadog::Ext::Git::TAG_BRANCH => branch,
-            Datadog::Ext::Git::TAG_TAG => tag
+            Datadog::Ext::Git::TAG_TAG => tag,
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['APPVEYOR_REPO_COMMIT_AUTHOR'],
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL'],
+            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['APPVEYOR_REPO_COMMIT_MESSAGE_EXTENDED']
           }
         end
 
         def extract_azure_pipelines(env)
-          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
-            job_url = base_url + "&view=logs&j=#{env['SYSTEM_JOBID']}&t=#{env['SYSTEM_TASKINSTANCEID']}"
-          else
-            pipeline_url = job_url = nil
-          end
-          branch_or_tag = (
-            env['SYSTEM_PULLREQUEST_SOURCEBRANCH'] || env['BUILD_SOURCEBRANCH'] || env['BUILD_SOURCEBRANCHNAME']
-          )
-          if branch_or_tag.include? 'tags/'
-            branch = nil
-            tag = branch_or_tag
-          else
-            branch = branch_or_tag
-            tag = nil
+          build_id = env['BUILD_BUILDID']
+
+          if build_id &&
+             (team_foundation_server_uri = env['SYSTEM_TEAMFOUNDATIONSERVERURI']) &&
+             (team_project_id = env['SYSTEM_TEAMPROJECTID'])
+
+            pipeline_url = "#{team_foundation_server_uri}#{team_project_id}/_build/results?buildId=#{build_id}"
+
+            job_url = "#{pipeline_url}&view=logs&j=#{env['SYSTEM_JOBID']}&t=#{env['SYSTEM_TASKINSTANCEID']}"
           end
+
+          branch, tag = branch_or_tag(env['SYSTEM_PULLREQUEST_SOURCEBRANCH'] ||
+                                        env['BUILD_SOURCEBRANCH'] ||
+                                        env['BUILD_SOURCEBRANCHNAME'])
+
           {
             TAG_PROVIDER_NAME => 'azurepipelines',
             TAG_WORKSPACE_PATH => env['BUILD_SOURCESDIRECTORY'],
-            TAG_PIPELINE_ID => env['BUILD_BUILDID'],
+            TAG_PIPELINE_ID => build_id,
             TAG_PIPELINE_NAME => env['BUILD_DEFINITIONNAME'],
-            TAG_PIPELINE_NUMBER => env['BUILD_BUILDID'],
+            TAG_PIPELINE_NUMBER => build_id,
             TAG_PIPELINE_URL => pipeline_url,
             TAG_JOB_URL => job_url,
-            Datadog::Ext::Git::TAG_REPOSITORY_URL => (
-              env['SYSTEM_PULLREQUEST_SOURCEREPOSITORYURI'] \
-              || env['BUILD_REPOSITORY_URI']
-            ),
-            Datadog::Ext::Git::TAG_COMMIT_SHA => (env['SYSTEM_PULLREQUEST_SOURCECOMMITID'] || env['BUILD_SOURCEVERSION']),
+            Datadog::Ext::Git::TAG_REPOSITORY_URL =>
+              env['SYSTEM_PULLREQUEST_SOURCEREPOSITORYURI'] || env['BUILD_REPOSITORY_URI'],
+            Datadog::Ext::Git::TAG_COMMIT_SHA => env['SYSTEM_PULLREQUEST_SOURCECOMMITID'] || env['BUILD_SOURCEVERSION'],
             Datadog::Ext::Git::TAG_BRANCH => branch,
-            Datadog::Ext::Git::TAG_TAG => tag
+            Datadog::Ext::Git::TAG_TAG => tag,
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
+            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
           }
         end
 
@@ -135,12 +148,15 @@ module Datadog
             Datadog::Ext::Git::TAG_REPOSITORY_URL => env['BITBUCKET_GIT_SSH_ORIGIN'],
             Datadog::Ext::Git::TAG_TAG => env['BITBUCKET_TAG'],
             TAG_JOB_URL => url,
-            TAG_PIPELINE_ID => env['BITBUCKET_PIPELINE_UUID'] ? env['BITBUCKET_PIPELINE_UUID'].tr('{}', '') : None,
+            TAG_PIPELINE_ID => env['BITBUCKET_PIPELINE_UUID'] ? env['BITBUCKET_PIPELINE_UUID'].tr('{}', '') : nil,
             TAG_PIPELINE_NAME => env['BITBUCKET_REPO_FULL_NAME'],
             TAG_PIPELINE_NUMBER => env['BITBUCKET_BUILD_NUMBER'],
             TAG_PIPELINE_URL => url,
             TAG_PROVIDER_NAME => 'bitbucket',
-            TAG_WORKSPACE_PATH => env['BITBUCKET_CLONE_DIR']
+            TAG_WORKSPACE_PATH => env['BITBUCKET_CLONE_DIR'],
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
+            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
           }
         end
 
@@ -156,7 +172,10 @@ module Datadog
             TAG_PIPELINE_URL => env['BUILDKITE_BUILD_URL'],
             TAG_JOB_URL => "#{env['BUILDKITE_BUILD_URL']}##{env['BUILDKITE_JOB_ID']}",
             TAG_PROVIDER_NAME => 'buildkite',
-            TAG_WORKSPACE_PATH => env['BUILDKITE_BUILD_CHECKOUT_PATH']
+            TAG_WORKSPACE_PATH => env['BUILDKITE_BUILD_CHECKOUT_PATH'],
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILDKITE_BUILD_AUTHOR'],
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILDKITE_BUILD_AUTHOR_EMAIL'],
+            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILDKITE_MESSAGE']
           }
         end
 
@@ -168,23 +187,20 @@ module Datadog
             Datadog::Ext::Git::TAG_TAG => env['CIRCLE_TAG'],
             TAG_PIPELINE_ID => env['CIRCLE_WORKFLOW_ID'],
             TAG_PIPELINE_NAME => env['CIRCLE_PROJECT_REPONAME'],
-            TAG_PIPELINE_NUMBER => env['CIRCLE_BUILD_NUM'],
-            TAG_PIPELINE_URL => env['CIRCLE_BUILD_URL'],
+            TAG_PIPELINE_URL => "https://app.circleci.com/pipelines/workflows/#{env['CIRCLE_WORKFLOW_ID']}",
+            TAG_JOB_NAME => env['CIRCLE_JOB'],
             TAG_JOB_URL => env['CIRCLE_BUILD_URL'],
             TAG_PROVIDER_NAME => 'circleci',
-            TAG_WORKSPACE_PATH => env['CIRCLE_WORKING_DIRECTORY']
+            TAG_WORKSPACE_PATH => env['CIRCLE_WORKING_DIRECTORY'],
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
+            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
           }
         end
 
         def extract_github_actions(env)
-          branch_or_tag = (env['GITHUB_HEAD_REF'] || env['GITHUB_REF'])
-          if branch_or_tag.include? 'tags/'
-            branch = nil
-            tag = branch_or_tag
-          else
-            branch = branch_or_tag
-            tag = nil
-          end
+          branch, tag = branch_or_tag(env['GITHUB_HEAD_REF'] || env['GITHUB_REF'])
+
           {
             Datadog::Ext::Git::TAG_BRANCH => branch,
             Datadog::Ext::Git::TAG_COMMIT_SHA => env['GITHUB_SHA'],
@@ -196,13 +212,15 @@ module Datadog
             TAG_PIPELINE_NUMBER => env['GITHUB_RUN_NUMBER'],
             TAG_PIPELINE_URL => "https://github.com/#{env['GITHUB_REPOSITORY']}/commit/#{env['GITHUB_SHA']}/checks",
             TAG_PROVIDER_NAME => 'github',
-            TAG_WORKSPACE_PATH => env['GITHUB_WORKSPACE']
+            TAG_WORKSPACE_PATH => env['GITHUB_WORKSPACE'],
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
+            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
           }
         end
 
         def extract_gitlab(env)
           url = env['CI_PIPELINE_URL']
-          url = url.gsub(%r{/-/pipelines/}, '/pipelines/') unless url.nil?
           {
             Datadog::Ext::Git::TAG_BRANCH => env['CI_COMMIT_BRANCH'],
             Datadog::Ext::Git::TAG_COMMIT_SHA => env['CI_COMMIT_SHA'],
@@ -214,24 +232,20 @@ module Datadog
             TAG_PIPELINE_ID => env['CI_PIPELINE_ID'],
             TAG_PIPELINE_NAME => env['CI_PROJECT_PATH'],
             TAG_PIPELINE_NUMBER => env['CI_PIPELINE_IID'],
-            TAG_PIPELINE_URL => url,
+            TAG_PIPELINE_URL => (url.gsub(%r{/-/pipelines/}, '/pipelines/') if url),
             TAG_PROVIDER_NAME => 'gitlab',
-            TAG_WORKSPACE_PATH => env['CI_PROJECT_DIR']
+            TAG_WORKSPACE_PATH => env['CI_PROJECT_DIR'],
+            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['CI_COMMIT_MESSAGE']
           }
         end
 
         def extract_jenkins(env)
-          branch_or_tag = env['GIT_BRANCH']
-          if branch_or_tag.include? 'tags/'
-            branch = nil
-            tag = branch_or_tag
-          else
-            branch = branch_or_tag
-            tag = nil
+          branch, tag = branch_or_tag(env['GIT_BRANCH'])
+
+          if (name = env['JOB_NAME'])
+            name = name.gsub("/#{normalize_ref(branch)}", '') if branch
+            name = name.split('/').reject { |v| v.nil? || v.include?('=') }.join('/')
           end
-          name = env['JOB_NAME']
-          name = name.gsub("/#{normalize_ref(branch)}", '') unless name.nil? || branch.nil?
-          name = name.split('/').reject { |v| v.nil? || v.include?('=') }.join('/') unless name.nil?
           {
             Datadog::Ext::Git::TAG_BRANCH => branch,
             Datadog::Ext::Git::TAG_COMMIT_SHA => env['GIT_COMMIT'],
@@ -242,7 +256,10 @@ module Datadog
             TAG_PIPELINE_NUMBER => env['BUILD_NUMBER'],
             TAG_PIPELINE_URL => env['BUILD_URL'],
             TAG_PROVIDER_NAME => 'jenkins',
-            TAG_WORKSPACE_PATH => env['WORKSPACE']
+            TAG_WORKSPACE_PATH => env['WORKSPACE'],
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
+            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
           }
         end
 
@@ -256,7 +273,10 @@ module Datadog
             TAG_PIPELINE_NUMBER => env['BUILD_NUMBER'],
             TAG_PIPELINE_URL => (
               env['SERVER_URL'] && env['BUILD_ID'] ? "#{env['SERVER_URL']}/viewLog.html?buildId=#{env['SERVER_URL']}" : nil
-            )
+            ),
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => env['BUILD_REQUESTEDFORID'],
+            Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => env['BUILD_REQUESTEDFOREMAIL'],
+            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BUILD_SOURCEVERSIONMESSAGE']
           }
         end
 
@@ -272,7 +292,8 @@ module Datadog
             TAG_PIPELINE_NUMBER => env['TRAVIS_BUILD_NUMBER'],
             TAG_PIPELINE_URL => env['TRAVIS_BUILD_WEB_URL'],
             TAG_PROVIDER_NAME => 'travisci',
-            TAG_WORKSPACE_PATH => env['TRAVIS_BUILD_DIR']
+            TAG_WORKSPACE_PATH => env['TRAVIS_BUILD_DIR'],
+            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['TRAVIS_COMMIT_MESSAGE']
           }
         end
 
@@ -293,9 +314,123 @@ module Datadog
             Datadog::Ext::Git::TAG_REPOSITORY_URL => env['GIT_REPOSITORY_URL'],
             Datadog::Ext::Git::TAG_COMMIT_SHA => commit,
             Datadog::Ext::Git::TAG_BRANCH => branch,
-            Datadog::Ext::Git::TAG_TAG => env['BITRISE_GIT_TAG']
+            Datadog::Ext::Git::TAG_TAG => env['BITRISE_GIT_TAG'],
+            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => env['BITRISE_GIT_MESSAGE']
           }
         end
+
+        def git_commit_users
+          # Get committer and author information in one command.
+          output = exec_git_command("git show -s --format='%an\t%ae\t%at\t%cn\t%ce\t%ct'")
+          return unless output
+
+          fields = output.split("\t").each(&:strip!)
+
+          {
+            author_name: fields[0],
+            author_email: fields[1],
+            # Because we can't get a reliable UTC time from all recent versions of git
+            # We have to rely on converting the date to UTC ourselves.
+            author_date: Time.at(fields[2].to_i).utc.to_datetime.iso8601,
+            committer_name: fields[3],
+            committer_email: fields[4],
+            # Because we can't get a reliable UTC time from all recent versions of git
+            # We have to rely on converting the date to UTC ourselves.
+            committer_date: Time.at(fields[5].to_i).utc.to_datetime.iso8601
+          }
+        rescue => e
+          Datadog.logger.debug("Unable to read git commit users: #{e.message} at #{e.backtrace.first}")
+          nil
+        end
+
+        def git_repository_url
+          exec_git_command('git ls-remote --get-url')
+        rescue => e
+          Datadog.logger.debug("Unable to read git repository url: #{e.message} at #{e.backtrace.first}")
+          nil
+        end
+
+        def git_commit_message
+          exec_git_command('git show -s --format=%s')
+        rescue => e
+          Datadog.logger.debug("Unable to read git commit message: #{e.message} at #{e.backtrace.first}")
+          nil
+        end
+
+        def git_branch
+          exec_git_command('git rev-parse --abbrev-ref HEAD')
+        rescue => e
+          Datadog.logger.debug("Unable to read git branch: #{e.message} at #{e.backtrace.first}")
+          nil
+        end
+
+        def git_commit_sha
+          exec_git_command('git rev-parse HEAD')
+        rescue => e
+          Datadog.logger.debug("Unable to read git commit SHA: #{e.message} at #{e.backtrace.first}")
+          nil
+        end
+
+        def git_tag
+          exec_git_command('git tag --points-at HEAD')
+        rescue => e
+          Datadog.logger.debug("Unable to read git tag: #{e.message} at #{e.backtrace.first}")
+          nil
+        end
+
+        def git_base_directory
+          exec_git_command('git rev-parse --show-toplevel')
+        rescue => e
+          Datadog.logger.debug("Unable to read git base directory: #{e.message} at #{e.backtrace.first}")
+          nil
+        end
+
+        def exec_git_command(cmd)
+          out, status = Open3.capture2e(cmd)
+
+          raise "Failed to run git command #{cmd}: #{out}" unless status.success?
+
+          out.strip! # There's always a "\n" at the end of the command output
+
+          return nil if out.empty?
+
+          out
+        end
+
+        def extract_local_git
+          env = {
+            TAG_WORKSPACE_PATH => git_base_directory,
+            Datadog::Ext::Git::TAG_REPOSITORY_URL => git_repository_url,
+            Datadog::Ext::Git::TAG_COMMIT_SHA => git_commit_sha,
+            Datadog::Ext::Git::TAG_BRANCH => git_branch,
+            Datadog::Ext::Git::TAG_TAG => git_tag,
+            Datadog::Ext::Git::TAG_COMMIT_MESSAGE => git_commit_message
+          }
+
+          if (commit_users = git_commit_users)
+            env.merge!(
+              Datadog::Ext::Git::TAG_COMMIT_AUTHOR_NAME => commit_users[:author_name],
+              Datadog::Ext::Git::TAG_COMMIT_AUTHOR_EMAIL => commit_users[:author_email],
+              Datadog::Ext::Git::TAG_COMMIT_AUTHOR_DATE => commit_users[:author_date],
+              Datadog::Ext::Git::TAG_COMMIT_COMMITTER_NAME => commit_users[:committer_name],
+              Datadog::Ext::Git::TAG_COMMIT_COMMITTER_EMAIL => commit_users[:committer_email],
+              Datadog::Ext::Git::TAG_COMMIT_COMMITTER_DATE => commit_users[:committer_date]
+            )
+          end
+
+          env
+        end
+
+        def branch_or_tag(branch_or_tag)
+          branch = tag = nil
+          if branch_or_tag.include?('tags/')
+            tag = branch_or_tag
+          else
+            branch = branch_or_tag
+          end
+
+          [branch, tag]
+        end
       end
       # rubocop:enable Metrics/ModuleLength:
     end