ddtrace 1.14.0 → 1.16.2

data/lib/datadog/tracing/writer.rb

@@ -2,7 +2,7 @@ require_relative 'event'
 require_relative 'runtime/metrics'
 require_relative 'workers'
 
-require_relative '../../ddtrace/transport/http'
+require_relative 'transport/http'
 
 module Datadog
   module Tracing
@@ -28,6 +28,8 @@ module Datadog
           Transport::HTTP.default(**transport_options)
         end
 
+        @shutdown_timeout = options.fetch(:shutdown_timeout, Workers::AsyncTransport::DEFAULT_SHUTDOWN_TIMEOUT)
+
         # handles the thread creation after an eventual fork
         @mutex_after_fork = Mutex.new
         @pid = nil
@@ -72,7 +74,8 @@ module Datadog
           transport: @transport,
           buffer_size: @buff_size,
           on_trace: @trace_handler,
-          interval: @flush_interval
+          interval: @flush_interval,
+          shutdown_timeout: @shutdown_timeout
         )
 
         @worker.start

data/lib/ddtrace/transport/ext.rb

@@ -1,44 +1,46 @@
 # frozen_string_literal: true
 
+require_relative '../../datadog/core/transport/ext'
+# DEV(2.0): This file should be replaced by /datadog/core/transport/ext.rb.
 module Datadog
   module Transport
     # @public_api
     module Ext
       # @public_api
       module HTTP
-        ADAPTER = :net_http # DEV: Rename to simply `:http`, as Net::HTTP is an implementation detail.
-        DEFAULT_HOST = '127.0.0.1'
-        DEFAULT_PORT = 8126
+        ADAPTER = Datadog::Core::Transport::Ext::HTTP::ADAPTER
+        DEFAULT_HOST = Datadog::Core::Transport::Ext::HTTP::DEFAULT_HOST
+        DEFAULT_PORT = Datadog::Core::Transport::Ext::HTTP::DEFAULT_PORT
 
-        HEADER_CONTAINER_ID = 'Datadog-Container-ID'
-        HEADER_DD_API_KEY = 'DD-API-KEY'
+        HEADER_CONTAINER_ID = Datadog::Core::Transport::Ext::HTTP::HEADER_CONTAINER_ID
+        HEADER_DD_API_KEY = Datadog::Core::Transport::Ext::HTTP::HEADER_DD_API_KEY
         # Tells agent that `_dd.top_level` metrics have been set by the tracer.
         # The agent will not calculate top-level spans but instead trust the tracer tagging.
         #
         # This prevents partially flushed traces being mistakenly marked as top-level.
         #
         # Setting this header to any non-empty value enables this feature.
-        HEADER_CLIENT_COMPUTED_TOP_LEVEL = 'Datadog-Client-Computed-Top-Level'
-        HEADER_META_LANG = 'Datadog-Meta-Lang'
-        HEADER_META_LANG_VERSION = 'Datadog-Meta-Lang-Version'
-        HEADER_META_LANG_INTERPRETER = 'Datadog-Meta-Lang-Interpreter'
-        HEADER_META_TRACER_VERSION = 'Datadog-Meta-Tracer-Version'
+        HEADER_CLIENT_COMPUTED_TOP_LEVEL = Datadog::Core::Transport::Ext::HTTP::HEADER_CLIENT_COMPUTED_TOP_LEVEL
+        HEADER_META_LANG = Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG
+        HEADER_META_LANG_VERSION = Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_VERSION
+        HEADER_META_LANG_INTERPRETER = Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER
+        HEADER_META_TRACER_VERSION = Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION
 
         # Header that prevents the Net::HTTP integration from tracing internal trace requests.
         # Set it to any value to skip tracing.
-        HEADER_DD_INTERNAL_UNTRACED_REQUEST = 'DD-Internal-Untraced-Request'
+        HEADER_DD_INTERNAL_UNTRACED_REQUEST = Datadog::Core::Transport::Ext::HTTP::HEADER_DD_INTERNAL_UNTRACED_REQUEST
       end
 
       # @public_api
       module Test
-        ADAPTER = :test
+        ADAPTER = Datadog::Core::Transport::Ext::Test::ADAPTER
       end
 
       # @public_api
       module UnixSocket
-        ADAPTER = :unix
-        DEFAULT_PATH = '/var/run/datadog/apm.socket'
-        DEFAULT_TIMEOUT_SECONDS = 1
+        ADAPTER = Datadog::Core::Transport::Ext::UnixSocket::ADAPTER
+        DEFAULT_PATH = Datadog::Core::Transport::Ext::UnixSocket::DEFAULT_PATH
+        DEFAULT_TIMEOUT_SECONDS = Datadog::Core::Transport::Ext::UnixSocket::DEFAULT_TIMEOUT_SECONDS
       end
     end
   end

data/lib/ddtrace/version.rb

@@ -3,8 +3,8 @@
 module DDTrace
   module VERSION
     MAJOR = 1
-    MINOR = 14
-    PATCH = 0
+    MINOR = 16
+    PATCH = 2
     PRE = nil
     BUILD = nil
     # PRE and BUILD above are modified for dev gems during gem build GHA workflow

data/lib/ddtrace.rb

@@ -7,5 +7,5 @@ require_relative 'datadog/tracing/contrib'
 # Load other products (must follow tracing)
 require_relative 'datadog/profiling'
 require_relative 'datadog/appsec'
-require_relative 'datadog/ci'
+require 'datadog/ci'
 require_relative 'datadog/kit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.16.2
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -30,42 +30,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.1
+        version: 3.2.2
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0.0.0
+        version: 1.14.0.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0.0.0
+        version: 1.14.0.0.0
 - !ruby/object:Gem::Dependency
   name: libdatadog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.1.0
+        version: 5.0.0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.1.0
+        version: 5.0.0.1.0
+- !ruby/object:Gem::Dependency
+  name: datadog-ci
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 description: |
   ddtrace is Datadog's tracing client for Ruby. It is used to trace requests
   as they flow across web servers, databases and microservices so that developers
@@ -105,8 +119,11 @@ files:
 - ext/ddtrace_profiling_native_extension/extconf.rb
 - ext/ddtrace_profiling_native_extension/helpers.h
 - ext/ddtrace_profiling_native_extension/http_transport.c
+- ext/ddtrace_profiling_native_extension/libdatadog_helpers.c
 - ext/ddtrace_profiling_native_extension/libdatadog_helpers.h
 - ext/ddtrace_profiling_native_extension/native_extension_helpers.rb
+- ext/ddtrace_profiling_native_extension/pid_controller.c
+- ext/ddtrace_profiling_native_extension/pid_controller.h
 - ext/ddtrace_profiling_native_extension/private_vm_api_access.c
 - ext/ddtrace_profiling_native_extension/private_vm_api_access.h
 - ext/ddtrace_profiling_native_extension/profiling.c
@@ -124,7 +141,9 @@ files:
 - lib/datadog/appsec/assets/blocked.json
 - lib/datadog/appsec/assets/blocked.text
 - lib/datadog/appsec/assets/waf_rules/README.md
+- lib/datadog/appsec/assets/waf_rules/processors.json
 - lib/datadog/appsec/assets/waf_rules/recommended.json
+- lib/datadog/appsec/assets/waf_rules/scanners.json
 - lib/datadog/appsec/assets/waf_rules/strict.json
 - lib/datadog/appsec/autoload.rb
 - lib/datadog/appsec/component.rb
@@ -180,6 +199,7 @@ files:
 - lib/datadog/appsec/monitor/gateway/watcher.rb
 - lib/datadog/appsec/monitor/reactive/set_user.rb
 - lib/datadog/appsec/processor.rb
+- lib/datadog/appsec/processor/actions.rb
 - lib/datadog/appsec/processor/rule_loader.rb
 - lib/datadog/appsec/processor/rule_merger.rb
 - lib/datadog/appsec/rate_limiter.rb
@@ -189,37 +209,12 @@ files:
 - lib/datadog/appsec/reactive/subscriber.rb
 - lib/datadog/appsec/remote.rb
 - lib/datadog/appsec/response.rb
+- lib/datadog/appsec/sample_rate.rb
 - lib/datadog/appsec/scope.rb
 - lib/datadog/appsec/utils.rb
 - lib/datadog/appsec/utils/http.rb
 - lib/datadog/appsec/utils/http/media_range.rb
 - lib/datadog/appsec/utils/http/media_type.rb
-- lib/datadog/ci.rb
-- lib/datadog/ci/configuration/components.rb
-- lib/datadog/ci/configuration/settings.rb
-- lib/datadog/ci/contrib/cucumber/configuration/settings.rb
-- lib/datadog/ci/contrib/cucumber/ext.rb
-- lib/datadog/ci/contrib/cucumber/formatter.rb
-- lib/datadog/ci/contrib/cucumber/instrumentation.rb
-- lib/datadog/ci/contrib/cucumber/integration.rb
-- lib/datadog/ci/contrib/cucumber/patcher.rb
-- lib/datadog/ci/contrib/minitest/configuration/settings.rb
-- lib/datadog/ci/contrib/minitest/ext.rb
-- lib/datadog/ci/contrib/minitest/integration.rb
-- lib/datadog/ci/contrib/minitest/patcher.rb
-- lib/datadog/ci/contrib/minitest/test_helper.rb
-- lib/datadog/ci/contrib/rspec/configuration/settings.rb
-- lib/datadog/ci/contrib/rspec/example.rb
-- lib/datadog/ci/contrib/rspec/ext.rb
-- lib/datadog/ci/contrib/rspec/integration.rb
-- lib/datadog/ci/contrib/rspec/patcher.rb
-- lib/datadog/ci/ext/app_types.rb
-- lib/datadog/ci/ext/environment.rb
-- lib/datadog/ci/ext/settings.rb
-- lib/datadog/ci/ext/test.rb
-- lib/datadog/ci/extensions.rb
-- lib/datadog/ci/flush.rb
-- lib/datadog/ci/test.rb
 - lib/datadog/core.rb
 - lib/datadog/core/backport.rb
 - lib/datadog/core/buffer/cruby.rb
@@ -230,12 +225,9 @@ files:
 - lib/datadog/core/configuration/agent_settings_resolver.rb
 - lib/datadog/core/configuration/base.rb
 - lib/datadog/core/configuration/components.rb
-- lib/datadog/core/configuration/dependency_resolver.rb
 - lib/datadog/core/configuration/ext.rb
 - lib/datadog/core/configuration/option.rb
 - lib/datadog/core/configuration/option_definition.rb
-- lib/datadog/core/configuration/option_definition_set.rb
-- lib/datadog/core/configuration/option_set.rb
 - lib/datadog/core/configuration/options.rb
 - lib/datadog/core/configuration/settings.rb
 - lib/datadog/core/diagnostics/environment_logger.rb
@@ -280,6 +272,16 @@ files:
 - lib/datadog/core/remote/dispatcher.rb
 - lib/datadog/core/remote/ext.rb
 - lib/datadog/core/remote/negotiation.rb
+- lib/datadog/core/remote/transport/config.rb
+- lib/datadog/core/remote/transport/http.rb
+- lib/datadog/core/remote/transport/http/api.rb
+- lib/datadog/core/remote/transport/http/api/instance.rb
+- lib/datadog/core/remote/transport/http/api/spec.rb
+- lib/datadog/core/remote/transport/http/builder.rb
+- lib/datadog/core/remote/transport/http/client.rb
+- lib/datadog/core/remote/transport/http/config.rb
+- lib/datadog/core/remote/transport/http/negotiation.rb
+- lib/datadog/core/remote/transport/negotiation.rb
 - lib/datadog/core/remote/worker.rb
 - lib/datadog/core/runtime/ext.rb
 - lib/datadog/core/runtime/metrics.rb
@@ -304,27 +306,28 @@ files:
 - lib/datadog/core/telemetry/v1/telemetry_request.rb
 - lib/datadog/core/telemetry/v2/app_client_configuration_change.rb
 - lib/datadog/core/telemetry/v2/request.rb
-- lib/datadog/core/transport/config.rb
-- lib/datadog/core/transport/http.rb
-- lib/datadog/core/transport/http/api.rb
-- lib/datadog/core/transport/http/api/instance.rb
-- lib/datadog/core/transport/http/api/spec.rb
-- lib/datadog/core/transport/http/builder.rb
-- lib/datadog/core/transport/http/client.rb
-- lib/datadog/core/transport/http/config.rb
-- lib/datadog/core/transport/http/negotiation.rb
-- lib/datadog/core/transport/negotiation.rb
+- lib/datadog/core/transport/ext.rb
+- lib/datadog/core/transport/http/adapters/net.rb
+- lib/datadog/core/transport/http/adapters/registry.rb
+- lib/datadog/core/transport/http/adapters/test.rb
+- lib/datadog/core/transport/http/adapters/unix_socket.rb
+- lib/datadog/core/transport/http/api/endpoint.rb
+- lib/datadog/core/transport/http/api/fallbacks.rb
+- lib/datadog/core/transport/http/api/map.rb
+- lib/datadog/core/transport/http/env.rb
+- lib/datadog/core/transport/http/response.rb
+- lib/datadog/core/transport/parcel.rb
+- lib/datadog/core/transport/request.rb
+- lib/datadog/core/transport/response.rb
 - lib/datadog/core/utils.rb
 - lib/datadog/core/utils/compression.rb
 - lib/datadog/core/utils/duration.rb
 - lib/datadog/core/utils/forking.rb
 - lib/datadog/core/utils/hash.rb
 - lib/datadog/core/utils/network.rb
-- lib/datadog/core/utils/object_set.rb
 - lib/datadog/core/utils/only_once.rb
 - lib/datadog/core/utils/safe_dup.rb
 - lib/datadog/core/utils/sequence.rb
-- lib/datadog/core/utils/string_table.rb
 - lib/datadog/core/utils/time.rb
 - lib/datadog/core/vendor/ipaddr.rb
 - lib/datadog/core/vendor/multipart-post/LICENSE
@@ -352,6 +355,8 @@ files:
 - lib/datadog/opentelemetry/sdk/id_generator.rb
 - lib/datadog/opentelemetry/sdk/propagator.rb
 - lib/datadog/opentelemetry/sdk/span_processor.rb
+- lib/datadog/opentelemetry/sdk/trace/span.rb
+- lib/datadog/opentelemetry/trace.rb
 - lib/datadog/opentracer.rb
 - lib/datadog/opentracer/binary_propagator.rb
 - lib/datadog/opentracer/carrier.rb
@@ -369,20 +374,14 @@ files:
 - lib/datadog/opentracer/thread_local_scope_manager.rb
 - lib/datadog/opentracer/tracer.rb
 - lib/datadog/profiling.rb
-- lib/datadog/profiling/backtrace_location.rb
-- lib/datadog/profiling/buffer.rb
 - lib/datadog/profiling/collectors/code_provenance.rb
 - lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb
 - lib/datadog/profiling/collectors/dynamic_sampling_rate.rb
 - lib/datadog/profiling/collectors/idle_sampling_helper.rb
-- lib/datadog/profiling/collectors/old_stack.rb
 - lib/datadog/profiling/collectors/stack.rb
 - lib/datadog/profiling/collectors/thread_context.rb
 - lib/datadog/profiling/component.rb
 - lib/datadog/profiling/diagnostics/environment_logger.rb
-- lib/datadog/profiling/encoding/profile.rb
-- lib/datadog/profiling/event.rb
-- lib/datadog/profiling/events/stack.rb
 - lib/datadog/profiling/exporter.rb
 - lib/datadog/profiling/ext.rb
 - lib/datadog/profiling/ext/forking.rb
@@ -390,16 +389,6 @@ files:
 - lib/datadog/profiling/http_transport.rb
 - lib/datadog/profiling/load_native_extension.rb
 - lib/datadog/profiling/native_extension.rb
-- lib/datadog/profiling/old_recorder.rb
-- lib/datadog/profiling/pprof/builder.rb
-- lib/datadog/profiling/pprof/converter.rb
-- lib/datadog/profiling/pprof/message_set.rb
-- lib/datadog/profiling/pprof/payload.rb
-- lib/datadog/profiling/pprof/pprof.proto
-- lib/datadog/profiling/pprof/pprof_pb.rb
-- lib/datadog/profiling/pprof/stack_sample.rb
-- lib/datadog/profiling/pprof/string_table.rb
-- lib/datadog/profiling/pprof/template.rb
 - lib/datadog/profiling/preload.rb
 - lib/datadog/profiling/profiler.rb
 - lib/datadog/profiling/scheduler.rb
@@ -408,13 +397,12 @@ files:
 - lib/datadog/profiling/tasks/exec.rb
 - lib/datadog/profiling/tasks/help.rb
 - lib/datadog/profiling/tasks/setup.rb
-- lib/datadog/profiling/trace_identifiers/ddtrace.rb
-- lib/datadog/profiling/trace_identifiers/helper.rb
 - lib/datadog/tracing.rb
 - lib/datadog/tracing/analytics.rb
 - lib/datadog/tracing/buffer.rb
 - lib/datadog/tracing/client_ip.rb
 - lib/datadog/tracing/component.rb
+- lib/datadog/tracing/configuration/agent_settings_resolver.rb
 - lib/datadog/tracing/configuration/dynamic.rb
 - lib/datadog/tracing/configuration/dynamic/option.rb
 - lib/datadog/tracing/configuration/ext.rb
@@ -526,6 +514,7 @@ files:
 - lib/datadog/tracing/contrib/concurrent_ruby/future_patch.rb
 - lib/datadog/tracing/contrib/concurrent_ruby/integration.rb
 - lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb
+- lib/datadog/tracing/contrib/concurrent_ruby/promises_future_patch.rb
 - lib/datadog/tracing/contrib/configurable.rb
 - lib/datadog/tracing/contrib/configuration/resolver.rb
 - lib/datadog/tracing/contrib/configuration/resolvers/pattern_resolver.rb
@@ -851,6 +840,22 @@ files:
 - lib/datadog/tracing/trace_operation.rb
 - lib/datadog/tracing/trace_segment.rb
 - lib/datadog/tracing/tracer.rb
+- lib/datadog/tracing/transport/http.rb
+- lib/datadog/tracing/transport/http/api.rb
+- lib/datadog/tracing/transport/http/api/instance.rb
+- lib/datadog/tracing/transport/http/api/spec.rb
+- lib/datadog/tracing/transport/http/builder.rb
+- lib/datadog/tracing/transport/http/client.rb
+- lib/datadog/tracing/transport/http/statistics.rb
+- lib/datadog/tracing/transport/http/traces.rb
+- lib/datadog/tracing/transport/io.rb
+- lib/datadog/tracing/transport/io/client.rb
+- lib/datadog/tracing/transport/io/response.rb
+- lib/datadog/tracing/transport/io/traces.rb
+- lib/datadog/tracing/transport/serializable_trace.rb
+- lib/datadog/tracing/transport/statistics.rb
+- lib/datadog/tracing/transport/trace_formatter.rb
+- lib/datadog/tracing/transport/traces.rb
 - lib/datadog/tracing/utils.rb
 - lib/datadog/tracing/workers.rb
 - lib/datadog/tracing/workers/trace_writer.rb
@@ -860,34 +865,6 @@ files:
 - lib/ddtrace/auto_instrument_base.rb
 - lib/ddtrace/profiling/preload.rb
 - lib/ddtrace/transport/ext.rb
-- lib/ddtrace/transport/http.rb
-- lib/ddtrace/transport/http/adapters/net.rb
-- lib/ddtrace/transport/http/adapters/registry.rb
-- lib/ddtrace/transport/http/adapters/test.rb
-- lib/ddtrace/transport/http/adapters/unix_socket.rb
-- lib/ddtrace/transport/http/api.rb
-- lib/ddtrace/transport/http/api/endpoint.rb
-- lib/ddtrace/transport/http/api/fallbacks.rb
-- lib/ddtrace/transport/http/api/instance.rb
-- lib/ddtrace/transport/http/api/map.rb
-- lib/ddtrace/transport/http/api/spec.rb
-- lib/ddtrace/transport/http/builder.rb
-- lib/ddtrace/transport/http/client.rb
-- lib/ddtrace/transport/http/env.rb
-- lib/ddtrace/transport/http/response.rb
-- lib/ddtrace/transport/http/statistics.rb
-- lib/ddtrace/transport/http/traces.rb
-- lib/ddtrace/transport/io.rb
-- lib/ddtrace/transport/io/client.rb
-- lib/ddtrace/transport/io/response.rb
-- lib/ddtrace/transport/io/traces.rb
-- lib/ddtrace/transport/parcel.rb
-- lib/ddtrace/transport/request.rb
-- lib/ddtrace/transport/response.rb
-- lib/ddtrace/transport/serializable_trace.rb
-- lib/ddtrace/transport/statistics.rb
-- lib/ddtrace/transport/trace_formatter.rb
-- lib/ddtrace/transport/traces.rb
 - lib/ddtrace/version.rb
 homepage: https://github.com/DataDog/dd-trace-rb
 licenses:
@@ -913,7 +890,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.4.5
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications

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

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../flush'
-
-module Datadog
-  module CI
-    module Configuration
-      # Adds CI behavior to Datadog trace components
-      module Components
-        def initialize(settings)
-          # Activate CI mode if enabled
-          activate_ci!(settings) if settings.ci.enabled
-
-          # Initialize normally
-          super
-        end
-
-        def activate_ci!(settings)
-          # Activate underlying tracing test mode
-          settings.tracing.test_mode.enabled = true
-
-          # Choose user defined TraceFlush or default to CI TraceFlush
-          settings.tracing.test_mode.trace_flush = settings.ci.trace_flush \
-                                             || CI::Flush::Finished.new
-
-          # Pass through any other options
-          settings.tracing.test_mode.writer_options = settings.ci.writer_options
-        end
-      end
-    end
-  end
-end

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

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../ext/settings'
-
-module Datadog
-  module CI
-    module Configuration
-      # Adds CI behavior to Datadog trace settings
-      module Settings
-        def self.extended(base)
-          base = base.singleton_class unless base.is_a?(Class)
-          add_settings!(base)
-        end
-
-        def self.add_settings!(base)
-          base.class_eval do
-            settings :ci do
-              option :enabled do |o|
-                o.type :bool
-                o.env CI::Ext::Settings::ENV_MODE_ENABLED
-                o.default false
-              end
-
-              # DEV: Alias to Datadog::Tracing::Contrib::Extensions::Configuration::Settings#instrument.
-              # DEV: Should be removed when CI implement its own `c.ci.instrument`.
-              define_method(:instrument) do |integration_name, options = {}, &block|
-                Datadog.configuration.tracing.instrument(integration_name, options, &block)
-              end
-
-              # DEV: Alias to Datadog::Tracing::Contrib::Extensions::Configuration::Settings#instrument.
-              # DEV: Should be removed when CI implement its own `c.ci[]`.
-              define_method(:[]) do |integration_name, key = :default|
-                Datadog.configuration.tracing[integration_name, key]
-              end
-
-              # TODO: Deprecate in the next major version, as `instrument` better describes this method's purpose
-              alias_method :use, :instrument
-
-              option :trace_flush
-
-              option :writer_options do |o|
-                o.type :hash
-                o.default({})
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,35 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../../../tracing/contrib/configuration/settings'
-require_relative '../ext'
-
-module Datadog
-  module CI
-    module Contrib
-      module Cucumber
-        module Configuration
-          # Custom settings for the Cucumber integration
-          # TODO: mark as `@public_api` when GA
-          class Settings < Datadog::Tracing::Contrib::Configuration::Settings
-            option :enabled do |o|
-              o.type :bool
-              o.env Ext::ENV_ENABLED
-              o.default true
-            end
-
-            option :service_name do |o|
-              o.type :string
-              o.default { Datadog.configuration.service_without_fallback || Ext::SERVICE_NAME }
-            end
-
-            option :operation_name do |o|
-              o.type :string
-              o.env Ext::ENV_OPERATION_NAME
-              o.default Ext::OPERATION_NAME
-            end
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module CI
-    module Contrib
-      module Cucumber
-        # Cucumber integration constants
-        # TODO: mark as `@public_api` when GA, to protect from resource and tag name changes.
-        module Ext
-          APP = 'cucumber'
-          ENV_ENABLED = 'DD_TRACE_CUCUMBER_ENABLED'
-          ENV_OPERATION_NAME = 'DD_TRACE_CUCUMBER_OPERATION_NAME'
-          FRAMEWORK = 'cucumber'
-          OPERATION_NAME = 'cucumber.test'
-          SERVICE_NAME = 'cucumber'
-          STEP_SPAN_TYPE = 'step'
-          TEST_TYPE = 'test'
-        end
-      end
-    end
-  end
-end