datadog-ci 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73bd9b05aba53e1197420cc0e4a529339b6526e13775467fa326b4949e44043a
-  data.tar.gz: 7613c476a2a3f2cf28d7dd99dd53da2fa6c921c9a03de18a6997f25e3fe0f27a
+  metadata.gz: 61f6379b9a5ac0c29ff9ee6b1687c1c2add77d6a5031dfd5758eb34a66cc6235
+  data.tar.gz: a795d8d69513925ee5ea6cf113cb54cec3711fe65ae5e928fcdeb8e1454323af
 SHA512:
-  metadata.gz: fc66a07d4ccceb71f18b26d290e387b6b403d7efbb46169ced3db9ad0e67e2f29ec163bdaa43a7f7508c6511ca0c68d99257d32d3a25e62b42e00219d7ef44a1
-  data.tar.gz: 6fb71c67ecea77fc61238fa7f739192a7670f51d8f4c052d436d2f4d69743f1202f27e27cf84fa76ce74860145d13badb00862c1c03b37d93dc9a33e597afb3d
+  metadata.gz: 3ea51d0baa70ecb4e66fb49712f4f291582ecb04455b2d32ec1328bb8ea3c112c4c25d80e450db542ee4f29408786b09a82b5f94fb1c7ef8c96b98d301e61e9b
+  data.tar.gz: 4f066970c2d9ed93001f35f9096cefcf2a4447a86cf7c1d89435853b1da00389c587924304c7a213e56f58f64b191523d202e34f86da535ded271583881411ac

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [1.1.0] - 2024-07-01
+
+### Added
+* Ignore Webmock automatically when making HTTP calls ([#193][])
+
 ## [1.0.1] - 2024-06-11
 
 ### Fixed
@@ -267,7 +272,8 @@ 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/v1.0.1...main
+[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v1.1.0...main
+[1.1.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.0.1...v1.1.0
 [1.0.1]: https://github.com/DataDog/datadog-ci-rb/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/DataDog/datadog-ci-rb/compare/v1.0.0.beta6...v1.0.0
 [1.0.0.beta6]: https://github.com/DataDog/datadog-ci-rb/compare/v1.0.0.beta5...v1.0.0.beta6
@@ -377,4 +383,5 @@ Currently test suite level visibility is not used by our instrumentation: it wil
 [#183]: https://github.com/DataDog/datadog-ci-rb/issues/183
 [#185]: https://github.com/DataDog/datadog-ci-rb/issues/185
 [#189]: https://github.com/DataDog/datadog-ci-rb/issues/189
-[#190]: https://github.com/DataDog/datadog-ci-rb/issues/190
+[#190]: https://github.com/DataDog/datadog-ci-rb/issues/190
+[#193]: https://github.com/DataDog/datadog-ci-rb/issues/193

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

@@ -205,7 +205,7 @@ module Datadog
         end
 
         def timecop?
-          Gem.loaded_specs.key?("timecop") || defined?(Timecop)
+          Gem.loaded_specs.key?("timecop") || !!defined?(Timecop)
         end
       end
     end

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

@@ -100,7 +100,7 @@ module Datadog
             end
 
             def ci_queue?
-              defined?(::RSpec::Queue::ExampleExtension) &&
+              !!defined?(::RSpec::Queue::ExampleExtension) &&
                 self.class.ancestors.include?(::RSpec::Queue::ExampleExtension)
             end
           end

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

@@ -42,15 +42,15 @@ module Datadog
           end
 
           def ci_queue?
-            defined?(::RSpec::Queue::Runner)
+            !!defined?(::RSpec::Queue::Runner)
           end
 
           def knapsack_pro?
             knapsack_version = Gem.loaded_specs["knapsack_pro"]&.version
 
             # additional instrumentation is needed for KnapsackPro version 7 and later
-            defined?(::KnapsackPro) &&
-              knapsack_version && knapsack_version >= Gem::Version.new("7")
+            !!defined?(::KnapsackPro) &&
+              !knapsack_version.nil? && knapsack_version >= Gem::Version.new("7")
           end
         end
       end

data/lib/datadog/ci/transport/adapters/net.rb

@@ -0,0 +1,138 @@
+# frozen_string_literal: true
+
+require "datadog/core/transport/response"
+require "datadog/core/transport/ext"
+
+require_relative "../gzip"
+require_relative "../../ext/transport"
+
+module Datadog
+  module CI
+    module Transport
+      module Adapters
+        # Adapter for Net::HTTP
+        class Net
+          attr_reader \
+            :hostname,
+            :port,
+            :timeout,
+            :ssl
+
+          def initialize(hostname:, port:, ssl:, timeout_seconds:)
+            @hostname = hostname
+            @port = port
+            @timeout = timeout_seconds
+            @ssl = ssl
+          end
+
+          def open(&block)
+            req = net_http_client.new(hostname, port)
+
+            req.use_ssl = ssl
+            req.open_timeout = req.read_timeout = timeout
+
+            req.start(&block)
+          end
+
+          def call(path:, payload:, headers:, verb:)
+            headers ||= {}
+            # skip tracing for internal DD requests
+            headers[Core::Transport::Ext::HTTP::HEADER_DD_INTERNAL_UNTRACED_REQUEST] = "1"
+
+            if respond_to?(verb)
+              send(verb, path: path, payload: payload, headers: headers)
+            else
+              raise "Unknown HTTP method [#{verb}]"
+            end
+          end
+
+          def post(path:, payload:, headers:)
+            post = ::Net::HTTP::Post.new(path, headers)
+            post.body = payload
+
+            # Connect and send the request
+            http_response = open do |http|
+              http.request(post)
+            end
+
+            # Build and return response
+            Response.new(http_response)
+          end
+
+          class Response
+            include Datadog::Core::Transport::Response
+
+            attr_reader :http_response
+
+            def initialize(http_response)
+              @http_response = http_response
+            end
+
+            def payload
+              return @decompressed_payload if defined?(@decompressed_payload)
+              return http_response.body unless gzipped_content?
+              return http_response.body unless gzipped_body?(http_response.body)
+
+              Datadog.logger.debug("Decompressing gzipped response payload")
+              @decompressed_payload = Gzip.decompress(http_response.body)
+            end
+
+            def header(name)
+              http_response[name]
+            end
+
+            def code
+              http_response.code.to_i
+            end
+
+            def ok?
+              code.between?(200, 299)
+            end
+
+            def unsupported?
+              code == 415
+            end
+
+            def not_found?
+              code == 404
+            end
+
+            def client_error?
+              code.between?(400, 499)
+            end
+
+            def server_error?
+              code.between?(500, 599)
+            end
+
+            def gzipped_content?
+              header(Ext::Transport::HEADER_CONTENT_ENCODING) == Ext::Transport::CONTENT_ENCODING_GZIP
+            end
+
+            def gzipped_body?(body)
+              return false if body.nil? || body.empty?
+
+              # no-dd-sa
+              first_bytes = body[0, 2]
+              return false if first_bytes.nil? || first_bytes.empty?
+
+              first_bytes.b == Ext::Transport::GZIP_MAGIC_NUMBER
+            end
+
+            def inspect
+              "#{super}, http_response:#{http_response}"
+            end
+          end
+
+          private
+
+          def net_http_client
+            return ::Net::HTTP unless defined?(WebMock::HttpLibAdapters::NetHttpAdapter::OriginalNetHTTP)
+
+            WebMock::HttpLibAdapters::NetHttpAdapter::OriginalNetHTTP
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/ci/transport/api/agentless.rb

@@ -37,7 +37,7 @@ module Datadog
           end
 
           def citestcov_request(path:, payload:, headers: {}, verb: "post")
-            super(path: path, payload: payload, headers: headers, verb: verb)
+            super
 
             perform_request(@citestcov_http, path: path, payload: @citestcov_payload, headers: headers, verb: verb)
           end
@@ -60,7 +60,7 @@ module Datadog
 
             Datadog::CI::Transport::HTTP.new(
               host: uri.host,
-              port: uri.port,
+              port: uri.port || 80,
               ssl: uri.scheme == "https" || uri.port == 443,
               compress: compress
             )

data/lib/datadog/ci/transport/api/evp_proxy.rb

@@ -39,7 +39,7 @@ module Datadog
           end
 
           def citestcov_request(path:, payload:, headers: {}, verb: "post")
-            super(path: path, payload: payload, headers: headers, verb: verb)
+            super
 
             headers[Ext::Transport::HEADER_EVP_SUBDOMAIN] = Ext::Transport::TEST_COVERAGE_INTAKE_HOST_PREFIX
 

data/lib/datadog/ci/transport/http.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
 require "delegate"
-require "datadog/core/transport/http/adapters/net"
-require "datadog/core/transport/http/env"
-require "datadog/core/transport/request"
 require "socket"
 
 require_relative "gzip"
+require_relative "adapters/net"
 require_relative "../ext/transport"
 
 module Datadog
@@ -24,7 +22,7 @@ module Datadog
         MAX_RETRIES = 3
         INITIAL_BACKOFF = 1
 
-        def initialize(host:, timeout: DEFAULT_TIMEOUT, port: nil, ssl: true, compress: false)
+        def initialize(host:, port:, timeout: DEFAULT_TIMEOUT, ssl: true, compress: false)
           @host = host
           @port = port
           @timeout = timeout
@@ -70,7 +68,7 @@ module Datadog
 
         def perform_http_call(path:, payload:, headers:, verb:, retries: MAX_RETRIES, backoff: INITIAL_BACKOFF)
           adapter.call(
-            build_env(path: path, payload: payload, headers: headers, verb: verb)
+            path: path, payload: payload, headers: headers, verb: verb
           )
         rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, SocketError, Net::HTTPBadResponse => e
           Datadog.logger.debug("Failed to send request with #{e} (#{e.message})")
@@ -87,65 +85,17 @@ module Datadog
           end
         end
 
-        def build_env(path:, payload:, headers:, verb:)
-          env = Datadog::Core::Transport::HTTP::Env.new(
-            Datadog::Core::Transport::Request.new
-          )
-          env.body = payload
-          env.path = path
-          env.headers = headers
-          env.verb = verb
-          env
-        end
-
         def adapter
-          settings = AdapterSettings.new(hostname: host, port: port, ssl: ssl, timeout_seconds: timeout)
-          @adapter ||= Datadog::Core::Transport::HTTP::Adapters::Net.new(settings)
+          @adapter ||= Datadog::CI::Transport::Adapters::Net.new(
+            hostname: host, port: port, ssl: ssl, timeout_seconds: timeout
+          )
         end
 
-        # adds compatibility with Datadog::Tracing transport and
-        # provides ungzipping capabilities
+        # adds compatibility with Datadog::Tracing transport
         class ResponseDecorator < ::SimpleDelegator
-          def payload
-            return @decompressed_payload if defined?(@decompressed_payload)
-
-            if gzipped?(__getobj__.payload)
-              Datadog.logger.debug("Decompressing gzipped response payload")
-              @decompressed_payload = Gzip.decompress(__getobj__.payload)
-            else
-              __getobj__.payload
-            end
-          end
-
           def trace_count
             0
           end
-
-          def gzipped?(payload)
-            return false if payload.nil? || payload.empty?
-
-            # no-dd-sa
-            first_bytes = payload[0, 2]
-            return false if first_bytes.nil? || first_bytes.empty?
-
-            first_bytes.b == Datadog::CI::Ext::Transport::GZIP_MAGIC_NUMBER
-          end
-        end
-
-        class AdapterSettings
-          attr_reader :hostname, :port, :ssl, :timeout_seconds
-
-          def initialize(hostname:, port: nil, ssl: true, timeout_seconds: nil)
-            @hostname = hostname
-            @port = port
-            @ssl = ssl
-            @timeout_seconds = timeout_seconds
-          end
-
-          def ==(other)
-            hostname == other.hostname && port == other.port && ssl == other.ssl &&
-              timeout_seconds == other.timeout_seconds
-          end
         end
       end
     end

data/lib/datadog/ci/version.rb

@@ -4,8 +4,8 @@ module Datadog
   module CI
     module VERSION
       MAJOR = 1
-      MINOR = 0
-      PATCH = 1
+      MINOR = 1
+      PATCH = 0
       PRE = nil
       BUILD = nil
       # PRE and BUILD above are modified for dev gems during gem build GHA workflow

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-ci
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datadog
@@ -160,6 +160,7 @@ files:
 - lib/datadog/ci/test_visibility/serializers/test_v1.rb
 - lib/datadog/ci/test_visibility/serializers/test_v2.rb
 - lib/datadog/ci/test_visibility/transport.rb
+- lib/datadog/ci/transport/adapters/net.rb
 - lib/datadog/ci/transport/api/agentless.rb
 - lib/datadog/ci/transport/api/base.rb
 - lib/datadog/ci/transport/api/builder.rb
@@ -201,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Datadog CI visibility for your ruby application