datadog-ci 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edf471864cc0dc97624e2666deede58c547f5513a972a4e041c1204a0b665a36
-  data.tar.gz: a1cbf16a8c4891173dc02ceef831a94be2b2a50936bf551494c814c94a94594c
+  metadata.gz: ce3b4502404f6faa6b05421763ced6582071c9ad025937219b59ba8c63c39175
+  data.tar.gz: 7a341aa75161299cb04a29f745e172ef5ca4fec3a24f536ec96e08119de11a97
 SHA512:
-  metadata.gz: 9c1559ae996b1f7ee7fc5ac0ec131f4e227fb227c7fa62af30f3e6739e040d5947a1e1ca900b3abe94d21262608164dd0ea82ffbcd7fa1e5a157ab400bd22554
-  data.tar.gz: c58b74157088a4c3e8dbafad7cbf443ebbb503cc831ae2106190bfadc26cfd67f1c80be6d7b500350736b3b3ee8056d1de4aec4693a7500cef1156dd490d3cf7
+  metadata.gz: 6058fbf497f43040a588018a2104055a303849d5616d063412dae4dab1e5247098e9ecd1b0b718776a51bc090f137d2bcf19cc78d252c7968c9cd6e4723ad902
+  data.tar.gz: 3c8d8eb9a34266a690a0dd5103d344b80df5175c703a414b1bc8255dc3c2732d723960e786765f2686fdcaaff5f009b675942c5e39dbd4a6fc9e58a38653051e

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 ## [Unreleased]
 
+## [0.3.0] - 2023-10-25
+
+### Added
+
+* Add AWS CodePipeline support for automatic CI tags extraction ([#54][])
+* Support test visibility protocol via Datadog Agent with EVP proxy ([#51][])
+
+### Changed
+
+* Migrate to Net::HTTP adapter from Core module of ddtrace gem ([#49][])
+
 ## [0.2.0] - 2023-10-05
 
 ### Added
@@ -36,7 +47,8 @@
 
 * Ruby versions < 2.7 no longer supported ([#8][])
 
-[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v0.2.0...main
+[Unreleased]: https://github.com/DataDog/datadog-ci-rb/compare/v0.3.0...main
+[0.3.0]: https://github.com/DataDog/datadog-ci-rb/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/DataDog/datadog-ci-rb/compare/v0.1.1...v0.2.0
 [0.1.1]: https://github.com/DataDog/datadog-ci-rb/compare/v0.1.0...v0.1.1
 
@@ -51,3 +63,6 @@
 [#31]: https://github.com/DataDog/datadog-ci-rb/issues/31
 [#33]: https://github.com/DataDog/datadog-ci-rb/issues/33
 [#40]: https://github.com/DataDog/datadog-ci-rb/issues/40
+[#49]: https://github.com/DataDog/datadog-ci-rb/issues/49
+[#51]: https://github.com/DataDog/datadog-ci-rb/issues/51
+[#54]: https://github.com/DataDog/datadog-ci-rb/issues/54

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

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
+require "datadog/core/configuration/agent_settings_resolver"
+require "datadog/core/remote/negotiation"
+
+require_relative "../ext/transport"
 require_relative "../test_visibility/flush"
 require_relative "../test_visibility/transport"
+require_relative "../transport/api/builder"
 
 module Datadog
   module CI
@@ -17,25 +22,13 @@ module Datadog
         end
 
         def activate_ci!(settings)
-          agentless_transport = nil
+          test_visibility_transport = nil
+          agent_settings = Datadog::Core::Configuration::AgentSettingsResolver.call(settings)
 
           if settings.ci.agentless_mode_enabled
-            if settings.api_key.nil?
-              # agentless mode is requested but no API key is provided -
-              # we cannot continue and log an error
-              # Tests are running without CI visibility enabled
-
-              Datadog.logger.error(
-                "DATADOG CONFIGURATION - CI VISIBILITY - ATTENTION - " \
-                "Agentless mode was enabled but DD_API_KEY is not set: CI visibility is disabled. " \
-                "Please make sure to set valid api key in DD_API_KEY environment variable"
-              )
-
-              settings.ci.enabled = false
-              return
-            else
-              agentless_transport = build_agentless_transport(settings)
-            end
+            test_visibility_transport = build_agentless_transport(settings)
+          elsif can_use_evp_proxy?(settings, agent_settings)
+            test_visibility_transport = build_evp_proxy_transport(settings, agent_settings)
           end
 
           # Deactivate telemetry
@@ -51,8 +44,8 @@ module Datadog
           settings.tracing.test_mode.trace_flush = settings.ci.trace_flush || CI::TestVisibility::Flush::Finished.new
 
           writer_options = settings.ci.writer_options
-          if agentless_transport
-            writer_options[:transport] = agentless_transport
+          if test_visibility_transport
+            writer_options[:transport] = test_visibility_transport
             writer_options[:shutdown_timeout] = 60
 
             settings.tracing.test_mode.async = true
@@ -61,15 +54,43 @@ module Datadog
           settings.tracing.test_mode.writer_options = writer_options
         end
 
+        def can_use_evp_proxy?(settings, agent_settings)
+          Datadog::Core::Remote::Negotiation.new(settings, agent_settings).endpoint?(
+            Ext::Transport::EVP_PROXY_PATH_PREFIX
+          )
+        end
+
         def build_agentless_transport(settings)
-          dd_site = settings.site || "datadoghq.com"
-          agentless_url = settings.ci.agentless_url ||
-            "https://#{Ext::Transport::TEST_VISIBILITY_INTAKE_HOST_PREFIX}.#{dd_site}:443"
+          if settings.api_key.nil?
+            # agentless mode is requested but no API key is provided -
+            # we cannot continue and log an error
+            # Tests are running without CI visibility enabled
+
+            Datadog.logger.error(
+              "DATADOG CONFIGURATION - CI VISIBILITY - ATTENTION - " \
+              "Agentless mode was enabled but DD_API_KEY is not set: CI visibility is disabled. " \
+              "Please make sure to set valid api key in DD_API_KEY environment variable"
+            )
+
+            settings.ci.enabled = false
+
+            nil
+          else
+            Datadog.logger.debug("CI visibility configured to use agentless transport")
+
+            Datadog::CI::TestVisibility::Transport.new(
+              api: Transport::Api::Builder.build_ci_test_cycle_api(settings),
+              dd_env: settings.env
+            )
+          end
+        end
+
+        def build_evp_proxy_transport(settings, agent_settings)
+          Datadog.logger.debug("CI visibility configured to use agent transport via EVP proxy")
 
           Datadog::CI::TestVisibility::Transport.new(
-            api_key: settings.api_key,
-            url: agentless_url,
-            env: settings.env
+            api: Transport::Api::Builder.build_evp_proxy_api(agent_settings),
+            dd_env: settings.env
           )
         end
       end

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

@@ -10,6 +10,10 @@ module Datadog
           # Appveyor: https://www.appveyor.com/
           # Environment variables docs: https://www.appveyor.com/docs/environment-variables/
           class Appveyor < Base
+            def self.handles?(env)
+              env.key?("APPVEYOR")
+            end
+
             def provider_name
               "appveyor"
             end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require_relative "base"
+
+module Datadog
+  module CI
+    module Ext
+      module Environment
+        module Providers
+          # AWS CodePipeline: https://aws.amazon.com/codepipeline/
+          # Environment variables docs: https://docs.aws.amazon.com/codepipeline/latest/userguide/actions-variables.html
+          # AWS CodeBuild: https://aws.amazon.com/codebuild/
+          # Environment variable docs: https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-env-vars.html
+          class AwsCodePipeline < Base
+            def self.handles?(env)
+              !env["CODEBUILD_INITIATOR"].nil? && env["CODEBUILD_INITIATOR"].start_with?("codepipeline")
+            end
+
+            def provider_name
+              "awscodepipeline"
+            end
+
+            def pipeline_id
+              env["DD_PIPELINE_EXECUTION_ID"]
+            end
+
+            def ci_env_vars
+              {
+                "CODEBUILD_BUILD_ARN" => env["CODEBUILD_BUILD_ARN"],
+                "DD_PIPELINE_EXECUTION_ID" => env["DD_PIPELINE_EXECUTION_ID"],
+                "DD_ACTION_EXECUTION_ID" => env["DD_ACTION_EXECUTION_ID"]
+              }.to_json
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -12,6 +12,10 @@ module Datadog
           # Azure Pipelines: https://azure.microsoft.com/en-us/products/devops/pipelines
           # Environment variables docs: https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml
           class Azure < Base
+            def self.handles?(env)
+              env.key?("TF_BUILD")
+            end
+
             def provider_name
               "azurepipelines"
             end

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

@@ -8,6 +8,10 @@ module Datadog
           class Base
             attr_reader :env
 
+            def self.handles?(_env)
+              false
+            end
+
             def initialize(env)
               @env = env
             end

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

@@ -10,6 +10,10 @@ module Datadog
           # Bitbucket Pipelines: https://bitbucket.org/product/features/pipelines
           # Environment variables docs: https://support.atlassian.com/bitbucket-cloud/docs/variables-and-secrets/
           class Bitbucket < Base
+            def self.handles?(env)
+              env.key?("BITBUCKET_COMMIT")
+            end
+
             # overridden methods
             def provider_name
               "bitbucket"

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

@@ -10,6 +10,10 @@ module Datadog
           # Bitrise: https://bitrise.io/
           # Environment variables docs: https://devcenter.bitrise.io/en/references/available-environment-variables.html
           class Bitrise < Base
+            def self.handles?(env)
+              env.key?("BITRISE_BUILD_SLUG")
+            end
+
             def provider_name
               "bitrise"
             end

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

@@ -10,6 +10,10 @@ module Datadog
           # Buddy: https://buddy.works/
           # Environment variables docs: https://buddy.works/docs/pipelines/environment-variables
           class Buddy < Base
+            def self.handles?(env)
+              env.key?("BUDDY")
+            end
+
             def provider_name
               "buddy"
             end

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

@@ -12,6 +12,10 @@ module Datadog
           # Buildkite: https://buildkite.com/
           # Environment variables docs: https://buildkite.com/docs/pipelines/environment-variables
           class Buildkite < Base
+            def self.handles?(env)
+              env.key?("BUILDKITE")
+            end
+
             def provider_name
               "buildkite"
             end

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

@@ -12,6 +12,10 @@ module Datadog
           # Circle CI: https://circleci.com/
           # Environment variables docs: https://circleci.com/docs/variables/#built-in-environment-variables
           class Circleci < Base
+            def self.handles?(env)
+              env.key?("CIRCLECI")
+            end
+
             def provider_name
               "circleci"
             end

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

@@ -12,6 +12,10 @@ module Datadog
           # Codefresh: https://codefresh.io/
           # Environment variables docs: https://codefresh.io/docs/docs/pipelines/variables/#export-variables-to-all-steps-with-cf_export
           class Codefresh < Base
+            def self.handles?(env)
+              env.key?("CF_BUILD_ID")
+            end
+
             def provider_name
               "codefresh"
             end

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

@@ -12,6 +12,10 @@ module Datadog
           # Github Actions: https://github.com/features/actions
           # Environment variables docs: https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables
           class GithubActions < Base
+            def self.handles?(env)
+              env.key?("GITHUB_SHA")
+            end
+
             def provider_name
               "github"
             end

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

@@ -10,6 +10,10 @@ module Datadog
           # Gitlab CI: https://docs.gitlab.com/ee/ci/
           # Environment variables docs: https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
           class Gitlab < Base
+            def self.handles?(env)
+              env.key?("GITLAB_CI")
+            end
+
             def provider_name
               "gitlab"
             end

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

@@ -13,6 +13,10 @@ module Datadog
           # Jenkins: https://www.jenkins.io/
           # Environment variables docs: https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
           class Jenkins < Base
+            def self.handles?(env)
+              env.key?("JENKINS_URL")
+            end
+
             def provider_name
               "jenkins"
             end

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

@@ -10,6 +10,10 @@ module Datadog
           # Teamcity: https://www.jetbrains.com/teamcity/
           # Environment variables docs: https://www.jetbrains.com/help/teamcity/predefined-build-parameters.html
           class Teamcity < Base
+            def self.handles?(env)
+              env.key?("TEAMCITY_VERSION")
+            end
+
             def provider_name
               "teamcity"
             end

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

@@ -10,6 +10,10 @@ module Datadog
           # Travis CI: https://www.travis-ci.com/
           # Environment variables docs: https://docs.travis-ci.com/user/environment-variables#default-environment-variables
           class Travis < Base
+            def self.handles?(env)
+              env.key?("TRAVIS")
+            end
+
             def provider_name
               "travisci"
             end

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

@@ -2,6 +2,7 @@
 
 require_relative "providers/base"
 require_relative "providers/appveyor"
+require_relative "providers/aws_code_pipeline"
 require_relative "providers/azure"
 require_relative "providers/bitbucket"
 require_relative "providers/bitrise"
@@ -24,23 +25,24 @@ module Datadog
       module Environment
         module Providers
           PROVIDERS = [
-            ["APPVEYOR", Providers::Appveyor],
-            ["TF_BUILD", Providers::Azure],
-            ["BITBUCKET_COMMIT", Providers::Bitbucket],
-            ["BITRISE_BUILD_SLUG", Providers::Bitrise],
-            ["BUDDY", Providers::Buddy],
-            ["BUILDKITE", Providers::Buildkite],
-            ["CIRCLECI", Providers::Circleci],
-            ["CF_BUILD_ID", Providers::Codefresh],
-            ["GITHUB_SHA", Providers::GithubActions],
-            ["GITLAB_CI", Providers::Gitlab],
-            ["JENKINS_URL", Providers::Jenkins],
-            ["TEAMCITY_VERSION", Providers::Teamcity],
-            ["TRAVIS", Providers::Travis]
+            Providers::Appveyor,
+            Providers::AwsCodePipeline,
+            Providers::Azure,
+            Providers::Bitbucket,
+            Providers::Bitrise,
+            Providers::Buddy,
+            Providers::Buildkite,
+            Providers::Circleci,
+            Providers::Codefresh,
+            Providers::GithubActions,
+            Providers::Gitlab,
+            Providers::Jenkins,
+            Providers::Teamcity,
+            Providers::Travis
           ]
 
           def self.for_environment(env)
-            _, provider_klass = PROVIDERS.find { |provider_env_var, _| env.key?(provider_env_var) }
+            provider_klass = PROVIDERS.find { |klass| klass.handles?(env) }
             provider_klass = Providers::Base if provider_klass.nil?
 
             provider_klass.new(env)

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

@@ -4,10 +4,15 @@ module Datadog
   module CI
     module Ext
       module Transport
+        DEFAULT_DD_SITE = "datadoghq.com"
+
         HEADER_DD_API_KEY = "DD-API-KEY"
         HEADER_CONTENT_TYPE = "Content-Type"
         HEADER_CONTENT_ENCODING = "Content-Encoding"
+        HEADER_EVP_SUBDOMAIN = "X-Datadog-EVP-Subdomain"
+        HEADER_CONTAINER_ID = "Datadog-Container-ID"
 
+        EVP_PROXY_PATH_PREFIX = "/evp_proxy/v2/"
         TEST_VISIBILITY_INTAKE_HOST_PREFIX = "citestcycle-intake"
         TEST_VISIBILITY_INTAKE_PATH = "/api/v2/citestcycle"
 

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

@@ -9,7 +9,6 @@ require "datadog/core/chunker"
 
 require_relative "serializers/factories/test_level"
 require_relative "../ext/transport"
-require_relative "../transport/http"
 
 module Datadog
   module CI
@@ -20,33 +19,20 @@ module Datadog
         DEFAULT_MAX_PAYLOAD_SIZE = 5 * 1024 * 1024
 
         attr_reader :serializers_factory,
-          :api_key,
+          :api,
           :max_payload_size,
-          :http,
-          :env
+          :dd_env
 
         def initialize(
-          api_key:,
-          url:,
-          env: nil,
+          api:,
+          dd_env: nil,
           serializers_factory: Datadog::CI::TestVisibility::Serializers::Factories::TestLevel,
           max_payload_size: DEFAULT_MAX_PAYLOAD_SIZE
         )
           @serializers_factory = serializers_factory
-          @api_key = api_key
           @max_payload_size = max_payload_size
-          @env = env
-
-          uri = URI.parse(url)
-
-          raise "Invalid agentless mode URL: #{url}" if uri.host.nil?
-
-          @http = Datadog::CI::Transport::HTTP.new(
-            host: uri.host,
-            port: uri.port,
-            ssl: uri.scheme == "https" || uri.port == 443,
-            compress: true
-          )
+          @dd_env = dd_env
+          @api = api
         end
 
         def send_traces(traces)
@@ -82,13 +68,9 @@ module Datadog
         private
 
         def send_payload(encoded_payload)
-          http.request(
+          api.request(
             path: Datadog::CI::Ext::Transport::TEST_VISIBILITY_INTAKE_PATH,
-            payload: encoded_payload,
-            headers: {
-              Ext::Transport::HEADER_DD_API_KEY => api_key,
-              Ext::Transport::HEADER_CONTENT_TYPE => Ext::Transport::CONTENT_TYPE_MESSAGEPACK
-            }
+            payload: encoded_payload
           )
         end
 
@@ -141,12 +123,12 @@ module Datadog
           packer.write_map_header(1)
 
           packer.write("*")
-          metadata_fields_count = env ? 4 : 3
+          metadata_fields_count = dd_env ? 4 : 3
           packer.write_map_header(metadata_fields_count)
 
-          if env
+          if dd_env
             packer.write("env")
-            packer.write(env)
+            packer.write(dd_env)
           end
 
           packer.write("runtime-id")

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

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require_relative "../../ext/transport"
+
+module Datadog
+  module CI
+    module Transport
+      module Api
+        class Base
+          attr_reader :http
+
+          def initialize(http:)
+            @http = http
+          end
+
+          def request(path:, payload:, verb: "post")
+            http.request(
+              path: path,
+              payload: payload,
+              verb: verb,
+              headers: headers
+            )
+          end
+
+          private
+
+          def headers
+            {
+              Ext::Transport::HEADER_CONTENT_TYPE => Ext::Transport::CONTENT_TYPE_MESSAGEPACK
+            }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require_relative "ci_test_cycle"
+require_relative "evp_proxy"
+require_relative "../http"
+require_relative "../../ext/transport"
+
+module Datadog
+  module CI
+    module Transport
+      module Api
+        module Builder
+          def self.build_ci_test_cycle_api(settings)
+            dd_site = settings.site || Ext::Transport::DEFAULT_DD_SITE
+            url = settings.ci.agentless_url ||
+              "https://#{Ext::Transport::TEST_VISIBILITY_INTAKE_HOST_PREFIX}.#{dd_site}:443"
+
+            uri = URI.parse(url)
+            raise "Invalid agentless mode URL: #{url}" if uri.host.nil?
+
+            http = Datadog::CI::Transport::HTTP.new(
+              host: uri.host,
+              port: uri.port,
+              ssl: uri.scheme == "https" || uri.port == 443,
+              compress: true
+            )
+
+            CiTestCycle.new(api_key: settings.api_key, http: http)
+          end
+
+          def self.build_evp_proxy_api(agent_settings)
+            http = Datadog::CI::Transport::HTTP.new(
+              host: agent_settings.hostname,
+              port: agent_settings.port,
+              ssl: agent_settings.ssl,
+              timeout: agent_settings.timeout_seconds,
+              compress: false
+            )
+
+            EvpProxy.new(http: http)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative "base"
+require_relative "../../ext/transport"
+
+module Datadog
+  module CI
+    module Transport
+      module Api
+        class CiTestCycle < Base
+          attr_reader :api_key
+
+          def initialize(api_key:, http:)
+            @api_key = api_key
+
+            super(http: http)
+          end
+
+          private
+
+          def headers
+            headers = super
+            headers[Ext::Transport::HEADER_DD_API_KEY] = api_key
+            headers
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "datadog/core/environment/container"
+
+require_relative "base"
+require_relative "../../ext/transport"
+
+module Datadog
+  module CI
+    module Transport
+      module Api
+        class EvpProxy < Base
+          def request(path:, payload:, verb: "post")
+            path = "#{Ext::Transport::EVP_PROXY_PATH_PREFIX}#{path.sub(/^\//, "")}"
+
+            super(
+              path: path,
+              payload: payload,
+              verb: verb
+            )
+          end
+
+          private
+
+          def container_id
+            return @container_id if defined?(@container_id)
+
+            @container_id = Datadog::Core::Environment::Container.container_id
+          end
+
+          def headers
+            headers = super
+            headers[Ext::Transport::HEADER_EVP_SUBDOMAIN] = Ext::Transport::TEST_VISIBILITY_INTAKE_HOST_PREFIX
+
+            c_id = container_id
+            headers[Ext::Transport::HEADER_CONTAINER_ID] = c_id unless c_id.nil?
+
+            headers
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -10,9 +10,11 @@ module Datadog
         module_function
 
         def compress(input)
-          gzip_writer = Zlib::GzipWriter.new(StringIO.new)
+          sio = StringIO.new
+          gzip_writer = Zlib::GzipWriter.new(sio, Zlib::DEFAULT_COMPRESSION, Zlib::DEFAULT_STRATEGY)
           gzip_writer << input
-          gzip_writer.close.string
+          gzip_writer.close
+          sio.string
         end
       end
     end

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

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-require "net/http"
+require "delegate"
+require "datadog/core/transport/http/adapters/net"
+require "datadog/core/transport/http/env"
+require "datadog/core/transport/request"
 
 require_relative "gzip"
 require_relative "../ext/transport"
@@ -26,126 +29,47 @@ module Datadog
           @compress = compress.nil? ? false : compress
         end
 
-        def request(path:, payload:, headers:, method: "post")
-          raise "Unknown method #{method}" unless respond_to?(method, true)
-
+        def request(path:, payload:, headers:, verb: "post")
           if compress
             headers[Ext::Transport::HEADER_CONTENT_ENCODING] = Ext::Transport::CONTENT_ENCODING_GZIP
             payload = Gzip.compress(payload)
           end
 
           Datadog.logger.debug do
-            "Sending #{method} request: host=#{host}; port=#{port}; ssl_enabled=#{ssl}; " \
+            "Sending #{verb} request: host=#{host}; port=#{port}; ssl_enabled=#{ssl}; " \
               "compression_enabled=#{compress}; path=#{path}; payload_size=#{payload.size}"
           end
 
-          send(method, path: path, payload: payload, headers: headers)
+          ResponseDecorator.new(
+            adapter.call(
+              build_env(path: path, payload: payload, headers: headers, verb: verb)
+            )
+          )
         end
 
         private
 
-        def open(&block)
-          req = ::Net::HTTP.new(@host, @port)
-
-          req.use_ssl = @ssl
-          req.open_timeout = req.read_timeout = @timeout
-
-          req.start(&block)
+        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 post(path:, headers:, payload:)
-          post = ::Net::HTTP::Post.new(path, headers)
-          post.body = payload
-
-          http_response = open do |http|
-            http.request(post)
-          end
-
-          Response.new(http_response)
-        rescue => e
-          Datadog.logger.debug("Unable to send events: #{e}")
-
-          InternalErrorResponse.new(e)
+        def adapter
+          @adapter ||= Datadog::Core::Transport::HTTP::Adapters::Net.new(host, port, timeout: timeout, ssl: ssl)
         end
 
-        # Data structure for an HTTP Response
-        class Response
-          attr_reader :http_response
-
-          def initialize(http_response)
-            @http_response = http_response
-          end
-
-          def payload
-            http_response.body
-          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 internal_error?
-            false
-          end
-
+        # this is needed because Datadog::Tracing::Writer is not fully compatiple with Datadog::Core::Transport
+        # TODO: remove before 1.0 when CI implements its own worker
+        class ResponseDecorator < ::SimpleDelegator
           def trace_count
             0
           end
-
-          def inspect
-            "#{self.class} ok?:#{ok?} unsupported?:#{unsupported?}, " \
-            "not_found?:#{not_found?}, client_error?:#{client_error?}, " \
-            "server_error?:#{server_error?}, internal_error?:#{internal_error?}, " \
-            "payload:#{payload}"
-          end
-        end
-
-        class InternalErrorResponse < Response
-          class DummyNetHTTPResponse
-            def body
-              ""
-            end
-
-            def code
-              "-1"
-            end
-          end
-
-          attr_reader :error
-
-          def initialize(error)
-            super(DummyNetHTTPResponse.new)
-
-            @error = error
-          end
-
-          def internal_error?
-            true
-          end
-
-          def inspect
-            "#{super}, error_class:#{error.class}, error:#{error}"
-          end
         end
       end
     end

data/lib/datadog/ci/version.rb

@@ -4,7 +4,7 @@ module Datadog
   module CI
     module VERSION
       MAJOR = "0"
-      MINOR = "2"
+      MINOR = "3"
       PATCH = "0"
       PRE = nil
       BUILD = nil

data/sig/datadog/ci/configuration/components.rbs

@@ -6,7 +6,9 @@ module Datadog
 
         def activate_ci!: (untyped settings) -> untyped
 
-        def build_agentless_transport: (untyped settings) -> Datadog::CI::TestVisibility::Transport
+        def build_agentless_transport: (untyped settings) -> Datadog::CI::TestVisibility::Transport?
+        def build_evp_proxy_transport: (untyped settings, untyped agent_settings) -> Datadog::CI::TestVisibility::Transport
+        def can_use_evp_proxy?: (untyped settings, untyped agent_settings) -> bool
       end
     end
   end

data/sig/datadog/ci/ext/environment/providers/aws_code_pipeline.rbs

@@ -0,0 +1,19 @@
+module Datadog
+  module CI
+    module Ext
+      module Environment
+        module Providers
+          class AwsCodePipeline < Base
+            def self.handles?: (Hash[String, String?] env) -> bool
+
+            def provider_name: () -> "awscodepipeline"
+
+            def pipeline_id: () -> String?
+
+            def ci_env_vars: () -> String?
+          end
+        end
+      end
+    end
+  end
+end

data/sig/datadog/ci/ext/environment/providers/base.rbs

@@ -8,6 +8,8 @@ module Datadog
             @branch: String?
             @tag: String?
 
+            def self.handles?: (Hash[String, String?] env) -> bool
+
             def initialize: (Hash[String, String?] env) -> void
 
             def job_name: () -> nil

data/sig/datadog/ci/ext/environment/providers.rbs

@@ -3,7 +3,7 @@ module Datadog
     module Ext
       module Environment
         module Providers
-          PROVIDERS: ::Array[[String, untyped]]
+          PROVIDERS: ::Array[untyped]
 
           def self.for_environment: (Hash[String, String?] env) -> Providers::Base
         end

data/sig/datadog/ci/ext/transport.rbs

@@ -2,12 +2,20 @@ module Datadog
   module CI
     module Ext
       module Transport
+        DEFAULT_DD_SITE: "datadoghq.com"
+
         HEADER_DD_API_KEY: "DD-API-KEY"
 
         HEADER_CONTENT_TYPE: "Content-Type"
 
         HEADER_CONTENT_ENCODING: "Content-Encoding"
 
+        HEADER_EVP_SUBDOMAIN: "X-Datadog-EVP-Subdomain"
+
+        HEADER_CONTAINER_ID: "Datadog-Container-ID"
+
+        EVP_PROXY_PATH_PREFIX: "/evp_proxy/v2/"
+
         TEST_VISIBILITY_INTAKE_HOST_PREFIX: "citestcycle-intake"
 
         TEST_VISIBILITY_INTAKE_PATH: "/api/v2/citestcycle"

data/sig/datadog/ci/test_visibility/transport.rbs

@@ -5,30 +5,26 @@ module Datadog
         DEFAULT_MAX_PAYLOAD_SIZE: Integer
 
         attr_reader serializers_factory: singleton(Datadog::CI::TestVisibility::Serializers::Factories::TestLevel)
-        attr_reader api_key: String
-        attr_reader env: String?
-        attr_reader http: Datadog::CI::Transport::HTTP
+        attr_reader dd_env: String?
+        attr_reader api: Datadog::CI::Transport::Api::Base
         attr_reader max_payload_size: Integer
 
-        @api_key: String
-        @env: String?
-        @http: Datadog::CI::Transport::HTTP
+        @dd_env: String?
         @serializers_factory: singleton(Datadog::CI::TestVisibility::Serializers::Factories::TestLevel)
         @max_payload_size: Integer
 
         def initialize: (
-          api_key: String,
-          url: ::String,
-          ?env: ::String?,
+          api: Datadog::CI::Transport::Api::Base,
+          ?dd_env: ::String?,
           ?serializers_factory: singleton(Datadog::CI::TestVisibility::Serializers::Factories::TestLevel),
           ?max_payload_size: Integer
         ) -> void
 
-        def send_traces: (Array[Datadog::Tracing::TraceSegment] traces) -> ::Array[Datadog::CI::Transport::HTTP::Response]
+        def send_traces: (Array[Datadog::Tracing::TraceSegment] traces) -> ::Array[Datadog::CI::Transport::HTTP::ResponseDecorator]
 
         private
 
-        def send_payload: (String encoded_payload) -> Datadog::CI::Transport::HTTP::Response
+        def send_payload: (String encoded_payload) -> Datadog::CI::Transport::HTTP::ResponseDecorator
         def pack_events: (Array[String] encoded_events) -> String
         def encode_traces: (Array[Datadog::Tracing::TraceSegment] traces) -> ::Array[String]
         def encode_span: (Datadog::Tracing::TraceSegment trace, Datadog::Tracing::Span span) -> String?

data/sig/datadog/ci/transport/api/base.rbs

@@ -0,0 +1,21 @@
+module Datadog
+  module CI
+    module Transport
+      module Api
+        class Base
+          attr_reader http: Datadog::CI::Transport::HTTP
+
+          @http: Datadog::CI::Transport::HTTP
+
+          def initialize: (http: Datadog::CI::Transport::HTTP) -> void
+
+          def request: (path: String, payload: String, ?verb: ::String) -> untyped
+
+          private
+
+          def headers: () -> Hash[String, String]
+        end
+      end
+    end
+  end
+end

data/sig/datadog/ci/transport/api/builder.rbs

@@ -0,0 +1,12 @@
+module Datadog
+  module CI
+    module Transport
+      module Api
+        module Builder
+          def self.build_ci_test_cycle_api: (untyped settings) -> Datadog::CI::Transport::Api::CiTestCycle
+          def self.build_evp_proxy_api: (untyped agent_settings) -> Datadog::CI::Transport::Api::EvpProxy
+        end
+      end
+    end
+  end
+end

data/sig/datadog/ci/transport/api/ci_test_cycle.rbs

@@ -0,0 +1,21 @@
+module Datadog
+  module CI
+    module Transport
+      module Api
+        class CiTestCycle < Base
+          attr_reader api_key: String
+
+          @api_key: String
+
+          def initialize: (api_key: String, http: Datadog::CI::Transport::HTTP) -> void
+
+          def request: (path: String, payload: String, ?verb: ::String) -> Datadog::CI::Transport::HTTP::ResponseDecorator
+
+          private
+
+          def headers: () -> Hash[String, String]
+        end
+      end
+    end
+  end
+end

data/sig/datadog/ci/transport/api/evp_proxy.rbs

@@ -0,0 +1,19 @@
+module Datadog
+  module CI
+    module Transport
+      module Api
+        class EvpProxy < Base
+          @container_id: String?
+
+          def request: (path: String, payload: String, ?verb: ::String) -> Datadog::CI::Transport::HTTP::ResponseDecorator
+
+          private
+
+          def container_id: () -> String?
+
+          def headers: () -> Hash[String, String]
+        end
+      end
+    end
+  end
+end

data/sig/datadog/ci/transport/http.rbs

@@ -1,7 +1,12 @@
+class SimpleDelegator
+end
+
 module Datadog
   module CI
     module Transport
       class HTTP
+        @adapter: Datadog::Core::Transport::HTTP::Adapters::Net
+
         attr_reader host: String
         attr_reader port: Integer?
         attr_reader ssl: bool
@@ -12,50 +17,20 @@ module Datadog
 
         def initialize: (host: String, ?port: Integer?, ?ssl: bool, ?timeout: Integer, ?compress: bool) -> void
 
-        def request: (?method: String, payload: String, headers: Hash[String, String], path: String) -> Response
+        def request: (?verb: String, payload: String, headers: Hash[String, String], path: String) -> ResponseDecorator
 
         private
 
-        def open: () { (::Net::HTTP) -> Net::HTTPResponse } -> Net::HTTPResponse
-
-        def post: (payload: String, headers: Hash[String, String], path: String) -> Response
-
-        class Response
-          attr_reader http_response: (Net::HTTPResponse | InternalErrorResponse::DummyNetHTTPResponse)
-
-          def initialize: ((Net::HTTPResponse | InternalErrorResponse::DummyNetHTTPResponse) http_response) -> void
-
-          def payload: () -> String
-
-          def code: () -> Integer
-
-          def ok?: () -> bool
+        def adapter: () -> Datadog::Core::Transport::HTTP::Adapters::Net
 
-          def unsupported?: () -> bool
+        def build_env: (payload: String, headers: Hash[String, String], path: String, verb: String) -> Datadog::Core::Transport::HTTP::Env
 
-          def not_found?: () -> bool
-
-          def client_error?: () -> bool
-
-          def server_error?: () -> bool
-
-          def internal_error?: () -> bool
-
-          def inspect: () -> ::String
-        end
-
-        class InternalErrorResponse < Response
-          class DummyNetHTTPResponse
-            def body: () -> ""
-            def code: () -> "-1"
-          end
-
-          attr_reader error: StandardError
-          @error: StandardError
-
-          def initialize: (StandardError error) -> void
+        class ResponseDecorator < ::SimpleDelegator
+          def initialize: (untyped anything) -> void
+          def trace_count: () -> Integer
         end
       end
     end
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog-ci
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -67,6 +67,7 @@ files:
 - lib/datadog/ci/ext/environment/extractor.rb
 - lib/datadog/ci/ext/environment/providers.rb
 - lib/datadog/ci/ext/environment/providers/appveyor.rb
+- lib/datadog/ci/ext/environment/providers/aws_code_pipeline.rb
 - lib/datadog/ci/ext/environment/providers/azure.rb
 - lib/datadog/ci/ext/environment/providers/base.rb
 - lib/datadog/ci/ext/environment/providers/bitbucket.rb
@@ -94,6 +95,10 @@ files:
 - lib/datadog/ci/test_visibility/serializers/span.rb
 - lib/datadog/ci/test_visibility/serializers/test_v1.rb
 - lib/datadog/ci/test_visibility/transport.rb
+- lib/datadog/ci/transport/api/base.rb
+- lib/datadog/ci/transport/api/builder.rb
+- lib/datadog/ci/transport/api/ci_test_cycle.rb
+- lib/datadog/ci/transport/api/evp_proxy.rb
 - lib/datadog/ci/transport/gzip.rb
 - lib/datadog/ci/transport/http.rb
 - lib/datadog/ci/utils/git.rb
@@ -124,6 +129,7 @@ files:
 - sig/datadog/ci/ext/environment/extractor.rbs
 - sig/datadog/ci/ext/environment/providers.rbs
 - sig/datadog/ci/ext/environment/providers/appveyor.rbs
+- sig/datadog/ci/ext/environment/providers/aws_code_pipeline.rbs
 - sig/datadog/ci/ext/environment/providers/azure.rbs
 - sig/datadog/ci/ext/environment/providers/base.rbs
 - sig/datadog/ci/ext/environment/providers/bitbucket.rbs
@@ -151,6 +157,10 @@ files:
 - sig/datadog/ci/test_visibility/serializers/span.rbs
 - sig/datadog/ci/test_visibility/serializers/test_v1.rbs
 - sig/datadog/ci/test_visibility/transport.rbs
+- sig/datadog/ci/transport/api/base.rbs
+- sig/datadog/ci/transport/api/builder.rbs
+- sig/datadog/ci/transport/api/ci_test_cycle.rbs
+- sig/datadog/ci/transport/api/evp_proxy.rbs
 - sig/datadog/ci/transport/gzip.rbs
 - sig/datadog/ci/transport/http.rbs
 - sig/datadog/ci/utils/git.rbs
@@ -181,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.4.18
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Datadog CI visibility for your ruby application