datadog-ci 1.0.0.beta1 → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8fceb9a2aa80df65f2cac9d910c13253e7c6b1259217af0756f33ecdda8ddd2
-  data.tar.gz: fc946c548d828c80b47612eab9c970968aedf034bfb9f09fb25d7f28acc8da82
+  metadata.gz: 6b3e03ab226d98aac3dd518b1c554452a4c3812cb67e9a1d64762e2fe8767633
+  data.tar.gz: eac352d2b2488d16f979004f617097efe109364069f1c7b78cecfceef5365efa
 SHA512:
-  metadata.gz: 253e6acd8ff643842d7c976a02eebbaf3ae844ac7b58a514adaf24538ba8bf4778786565760fed03d730f816ed56a3ad56c96c81a67f1c449ce67c0898086c33
-  data.tar.gz: 86bb8eb4b352d099b90c6b59ca4e5fb3b2fdd3a93562c0e9ba7e04123b4b59bc3c690cf1b85ddefb0634010476c80fce5f323ad73c54e1b9e9739444d14a64b4
+  metadata.gz: c56ab91025f2a224e86bd732a5c891e961af184b29618241f8853756780ccba894c11955b00020a70139d72e47f57d22dfdf1f2ed6437f1d4e4a9d998453d7a4
+  data.tar.gz: e7c1aa73096d8d8b49800bbed168f288b7676d8fa328011c3e9c4f7024c86c17cf2c210a94a64dcd80f94121a80b36a824f0ca4e3aa6ccb1c35f682a1fb9e18b

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
 
+## [1.0.0.beta2] - 2024-04-23
+
+### Added
+
+* Code coverage events writer ([#150])
+* Git tree upload - git command line integration ([#151])
+* Add Git::SearchCommits api client ([#152])
+* Upload packfiles API client ([#153])
+* Git tree uploader ([#154])
+* Git repository unshallowing logic ([#155])
+* Git upload async worker ([#156])
+* Reduce ITR-induced code coverage overhead for default branch ([#157])
+* Skippable tests api client ([#158])
+* Request skippable tests when configuring ITR ([#159])
+* Test skipping implementation ([#160])
+
 ## [1.0.0.beta1] - 2024-03-25
 
 ### Added
@@ -199,6 +215,7 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 * Ruby versions < 2.7 no longer supported ([#8][])
 
 [Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.3...main
+[1.0.0.beta2]: https://github.com/DataDog/datadog-ci-rb/compare/v1.0.0.beta1...v1.0.0.beta2
 [1.0.0.beta1]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.3...v1.0.0.beta1
 [0.8.3]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.2...v0.8.3
 [0.8.2]: https://github.com/DataDog/datadog-ci-rb/compare/v0.8.1...v0.8.2
@@ -276,3 +293,14 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 [#142]: https://github.com/DataDog/datadog-ci-rb/issues/142
 [#145]: https://github.com/DataDog/datadog-ci-rb/issues/145
 [#148]: https://github.com/DataDog/datadog-ci-rb/issues/148
+[#150]: https://github.com/DataDog/datadog-ci-rb/issues/150
+[#151]: https://github.com/DataDog/datadog-ci-rb/issues/151
+[#152]: https://github.com/DataDog/datadog-ci-rb/issues/152
+[#153]: https://github.com/DataDog/datadog-ci-rb/issues/153
+[#154]: https://github.com/DataDog/datadog-ci-rb/issues/154
+[#155]: https://github.com/DataDog/datadog-ci-rb/issues/155
+[#156]: https://github.com/DataDog/datadog-ci-rb/issues/156
+[#157]: https://github.com/DataDog/datadog-ci-rb/issues/157
+[#158]: https://github.com/DataDog/datadog-ci-rb/issues/158
+[#159]: https://github.com/DataDog/datadog-ci-rb/issues/159
+[#160]: https://github.com/DataDog/datadog-ci-rb/issues/160

data/README.md

@@ -18,6 +18,10 @@ group :test do
 end
 ```
 
+## Upgrade from ddtrace v1.x
+
+If you used [test visibility for Ruby](https://docs.datadoghq.com/tests/setup/ruby/) with [ddtrace](https://github.com/datadog/dd-trace-rb) gem, check out our [upgrade guide](/docs/UpgradeGuide.md).
+
 ## Usage
 
 ### RSpec
@@ -31,25 +35,14 @@ require 'datadog/ci'
 # Only activates test instrumentation on CI
 if ENV["DD_ENV"] == "ci"
   Datadog.configure do |c|
-    # Configures the tracer to ensure results delivery
-    c.ci.enabled = true
-
     # The name of the service or library under test
     c.service = 'my-ruby-app'
-
-    # Enables the RSpec instrumentation
-    c.ci.instrument :rspec, **options
+    c.ci.enabled = true
+    c.ci.instrument :rspec
   end
 end
 ```
 
-`options` are the following keyword arguments:
-
-| Key | Description | Default |
-| --- | ----------- | ------- |
-| `enabled` | Defines whether RSpec tests should be traced. Useful for temporarily disabling tracing. `true` or `false` | `true` |
-| `service_name` | Service name used for `rspec` instrumentation. | `'rspec'` |
-
 ### Minitest
 
 The Minitest integration will trace all executions of tests when using `minitest` test framework.
@@ -64,13 +57,10 @@ require 'datadog/ci'
 if ENV["DD_ENV"] == "ci"
 # Configure default Minitest integration
   Datadog.configure do |c|
-    # Configures the tracer to ensure results delivery
-    c.ci.enabled = true
-
     # The name of the service or library under test
     c.service = 'my-ruby-app'
-
-    c.ci.instrument :minitest, **options
+    c.ci.enabled = true
+    c.ci.instrument :minitest
   end
 end
 ```
@@ -87,20 +77,13 @@ require 'minitest/autorun'
 
 if ENV["DD_ENV"] == "ci"
   Datadog.configure do |c|
-    c.ci.enabled = true
     c.service = 'my-ruby-app'
+    c.ci.enabled = true
     c.ci.instrument :minitest
   end
 end
 ```
 
-`options` are the following keyword arguments:
-
-| Key | Description | Default |
-| --- | ----------- | ------- |
-| `enabled` | Defines whether Minitest tests should be traced. Useful for temporarily disabling tracing. `true` or `false` | `true` |
-| `service_name` | Service name used for `minitest` instrumentation. | `'minitest'` |
-
 ### Cucumber
 
 Activate `Cucumber` integration with configuration
@@ -112,24 +95,31 @@ require 'datadog/ci'
 # Only activates test instrumentation on CI
 if ENV["DD_ENV"] == "ci"
   Datadog.configure do |c|
-    # Configures the tracer to ensure results delivery
-    c.ci.enabled = true
-
     # The name of the service or library under test
     c.service = 'my-ruby-app'
-
-    # Enables the Cucumber instrumentation
-    c.ci.instrument :cucumber, **options
+    c.ci.enabled = true
+    c.ci.instrument :cucumber
   end
 end
 ```
 
-`options` are the following keyword arguments:
+### Instrumentation options
+
+Configuration `ci.instrument` accepts the following optional parameters:
 
-| Key | Description | Default |
-| --- | ----------- | ------- |
-| `enabled` | Defines whether Cucumber tests should be traced. Useful for temporarily disabling tracing. `true` or `false` | `true` |
-| `service_name` | Service name used for `cucumber` instrumentation. | `'cucumber'` |
+- `enabled` (default: `true`) - defines whether tests should be traced (useful for temporarily disabling tracing)
+- `service_name` - name of the service or library under test (when you want it to be different for a test framework)
+
+Example usage:
+
+```ruby
+  Datadog.configure do |c|
+    c.service = 'my-ruby-app'
+    c.ci.enabled = true
+    c.ci.instrument :cucumber, service_name: 'my-cucumber-features', enabled: true
+    c.ci.instrument :minitest, service_name: 'my-unit-tests', enabled: false
+  end
+```
 
 ## Agentless mode
 
@@ -154,7 +144,7 @@ or other external calls like here:
 
 ![Test trace with redis instrumented](./docs/screenshots/test-trace-with-redis.png)
 
-In order to achieve this you can configure ddtrace instrumentations in your configure block:
+To achieve this, add Datadog tracing instrumentations in your `Datadog.configure` block:
 
 ```ruby
 Datadog.configure do |c|
@@ -167,13 +157,13 @@ end
 ...or enable auto instrumentation in your test_helper/spec_helper:
 
 ```ruby
-require "ddtrace/auto_instrument"
+require "datadog/auto_instrument"
 ```
 
 Note: in CI mode these traces are going to be submitted to CI Visibility,
 they will **not** show up in Datadog APM.
 
-For the full list of available instrumentations see [ddtrace documentation](https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md)
+For the full list of available instrumentations see [datadog documentation](https://github.com/DataDog/dd-trace-rb/blob/master/docs/GettingStarted.md)
 
 ### WebMock
 
@@ -187,8 +177,7 @@ Webmock accordingly.
 
 ```ruby
 # when using agentless mode
-# note to use the correct datadog site (e.g. datadoghq.eu, etc)
-WebMock.disable_net_connect!(:allow => /datadoghq.com/)
+WebMock.disable_net_connect!(:allow => /datadoghq/)
 
 # when using agent
 WebMock.disable_net_connect!(:allow_localhost => true)
@@ -211,8 +200,10 @@ VCR.configure do |config|
   config.ignore_hosts "127.0.0.1", "localhost"
 
   # when using agentless mode
-  # note to use the correct datadog site (e.g. datadoghq.eu, etc)
-  config.ignore_hosts "citestcycle-intake.datadoghq.com", "api.datadoghq.com"
+  config.ignore_request do |request|
+    # ignore all requests to datadoghq hosts
+    request.uri =~ /datadoghq/
+  end
 end
 ```
 
@@ -220,7 +211,7 @@ end
 
 Startup logs produce a report of tracing state when the application is initially configured.
 These logs are activated by default in test mode, if you don't want them you can disable this
-via `diagnostics.startup_logs.enabled = false` or `DD_TRACE_STARTUP_LOGS=0`.
+via `DD_TRACE_STARTUP_LOGS=0` or in the `Datadog.configure` block:
 
 ```ruby
 Datadog.configure { |c| c.diagnostics.startup_logs.enabled = false }
@@ -230,7 +221,7 @@ Datadog.configure { |c| c.diagnostics.startup_logs.enabled = false }
 
 Switching the library into debug mode will produce verbose, detailed logs about tracing activity, including any suppressed errors. This output can be helpful in identifying errors, confirming trace output, or catching HTTP transport issues.
 
-You can enable this via `diagnostics.debug = true` or `DD_TRACE_DEBUG=1`.
+You can enable this via `DD_TRACE_DEBUG=1` or in the `Datadog.configure` block:
 
 ```ruby
 Datadog.configure { |c| c.diagnostics.debug = true }

data/lib/datadog/ci/configuration/components.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 require_relative "../ext/settings"
+require_relative "../git/tree_uploader"
 require_relative "../itr/runner"
+require_relative "../itr/coverage/transport"
+require_relative "../itr/coverage/writer"
 require_relative "../test_visibility/flush"
 require_relative "../test_visibility/recorder"
 require_relative "../test_visibility/null_recorder"
@@ -10,25 +13,34 @@ require_relative "../test_visibility/serializers/factories/test_suite_level"
 require_relative "../test_visibility/transport"
 require_relative "../transport/api/builder"
 require_relative "../transport/remote_settings_api"
+require_relative "../worker"
 
 module Datadog
   module CI
     module Configuration
       # Adds CI behavior to Datadog trace components
       module Components
-        attr_reader :ci_recorder
+        attr_reader :ci_recorder, :itr
 
         def initialize(settings)
           # Activate CI mode if enabled
           if settings.ci.enabled
             activate_ci!(settings)
           else
+            @itr = nil
             @ci_recorder = TestVisibility::NullRecorder.new
           end
 
           super
         end
 
+        def shutdown!(replacement = nil)
+          super
+
+          @ci_recorder&.shutdown!
+          @itr&.shutdown!
+        end
+
         def activate_ci!(settings)
           # Configure ddtrace library for CI visibility mode
           # Deactivate telemetry
@@ -49,10 +61,17 @@ module Datadog
 
           # transport creation
           writer_options = settings.ci.writer_options
+          coverage_writer = nil
           test_visibility_api = build_test_visibility_api(settings)
 
           if test_visibility_api
-            writer_options[:transport] = Datadog::CI::TestVisibility::Transport.new(
+            # setup writer for code coverage payloads
+            coverage_writer = ITR::Coverage::Writer.new(
+              transport: ITR::Coverage::Transport.new(api: test_visibility_api)
+            )
+
+            # configure tracing writer to send traces to CI visibility backend
+            writer_options[:transport] = TestVisibility::Transport.new(
               api: test_visibility_api,
               serializers_factory: serializers_factory(settings),
               dd_env: settings.env
@@ -71,21 +90,36 @@ module Datadog
 
           settings.tracing.test_mode.writer_options = writer_options
 
-          itr = Datadog::CI::ITR::Runner.new(
-            enabled: settings.ci.enabled && settings.ci.itr_enabled
-          )
-
           remote_settings_api = Transport::RemoteSettingsApi.new(
             api: test_visibility_api,
             dd_env: settings.env
           )
 
+          itr = ITR::Runner.new(
+            api: test_visibility_api,
+            dd_env: settings.env,
+            coverage_writer: coverage_writer,
+            enabled: settings.ci.enabled && settings.ci.itr_enabled
+          )
+
+          git_tree_uploader = Git::TreeUploader.new(api: test_visibility_api)
+          git_tree_upload_worker = if settings.ci.git_metadata_upload_enabled
+            Worker.new do |repository_url|
+              git_tree_uploader.call(repository_url)
+            end
+          else
+            DummyWorker.new
+          end
+
           # CI visibility recorder global instance
           @ci_recorder = TestVisibility::Recorder.new(
             test_suite_level_visibility_enabled: !settings.ci.force_test_level_visibility,
             itr: itr,
-            remote_settings_api: remote_settings_api
+            remote_settings_api: remote_settings_api,
+            git_tree_upload_worker: git_tree_upload_worker
           )
+
+          @itr = itr
         end
 
         def build_test_visibility_api(settings)
@@ -122,9 +156,9 @@ module Datadog
 
         def serializers_factory(settings)
           if settings.ci.force_test_level_visibility
-            Datadog::CI::TestVisibility::Serializers::Factories::TestLevel
+            TestVisibility::Serializers::Factories::TestLevel
           else
-            Datadog::CI::TestVisibility::Serializers::Factories::TestSuiteLevel
+            TestVisibility::Serializers::Factories::TestSuiteLevel
           end
         end
 

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

@@ -61,6 +61,12 @@ module Datadog
                 o.default false
               end
 
+              option :git_metadata_upload_enabled do |o|
+                o.type :bool
+                o.env CI::Ext::Settings::ENV_GIT_METADATA_UPLOAD_ENABLED
+                o.default true
+              end
+
               define_method(:instrument) do |integration_name, options = {}, &block|
                 return unless enabled
 

data/lib/datadog/ci/contrib/cucumber/formatter.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../../ext/test"
-require_relative "../../utils/git"
+require_relative "../../git/local_repository"
+require_relative "../../utils/test_run"
 require_relative "ext"
 
 module Datadog
@@ -55,25 +56,26 @@ module Datadog
           def on_test_case_started(event)
             test_suite_name = test_suite_name(event.test_case)
 
+            # @type var tags: Hash[String, String]
             tags = {
               CI::Ext::Test::TAG_FRAMEWORK => Ext::FRAMEWORK,
               CI::Ext::Test::TAG_FRAMEWORK_VERSION => CI::Contrib::Cucumber::Integration.version.to_s,
-              CI::Ext::Test::TAG_SOURCE_FILE => Utils::Git.relative_to_root(event.test_case.location.file),
+              CI::Ext::Test::TAG_SOURCE_FILE => Git::LocalRepository.relative_to_root(event.test_case.location.file),
               CI::Ext::Test::TAG_SOURCE_START => event.test_case.location.line.to_s
             }
 
+            if (parameters = extract_parameters_hash(event.test_case))
+              tags[CI::Ext::Test::TAG_PARAMETERS] = Utils::TestRun.test_parameters(arguments: parameters)
+            end
+
             start_test_suite(test_suite_name) unless same_test_suite_as_current?(test_suite_name)
 
-            test_span = CI.start_test(
+            CI.start_test(
               event.test_case.name,
               test_suite_name,
               tags: tags,
               service: configuration[:service_name]
             )
-
-            if (parameters = extract_parameters_hash(event.test_case))
-              test_span&.set_parameters(parameters)
-            end
           end
 
           def on_test_case_finished(event)

data/lib/datadog/ci/contrib/cucumber/patcher.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 require "datadog/tracing/contrib/patcher"
+
 require_relative "instrumentation"
+require_relative "step"
 
 module Datadog
   module CI
@@ -19,6 +21,7 @@ module Datadog
 
           def patch
             ::Cucumber::Runtime.include(Instrumentation)
+            ::Cucumber::Core::Test::Step.include(Datadog::CI::Contrib::Cucumber::Step)
           end
         end
       end

data/lib/datadog/ci/contrib/cucumber/step.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Datadog
+  module CI
+    module Contrib
+      module Cucumber
+        # instruments Cucumber::Core::Test::Step from cucumber-ruby-core to change
+        module Step
+          def self.included(base)
+            base.prepend(InstanceMethods)
+          end
+
+          module InstanceMethods
+            def execute(*args)
+              test_span = CI.active_test
+              if test_span&.skipped_by_itr?
+                @action.skip(*args)
+              else
+                super
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/ci/contrib/minitest/hooks.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../../ext/test"
+require_relative "../../git/local_repository"
 require_relative "ext"
 require_relative "helpers"
 
@@ -24,17 +25,18 @@ module Datadog
 
             source_file, line_number = method(name).source_location
 
-            CI.start_test(
+            test_span = CI.start_test(
               name,
               test_suite_name,
               tags: {
                 CI::Ext::Test::TAG_FRAMEWORK => Ext::FRAMEWORK,
                 CI::Ext::Test::TAG_FRAMEWORK_VERSION => CI::Contrib::Minitest::Integration.version.to_s,
-                CI::Ext::Test::TAG_SOURCE_FILE => Utils::Git.relative_to_root(source_file),
+                CI::Ext::Test::TAG_SOURCE_FILE => Git::LocalRepository.relative_to_root(source_file),
                 CI::Ext::Test::TAG_SOURCE_START => line_number.to_s
               },
               service: datadog_configuration[:service_name]
             )
+            skip(CI::Ext::Test::ITR_TEST_SKIP_REASON) if test_span&.skipped_by_itr?
           end
 
           def after_teardown

data/lib/datadog/ci/contrib/rspec/example.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 require_relative "../../ext/test"
-require_relative "../../utils/git"
+require_relative "../../git/local_repository"
+require_relative "../../utils/test_run"
 require_relative "ext"
 
 module Datadog
@@ -41,14 +42,17 @@ module Datadog
                 tags: {
                   CI::Ext::Test::TAG_FRAMEWORK => Ext::FRAMEWORK,
                   CI::Ext::Test::TAG_FRAMEWORK_VERSION => CI::Contrib::RSpec::Integration.version.to_s,
-                  CI::Ext::Test::TAG_SOURCE_FILE => Utils::Git.relative_to_root(metadata[:file_path]),
-                  CI::Ext::Test::TAG_SOURCE_START => metadata[:line_number].to_s
+                  CI::Ext::Test::TAG_SOURCE_FILE => Git::LocalRepository.relative_to_root(metadata[:file_path]),
+                  CI::Ext::Test::TAG_SOURCE_START => metadata[:line_number].to_s,
+                  CI::Ext::Test::TAG_PARAMETERS => Utils::TestRun.test_parameters(
+                    metadata: {"scoped_id" => metadata[:scoped_id]}
+                  )
                 },
                 service: datadog_configuration[:service_name]
               ) do |test_span|
-                result = super
+                metadata[:skip] = CI::Ext::Test::ITR_TEST_SKIP_REASON if test_span&.skipped_by_itr?
 
-                test_span&.set_parameters({}, {"scoped_id" => metadata[:scoped_id]})
+                result = super
 
                 case execution_result.status
                 when :passed

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "base"
-require_relative "../../../utils/git"
+require_relative "../../../git/local_repository"
 
 module Datadog
   module CI
@@ -11,48 +11,23 @@ module Datadog
           # As a fallback we try to fetch git information from the local git repository
           class LocalGit < Base
             def git_repository_url
-              Utils::Git.exec_git_command("git ls-remote --get-url")
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git repository url: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              nil
+              CI::Git::LocalRepository.git_repository_url
             end
 
             def git_commit_sha
-              Utils::Git.exec_git_command("git rev-parse HEAD")
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git commit SHA: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              nil
+              CI::Git::LocalRepository.git_commit_sha
             end
 
             def git_branch
-              Utils::Git.exec_git_command("git rev-parse --abbrev-ref HEAD")
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git branch: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              nil
+              CI::Git::LocalRepository.git_branch
             end
 
             def git_tag
-              Utils::Git.exec_git_command("git tag --points-at HEAD")
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git tag: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              nil
+              CI::Git::LocalRepository.git_tag
             end
 
             def git_commit_message
-              Utils::Git.exec_git_command("git show -s --format=%s")
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git commit message: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              nil
+              CI::Git::LocalRepository.git_commit_message
             end
 
             def git_commit_author_name
@@ -80,12 +55,7 @@ module Datadog
             end
 
             def workspace_path
-              Utils::Git.exec_git_command("git rev-parse --show-toplevel")
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git base directory: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              nil
+              CI::Git::LocalRepository.git_root
             end
 
             private
@@ -105,48 +75,7 @@ module Datadog
             end
 
             def set_git_commit_users
-              # Get committer and author information in one command.
-              output = Utils::Git.exec_git_command("git show -s --format='%an\t%ae\t%at\t%cn\t%ce\t%ct'")
-              unless output
-                Datadog.logger.debug(
-                  "Unable to read git commit users: git command output is nil"
-                )
-                @author = @committer = NilUser.new
-                return
-              end
-
-              author_name, author_email, author_timestamp,
-                committer_name, committer_email, committer_timestamp = output.split("\t").each(&:strip!)
-
-              @author = GitUser.new(author_name, author_email, author_timestamp)
-              @committer = GitUser.new(committer_name, committer_email, committer_timestamp)
-            rescue => e
-              Datadog.logger.debug(
-                "Unable to read git commit users: #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
-              )
-              @author = @committer = NilUser.new
-            end
-
-            class GitUser
-              attr_reader :name, :email, :timestamp
-
-              def initialize(name, email, timestamp)
-                @name = name
-                @email = email
-                @timestamp = timestamp
-              end
-
-              def date
-                return nil if timestamp.nil?
-
-                Time.at(timestamp.to_i).utc.to_datetime.iso8601
-              end
-            end
-
-            class NilUser < GitUser
-              def initialize
-                super(nil, nil, nil)
-              end
+              @author, @committer = CI::Git::LocalRepository.git_commit_users
             end
           end
         end