cw-datadog 2.23.0.2 → 2.23.0.4

data/lib/datadog/tracing/contrib.rb

@@ -55,6 +55,7 @@ require_relative 'contrib/httpclient/integration'
 require_relative 'contrib/httprb/integration'
 require_relative 'contrib/integration'
 require_relative 'contrib/kafka/integration'
+require_relative 'contrib/waterdrop'
 require_relative 'contrib/karafka'
 require_relative 'contrib/lograge/integration'
 require_relative 'contrib/mongodb/integration'

data/lib/datadog/tracing/transport/http/api.rb

@@ -21,10 +21,13 @@ module Datadog
           module_function
 
           def defaults
+            # 获取 traces V4 路径（动态根据配置决定）
+            v4_traces_path = get_traces_v4_path
+
             Core::Transport::HTTP::API::Map[
               V4 => Traces::API::Spec.new do |s|
                 s.traces = Traces::API::Endpoint.new(
-                  '/api/v2/traces',
+                  v4_traces_path,
                   Core::Encoding::MsgpackEncoder,
                   service_rates: true
                 )
@@ -37,6 +40,75 @@ module Datadog
               end,
             ].with_fallbacks(V4 => V3)
           end
+
+          # 获取 Traces V4 API 路径
+          # 优先级：api_prefix_mode > api_prefix > integrated_mode > 默认
+          def get_traces_v4_path
+            base_path = '/api/v2/traces'
+
+            return base_path unless defined?(Datadog.configuration) &&
+                                   Datadog.configuration.respond_to?(:cloudwise)
+
+            # 优先级 1: api_prefix_mode 模式配置（最高优先级，简化配置）
+            if Datadog.configuration.cloudwise.respond_to?(:api_prefix_mode)
+              api_prefix_mode = Datadog.configuration.cloudwise.api_prefix_mode
+              if api_prefix_mode && !api_prefix_mode.empty?
+                prefix = get_prefix_by_mode(api_prefix_mode)
+                return "#{prefix}#{base_path}" if prefix
+              end
+            end
+
+            # 优先级 2: 显式配置的 api_prefix（自定义前缀）
+            if Datadog.configuration.cloudwise.respond_to?(:api_prefix)
+              api_prefix = Datadog.configuration.cloudwise.api_prefix
+              if api_prefix && !api_prefix.empty?
+                prefix = api_prefix.start_with?('/') ? api_prefix : "/#{api_prefix}"
+                return "#{prefix}#{base_path}"
+              end
+            end
+
+            # 优先级 3: integrated_mode 使用 /apm 前缀
+            if cloudwise_integrated_mode?
+              return "/apm#{base_path}"
+            end
+
+            # 优先级 4: 无前缀（默认）
+            base_path
+          end
+
+          # 根据模式获取前缀
+          # @param mode [String] 前缀模式：'doop', 'apm', 'custom'
+          # @return [String, nil] 前缀字符串，如果模式无效返回 nil
+          def get_prefix_by_mode(mode)
+            case mode.to_s.downcase
+            when 'doop'
+              '/doop-agent-api'
+            when 'apm'
+              '/apm'
+            when 'custom'
+              # 使用 api_prefix 配置的自定义前缀
+              if Datadog.configuration.cloudwise.respond_to?(:api_prefix)
+                api_prefix = Datadog.configuration.cloudwise.api_prefix
+                if api_prefix && !api_prefix.empty?
+                  return api_prefix.start_with?('/') ? api_prefix : "/#{api_prefix}"
+                end
+              end
+              nil
+            else
+              nil
+            end
+          end
+
+          # 检查是否启用 integrated_mode
+          def cloudwise_integrated_mode?
+            return false unless defined?(Datadog.configuration) &&
+                                Datadog.configuration.respond_to?(:cloudwise)
+
+            integrated_mode = Datadog.configuration.cloudwise.integrated_mode
+            token = Datadog.configuration.cloudwise.token
+
+            integrated_mode && token && !token.empty?
+          end
         end
       end
     end

data/lib/datadog/tracing/transport/http/client.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'statistics'
+require_relative '../../../core/transport/http/client'
 require_relative '../../../core/transport/http/env'
 require_relative '../../../core/transport/http/response'
 
@@ -9,33 +10,24 @@ module Datadog
     module Transport
       module HTTP
         # Routes, encodes, and sends tracer data to the trace agent via HTTP.
-        class Client
+        class Client < Core::Transport::HTTP::Client
           include Datadog::Tracing::Transport::HTTP::Statistics
 
-          attr_reader :api, :logger
+          private
 
-          def initialize(api, logger: Datadog.logger)
-            @api = api
-            @logger = logger
-          end
-
-          def send_request(request, &block)
-            # Build request into env
-            env = build_env(request)
-
-            # Get responses from API
-            response = yield(api, env)
+          def on_response(response)
+            super
 
             # Update statistics
             update_stats_from_response!(response)
+          end
 
-            response
-          rescue => e
-            message =
-              "Internal error during #{self.class.name} request. Cause: #{e.class.name} #{e.message} " \
-                "Location: #{Array(e.backtrace).first}"
+          def on_exception(exception)
+            # Note: this method does NOT call super - it has replacement
+            # logic for how to log the exception.
+
+            message = build_exception_message(exception)
 
-            # Log error
             if stats.consecutive_errors > 0
               logger.debug(message)
             else
@@ -44,13 +36,7 @@ module Datadog
             end
 
             # Update statistics
-            update_stats_from_exception!(e)
-
-            Datadog::Core::Transport::InternalErrorResponse.new(e)
-          end
-
-          def build_env(request)
-            Datadog::Core::Transport::HTTP::Env.new(request)
+            update_stats_from_exception!(exception)
           end
         end
       end

data/lib/datadog/tracing/transport/http/traces.rb

@@ -100,6 +100,8 @@ module Datadog
                 # Add routing key header
                 env.headers['routingKey'] = 'rubyTopic'
 
+                env.headers['AccountId'] =  ENV['CLOUDWISE_ACCOUNT_ID'] || '110'
+
                 # Encode body & type
                 env.headers[HEADER_CONTENT_TYPE] = encoder.content_type
                 env.body = env.request.parcel.data
@@ -126,10 +128,10 @@ module Datadog
                 # Check if Cloudwise component exists and probe is suspended
                 return false unless defined?(Datadog.components)
                 return false unless Datadog.components.respond_to?(:cloudwise)
-                
+
                 cloudwise = Datadog.components.cloudwise
                 return false unless cloudwise&.enabled?
-                
+
                 cloudwise.probe_state.suspended?
               rescue => e
                 # If any error occurs, don't block trace submission

data/lib/datadog/tracing/transport/trace_formatter.rb

@@ -230,6 +230,22 @@ module Datadog
             app_id = Contrib::Cloudwise::Propagation.generate_app_id(service_name)
             root_span.set_tag('app_id', app_id) if app_id
           end
+
+          # Add new Cloudwise fields: service_instance_id, service_type_from, parent_sys, sys
+          # Generate service_instance_id based on IP + process path + PID
+          service_instance_id = Contrib::Cloudwise::Propagation.generate_service_instance_id
+          root_span.set_tag('service_instance_id', service_instance_id) if service_instance_id
+
+          # Get sys from environment variable (default: 'default')
+          sys = Contrib::Cloudwise::Propagation.get_sys
+          root_span.set_tag('sys', sys) if sys
+
+          unless root_span.get_tag('service_type_from')
+            root_span.set_tag('service_type_from', '')
+          end
+          unless root_span.get_tag('parent_sys')
+            root_span.set_tag('parent_sys', '')
+          end
         end
 
         def tag_git_repository_url!

data/lib/datadog/version.rb

@@ -5,7 +5,7 @@ module Datadog
     MAJOR = 2
     MINOR = 23
     PATCH = 0
-    PATCH_MINOR = 2
+    PATCH_MINOR = 4
     PRE = nil
     BUILD = nil
     # PRE and BUILD above are modified for dev gems during gem build GHA workflow
@@ -22,6 +22,6 @@ module Datadog
     # To allow testing with the next unreleased version of Ruby, the version check is performed
     # as `< #{MAXIMUM_RUBY_VERSION}`, meaning prereleases of MAXIMUM_RUBY_VERSION are allowed
     # but not stable MAXIMUM_RUBY_VERSION releases.
-    MAXIMUM_RUBY_VERSION = '3.5'
+    MAXIMUM_RUBY_VERSION = '4.0'
   end
 end

data/lib/datadog.rb

@@ -9,6 +9,7 @@ require_relative 'datadog/profiling'
 require_relative 'datadog/appsec'
 require_relative 'datadog/di'
 require_relative 'datadog/data_streams'
+require_relative 'datadog/open_feature'
 
 # Line probes will not work on Ruby < 2.6 because of lack of :script_compiled
 # trace point. Activate DI automatically on supported Ruby versions but

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cw-datadog
 version: !ruby/object:Gem::Version
-  version: 2.23.0.2
+  version: 2.23.0.4
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-21 00:00:00.000000000 Z
+date: 2025-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -50,28 +50,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.1.1.0
+        version: 1.30.0.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.25.1.1.0
+        version: 1.30.0.0.0
 - !ruby/object:Gem::Dependency
   name: libdatadog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 23.0.0.1.0
+        version: 24.0.1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 23.0.0.1.0
+        version: 24.0.1.1.0
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -284,12 +284,12 @@ files:
 - lib/datadog/core/buffer/random.rb
 - lib/datadog/core/buffer/thread_safe.rb
 - lib/datadog/core/chunker.rb
-- lib/datadog/core/cloudwise/IMPLEMENTATION_V2.md
-- lib/datadog/core/cloudwise/QUICKSTART.md
-- lib/datadog/core/cloudwise/README.md
 - lib/datadog/core/cloudwise/app_registration_worker.rb
 - lib/datadog/core/cloudwise/client.rb
 - lib/datadog/core/cloudwise/component.rb
+- lib/datadog/core/cloudwise/docc_heartbeat_worker.rb
+- lib/datadog/core/cloudwise/docc_operation_worker.rb
+- lib/datadog/core/cloudwise/docc_registration_worker.rb
 - lib/datadog/core/cloudwise/heartbeat_worker.rb
 - lib/datadog/core/cloudwise/host_id_worker.rb
 - lib/datadog/core/cloudwise/license_worker.rb
@@ -367,7 +367,6 @@ files:
 - 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/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
@@ -402,7 +401,6 @@ files:
 - lib/datadog/core/telemetry/request.rb
 - lib/datadog/core/telemetry/transport/http.rb
 - lib/datadog/core/telemetry/transport/http/api.rb
-- lib/datadog/core/telemetry/transport/http/client.rb
 - lib/datadog/core/telemetry/transport/http/telemetry.rb
 - lib/datadog/core/telemetry/transport/telemetry.rb
 - lib/datadog/core/telemetry/worker.rb
@@ -418,6 +416,7 @@ files:
 - lib/datadog/core/transport/http/api/map.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/env.rb
 - lib/datadog/core/transport/http/response.rb
 - lib/datadog/core/transport/parcel.rb
@@ -498,7 +497,6 @@ files:
 - lib/datadog/di/transport/diagnostics.rb
 - lib/datadog/di/transport/http.rb
 - lib/datadog/di/transport/http/api.rb
-- lib/datadog/di/transport/http/client.rb
 - lib/datadog/di/transport/http/diagnostics.rb
 - lib/datadog/di/transport/http/input.rb
 - lib/datadog/di/transport/input.rb
@@ -516,6 +514,22 @@ files:
 - lib/datadog/kit/appsec/events/v2.rb
 - lib/datadog/kit/enable_core_dumps.rb
 - lib/datadog/kit/identity.rb
+- lib/datadog/open_feature.rb
+- lib/datadog/open_feature/component.rb
+- lib/datadog/open_feature/configuration.rb
+- lib/datadog/open_feature/evaluation_engine.rb
+- lib/datadog/open_feature/exposures/batch_builder.rb
+- lib/datadog/open_feature/exposures/buffer.rb
+- lib/datadog/open_feature/exposures/deduplicator.rb
+- lib/datadog/open_feature/exposures/event.rb
+- lib/datadog/open_feature/exposures/reporter.rb
+- lib/datadog/open_feature/exposures/worker.rb
+- lib/datadog/open_feature/ext.rb
+- lib/datadog/open_feature/noop_evaluator.rb
+- lib/datadog/open_feature/provider.rb
+- lib/datadog/open_feature/remote.rb
+- lib/datadog/open_feature/resolution_details.rb
+- lib/datadog/open_feature/transport.rb
 - lib/datadog/opentelemetry.rb
 - lib/datadog/opentelemetry/api/baggage.rb
 - lib/datadog/opentelemetry/api/baggage.rbs
@@ -795,6 +809,7 @@ files:
 - lib/datadog/tracing/contrib/karafka/configuration/settings.rb
 - lib/datadog/tracing/contrib/karafka/distributed/propagation.rb
 - lib/datadog/tracing/contrib/karafka/ext.rb
+- lib/datadog/tracing/contrib/karafka/framework.rb
 - lib/datadog/tracing/contrib/karafka/integration.rb
 - lib/datadog/tracing/contrib/karafka/monitor.rb
 - lib/datadog/tracing/contrib/karafka/patcher.rb
@@ -970,6 +985,14 @@ files:
 - lib/datadog/tracing/contrib/utils/database.rb
 - lib/datadog/tracing/contrib/utils/quantization/hash.rb
 - lib/datadog/tracing/contrib/utils/quantization/http.rb
+- lib/datadog/tracing/contrib/waterdrop.rb
+- lib/datadog/tracing/contrib/waterdrop/configuration/settings.rb
+- lib/datadog/tracing/contrib/waterdrop/distributed/propagation.rb
+- lib/datadog/tracing/contrib/waterdrop/ext.rb
+- lib/datadog/tracing/contrib/waterdrop/integration.rb
+- lib/datadog/tracing/contrib/waterdrop/middleware.rb
+- lib/datadog/tracing/contrib/waterdrop/patcher.rb
+- lib/datadog/tracing/contrib/waterdrop/producer.rb
 - lib/datadog/tracing/correlation.rb
 - lib/datadog/tracing/diagnostics/environment_logger.rb
 - lib/datadog/tracing/diagnostics/ext.rb
@@ -1047,8 +1070,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.23.0.2/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.23.0.2
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.23.0.4/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.23.0.4
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -1060,7 +1083,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: '3.5'
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="