RubyGems - datadog-ci - Versions diffs - 1.17.0 → 1.18.0 - Mend

datadog-ci 1.17.0 → 1.18.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (29) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +15 -2
data/ext/datadog_ci_native/ci.c +10 -0
data/ext/{datadog_cov → datadog_ci_native}/datadog_cov.c +119 -147
data/ext/datadog_ci_native/datadog_cov.h +3 -0
data/ext/datadog_ci_native/datadog_source_code.c +28 -0
data/ext/datadog_ci_native/datadog_source_code.h +3 -0
data/ext/{datadog_cov → datadog_ci_native}/extconf.rb +1 -1
data/lib/datadog/ci/contrib/minitest/test.rb +17 -7
data/lib/datadog/ci/contrib/rspec/example.rb +14 -7
data/lib/datadog/ci/ext/telemetry.rb +1 -2
data/lib/datadog/ci/ext/test.rb +1 -0
data/lib/datadog/ci/git/base_branch_sha_detection/base.rb +66 -0
data/lib/datadog/ci/git/base_branch_sha_detection/branch_metric.rb +34 -0
data/lib/datadog/ci/git/base_branch_sha_detection/guesser.rb +137 -0
data/lib/datadog/ci/git/base_branch_sha_detection/merge_base_extractor.rb +29 -0
data/lib/datadog/ci/git/base_branch_sha_detector.rb +63 -0
data/lib/datadog/ci/git/cli.rb +56 -0
data/lib/datadog/ci/git/local_repository.rb +73 -294
data/lib/datadog/ci/git/telemetry.rb +14 -0
data/lib/datadog/ci/impacted_tests_detection/component.rb +0 -2
data/lib/datadog/ci/test_optimisation/component.rb +10 -6
data/lib/datadog/ci/test_optimisation/coverage/ddcov.rb +1 -1
data/lib/datadog/ci/test_visibility/telemetry.rb +3 -0
data/lib/datadog/ci/utils/command.rb +116 -0
data/lib/datadog/ci/utils/source_code.rb +31 -0
data/lib/datadog/ci/version.rb +1 -1
metadata +16 -5
data/lib/datadog/ci/impacted_tests_detection/telemetry.rb +0 -16

data/lib/datadog/ci/utils/command.rb ADDED Viewed

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+require "open3"
+require "datadog/core/utils/time"
+module Datadog
+  module CI
+    module Utils
+      # Provides a way to call external commands with timeout
+      module Command
+        DEFAULT_TIMEOUT = 10 # seconds
+        BUFFER_SIZE = 1024
+        OPEN_STDIN_RETRY_COUNT = 3
+        # Executes a command with optional timeout and stdin data
+        #
+        # @param command [Array<String>] Command to execute.
+        # @param stdin_data [String, nil] Data to write to stdin
+        # @param timeout [Integer] Maximum execution time in seconds
+        # @return [Array<String, Process::Status?>] Output and exit status
+        #
+        # @example Safe usage with array (recommended)
+        #   Command.exec_command(["git", "log", "-n", "1"])
+        #
+        #
+        def self.exec_command(command, stdin_data: nil, timeout: DEFAULT_TIMEOUT)
+          output = +""
+          exit_value = nil
+          timeout_reached = false
+          begin
+            start = Core::Utils::Time.get_time
+            _, stderrout, thread = popen_with_stdin(command, stdin_data: stdin_data)
+            pid = thread[:pid]
+            # wait for output and read from stdout/stderr
+            while (Core::Utils::Time.get_time - start) < timeout
+              # wait for data to appear in stderrout channel
+              # maximum wait time 100ms
+              Kernel.select([stderrout], [], [], 0.1)
+              begin
+                output << stderrout.read_nonblock(1024)
+              rescue IO::WaitReadable
+              rescue EOFError
+                # we're done here, we return from this cycle when we processed the whole output of the command
+                break
+              end
+            end
+            if (Core::Utils::Time.get_time - start) > timeout
+              timeout_reached = true
+            end
+            if thread.alive?
+              begin
+                Process.kill("TERM", pid)
+              rescue
+                # Process already terminated
+              end
+            end
+            thread.join(1)
+            exit_value = thread.value
+          rescue Errno::EPIPE
+            return ["Error writing to stdin", nil]
+          ensure
+            stderrout&.close
+          end
+          # we read command's output as binary so now we need to set an appropriate encoding for the result
+          encoding = Encoding.default_external
+          # Sometimes Encoding.default_external is somehow set to US-ASCII which breaks
+          # commit messages with UTF-8 characters like emojis
+          # We force output's encoding to be UTF-8 in this case
+          # This is safe to do as UTF-8 is compatible with US-ASCII
+          if Encoding.default_external == Encoding::US_ASCII
+            encoding = Encoding::UTF_8
+          end
+          output.force_encoding(encoding)
+          output.strip! # There's always a "\n" at the end of the command output
+          if timeout_reached && output.empty?
+            output = "Command timed out after #{timeout} seconds"
+          end
+          [output, exit_value]
+        end
+        def self.popen_with_stdin(command, stdin_data: nil, retries_left: OPEN_STDIN_RETRY_COUNT)
+          result = Open3.popen2e(*command)
+          stdin = result.first
+          # write input to stdin
+          begin
+            stdin.write(stdin_data) if stdin_data
+          rescue Errno::EPIPE => e
+            if retries_left > 0
+              return popen_with_stdin(command, stdin_data: stdin_data, retries_left: retries_left - 1)
+            else
+              raise e
+            end
+          end
+          result
+        ensure
+          stdin.close
+        end
+      end
+    end
+  end
+end

data/lib/datadog/ci/utils/source_code.rb ADDED Viewed

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+module Datadog
+  module CI
+    module Utils
+      module SourceCode
+        begin
+          require "datadog_ci_native.#{RUBY_VERSION}_#{RUBY_PLATFORM}"
+          LAST_LINE_AVAILABLE = true
+        rescue LoadError
+          LAST_LINE_AVAILABLE = false
+        end
+        def self.last_line(target)
+          return nil if target.nil?
+          return nil unless LAST_LINE_AVAILABLE
+          # Ruby has outdated RBS for RubyVM::InstructionSequence where method `of` is not defined
+          # steep:ignore:start
+          iseq = RubyVM::InstructionSequence.of(target)
+          return nil unless iseq.is_a?(RubyVM::InstructionSequence)
+          # steep:ignore:end
+          # this function is implemented in ext/datadog_ci_native/datadog_source_code.c
+          _native_last_line_from_iseq(iseq)
+        end
+      end
+    end
+  end
+end

data/lib/datadog/ci/version.rb CHANGED Viewed

@@ -4,7 +4,7 @@ module Datadog
   module CI
     module VERSION
       MAJOR = 1
-      MINOR = 17
+      MINOR = 18
       PATCH = 0
       PRE = nil
       BUILD = nil

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog-ci
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - Datadog, Inc.
@@ -60,7 +60,7 @@ email:
 executables:
 - ddcirb
 extensions:
-- ext/datadog_cov/extconf.rb
+- ext/datadog_ci_native/extconf.rb
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
@@ -71,8 +71,12 @@ files:
 - NOTICE
 - README.md
 - exe/ddcirb
-- ext/datadog_cov/datadog_cov.c
-- ext/datadog_cov/extconf.rb
+- ext/datadog_ci_native/ci.c
+- ext/datadog_ci_native/datadog_cov.c
+- ext/datadog_ci_native/datadog_cov.h
+- ext/datadog_ci_native/datadog_source_code.c
+- ext/datadog_ci_native/datadog_source_code.h
+- ext/datadog_ci_native/extconf.rb
 - lib/datadog/ci.rb
 - lib/datadog/ci/async_writer.rb
 - lib/datadog/ci/auto_instrument.rb
@@ -187,6 +191,12 @@ files:
 - lib/datadog/ci/ext/telemetry.rb
 - lib/datadog/ci/ext/test.rb
 - lib/datadog/ci/ext/transport.rb
+- lib/datadog/ci/git/base_branch_sha_detection/base.rb
+- lib/datadog/ci/git/base_branch_sha_detection/branch_metric.rb
+- lib/datadog/ci/git/base_branch_sha_detection/guesser.rb
+- lib/datadog/ci/git/base_branch_sha_detection/merge_base_extractor.rb
+- lib/datadog/ci/git/base_branch_sha_detector.rb
+- lib/datadog/ci/git/cli.rb
 - lib/datadog/ci/git/local_repository.rb
 - lib/datadog/ci/git/packfiles.rb
 - lib/datadog/ci/git/search_commits.rb
@@ -195,7 +205,6 @@ files:
 - lib/datadog/ci/git/upload_packfile.rb
 - lib/datadog/ci/git/user.rb
 - lib/datadog/ci/impacted_tests_detection/component.rb
-- lib/datadog/ci/impacted_tests_detection/telemetry.rb
 - lib/datadog/ci/logs/component.rb
 - lib/datadog/ci/logs/transport.rb
 - lib/datadog/ci/readonly_test_module.rb
@@ -265,11 +274,13 @@ files:
 - lib/datadog/ci/transport/http.rb
 - lib/datadog/ci/transport/telemetry.rb
 - lib/datadog/ci/utils/bundle.rb
+- lib/datadog/ci/utils/command.rb
 - lib/datadog/ci/utils/configuration.rb
 - lib/datadog/ci/utils/file_storage.rb
 - lib/datadog/ci/utils/git.rb
 - lib/datadog/ci/utils/parsing.rb
 - lib/datadog/ci/utils/rum.rb
+- lib/datadog/ci/utils/source_code.rb
 - lib/datadog/ci/utils/stateful.rb
 - lib/datadog/ci/utils/telemetry.rb
 - lib/datadog/ci/utils/test_run.rb

data/lib/datadog/ci/impacted_tests_detection/telemetry.rb DELETED Viewed

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-require_relative "../ext/telemetry"
-require_relative "../utils/telemetry"
-module Datadog
-  module CI
-    module ImpactedTestsDetection
-      module Telemetry
-        def self.impacted_test_detected
-          Utils::Telemetry.inc(Ext::Telemetry::METRIC_IMPACTED_TESTS_IS_MODIFIED, 1)
-        end
-      end
-    end
-  end
-end