cw-datadog 2.23.0.2 → 2.23.0.3

data/lib/datadog/core/cloudwise/license_worker.rb

@@ -76,9 +76,11 @@ module Datadog
           end
 
           code = result[:code]
+          # msg 字段在响应的顶层（result[:message]），是字符串 "true" 或 "false"
+          msg = result[:message]
 
           # License 校验成功 (code == 1000)
-          if code == CODE_SUCCESS
+          if code == CODE_SUCCESS && msg == 'true'
             Cloudwise.log_debug { 'Cloudwise: License valid' }
             probe_state.mark_license_valid!
             @failure_count = 0  # 重置失败计数

data/lib/datadog/core/cloudwise/probe_state.rb

@@ -15,6 +15,12 @@ module Datadog
           @heartbeat_active = false     # 心跳是否正常
           @license_valid = false        # License 是否校验通过
           @app_registered = false       # 应用是否已注册（注册失败不影响采集）
+
+          # 融合模式状态
+          @docc_registered = false      # 注册是否成功
+          @docc_heartbeat_active = false  #  心跳是否正常
+          @docc_operation_active = true   #  操作状态（默认为 true，agent_stop 时为 false）
+          @use_docc_mode = false        # 是否使用 模式
         end
 
         # Host ID 相关
@@ -91,10 +97,81 @@ module Datadog
           end
         end
 
-        # 探针是否可以采集数据：需要 Host ID + 心跳 + License 都正常
+        # DOCC 注册相关
+        def mark_docc_registered!
+          @mutex.synchronize do
+            return if @docc_registered
+            @docc_registered = true
+            Cloudwise.log_debug { 'Cloudwise DOCC: Extension registered' }
+            log_status_change
+          end
+        end
+
+        def mark_docc_unregistered!
+          @mutex.synchronize do
+            return unless @docc_registered
+            @docc_registered = false
+            Cloudwise.log_warn { 'Cloudwise DOCC: Extension not registered' }
+            log_status_change
+          end
+        end
+
+        # DOCC 心跳相关
+        def mark_docc_heartbeat_active!
+          @mutex.synchronize do
+            return if @docc_heartbeat_active
+            @docc_heartbeat_active = true
+            Cloudwise.log_debug { 'Cloudwise DOCC: Heartbeat active' }
+            log_status_change
+          end
+        end
+
+        def mark_docc_heartbeat_inactive!
+          @mutex.synchronize do
+            return unless @docc_heartbeat_active
+            @docc_heartbeat_active = false
+            Cloudwise.log_warn { 'Cloudwise DOCC: Heartbeat inactive' }
+            log_status_change
+          end
+        end
+
+        # DOCC 操作相关
+        def mark_docc_operation_active!
+          @mutex.synchronize do
+            return if @docc_operation_active
+            @docc_operation_active = true
+            Cloudwise.log_info { 'Cloudwise DOCC: Agent started - data collection enabled' }
+            log_status_change
+          end
+        end
+
+        def mark_docc_operation_inactive!
+          @mutex.synchronize do
+            return unless @docc_operation_active
+            @docc_operation_active = false
+            Cloudwise.log_info { 'Cloudwise DOCC: Agent stopped - data collection disabled' }
+            log_status_change
+          end
+        end
+
+        # 设置使用 DOCC 模式
+        def enable_docc_mode!
+          @mutex.synchronize do
+            @use_docc_mode = true
+            Cloudwise.log_debug { 'Cloudwise: Using DOCC integrated mode' }
+          end
+        end
+
+        # 探针是否可以采集数据
+        # 如果使用 DOCC 模式：需要 DOCC 心跳 + License + Operation 都正常
+        # 如果使用传统模式：需要 Host ID + 心跳 + License 都正常
         def can_collect_data?
           @mutex.synchronize do
-            @host_id_ready && @heartbeat_active && @license_valid
+            if @use_docc_mode
+              @docc_heartbeat_active && @license_valid && @docc_operation_active
+            else
+              @host_id_ready && @heartbeat_active && @license_valid
+            end
           end
         end
 
@@ -115,6 +192,22 @@ module Datadog
           @mutex.synchronize { @app_registered }
         end
 
+        def docc_registered?
+          @mutex.synchronize { @docc_registered }
+        end
+
+        def docc_heartbeat_active?
+          @mutex.synchronize { @docc_heartbeat_active }
+        end
+
+        def docc_operation_active?
+          @mutex.synchronize { @docc_operation_active }
+        end
+
+        def using_docc_mode?
+          @mutex.synchronize { @use_docc_mode }
+        end
+
         # 兼容旧接口
         def suspended?
           !can_collect_data?
@@ -127,13 +220,27 @@ module Datadog
         # 获取当前状态摘要
         def status
           @mutex.synchronize do
-            {
+            base_status = {
               host_id_ready: @host_id_ready,
               heartbeat_active: @heartbeat_active,
               license_valid: @license_valid,
-              app_registered: @app_registered,
-              can_collect_data: @host_id_ready && @heartbeat_active && @license_valid
+              app_registered: @app_registered
             }
+
+            if @use_docc_mode
+              base_status.merge(
+                use_docc_mode: true,
+                docc_registered: @docc_registered,
+                docc_heartbeat_active: @docc_heartbeat_active,
+                docc_operation_active: @docc_operation_active,
+                can_collect_data: @docc_heartbeat_active && @license_valid && @docc_operation_active
+              )
+            else
+              base_status.merge(
+                use_docc_mode: false,
+                can_collect_data: @host_id_ready && @heartbeat_active && @license_valid
+              )
+            end
           end
         end
 
@@ -143,15 +250,30 @@ module Datadog
         # 它不能再次获取锁，所以直接读取实例变量
         def log_status_change
           # 直接读取实例变量，避免递归锁定（不调用 can_collect_data? 方法）
-          if @host_id_ready && @heartbeat_active && @license_valid
-            Cloudwise.log_debug { 'Cloudwise: Probe ACTIVE - data collection enabled' }
+          if @use_docc_mode
+            # DOCC 模式状态日志
+            if @docc_heartbeat_active && @license_valid && @docc_operation_active
+              Cloudwise.log_debug { 'Cloudwise DOCC: Probe ACTIVE - data collection enabled' }
+            else
+              reasons = []
+              reasons << 'DOCC Heartbeat inactive' unless @docc_heartbeat_active
+              reasons << 'License invalid' unless @license_valid
+              reasons << 'Agent stopped by operation' unless @docc_operation_active
+
+              Cloudwise.log_debug { "Cloudwise DOCC: Probe SUSPENDED - data collection disabled (#{reasons.join(', ')})" }
+            end
           else
-            reasons = []
-            reasons << 'Host ID not ready' unless @host_id_ready
-            reasons << 'Heartbeat inactive' unless @heartbeat_active
-            reasons << 'License invalid' unless @license_valid
+            # 传统模式状态日志
+            if @host_id_ready && @heartbeat_active && @license_valid
+              Cloudwise.log_debug { 'Cloudwise: Probe ACTIVE - data collection enabled' }
+            else
+              reasons = []
+              reasons << 'Host ID not ready' unless @host_id_ready
+              reasons << 'Heartbeat inactive' unless @heartbeat_active
+              reasons << 'License invalid' unless @license_valid
 
-            Cloudwise.log_debug { "Cloudwise: Probe SUSPENDED - data collection disabled (#{reasons.join(', ')})" }
+              Cloudwise.log_debug { "Cloudwise: Probe SUSPENDED - data collection disabled (#{reasons.join(', ')})" }
+            end
           end
         end
       end

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

@@ -15,6 +15,7 @@ require_relative '../../tracing/component'
 require_relative '../../profiling/component'
 require_relative '../../appsec/component'
 require_relative '../../di/component'
+require_relative '../../open_feature/component'
 require_relative '../../error_tracking/component'
 require_relative '../crashtracking/component'
 require_relative '../environment/agent_info'
@@ -151,6 +152,7 @@ module Datadog
         attr_reader \
           :health_metrics,
           :settings,
+          :agent_settings,
           :logger,
           :remote,
           :profiler,
@@ -163,7 +165,8 @@ module Datadog
           :appsec,
           :agent_info,
           :data_streams,
-          :cloudwise
+          :cloudwise,
+          :open_feature
 
         def initialize(settings)
           @settings = settings
@@ -207,7 +210,7 @@ module Datadog
           # This agent_settings is intended for use within Core. If you require
           # agent_settings within a product outside of core you should extend
           # the Core resolver from within your product/component's namespace.
-          agent_settings = AgentSettingsResolver.call(settings, logger: @logger)
+          @agent_settings = AgentSettingsResolver.call(settings, logger: @logger)
 
           # Exposes agent capability information for detection by any components
           @agent_info = Core::Environment::AgentInfo.new(agent_settings, logger: @logger)
@@ -233,6 +236,7 @@ module Datadog
           @runtime_metrics = self.class.build_runtime_metrics_worker(settings, @logger, telemetry)
           @health_metrics = self.class.build_health_metrics(settings, @logger, telemetry)
           @appsec = Datadog::AppSec::Component.build_appsec_component(settings, telemetry: telemetry)
+          @open_feature = OpenFeature::Component.build(settings, agent_settings, logger: @logger, telemetry: telemetry)
           @dynamic_instrumentation = Datadog::DI::Component.build(settings, agent_settings, @logger, telemetry: telemetry)
           @error_tracking = Datadog::ErrorTracking::Component.build(settings, @tracer, @logger)
           @data_streams = self.class.build_data_streams(settings, agent_settings, @logger)
@@ -268,14 +272,8 @@ module Datadog
 
         # Starts up components
         def startup!(settings, old_state: nil)
-          # If Datadog components are not initialized yet (waiting for Cloudwise),
-          # skip startup - it will be called after Datadog components are initialized
-          unless datadog_components_initialized?
-            @pending_startup = { settings: settings, old_state: old_state }
-            return
-          end
 
-          telemetry.start(old_state&.telemetry_enabled?)
+          telemetry.start(old_state&.telemetry_enabled?, components: self)
 
           if settings.profiling.enabled
             if profiler
@@ -321,6 +319,9 @@ module Datadog
           # Shutdown DI after remote, since remote config triggers DI operations.
           dynamic_instrumentation&.shutdown!
 
+          # Shutdown OpenFeature component
+          open_feature&.shutdown!
+
           # Decommission AppSec
           appsec&.shutdown!
 

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

@@ -1025,6 +1025,34 @@ module Datadog
             o.default nil
           end
 
+          # Integrated mode - whether agent handles integrated environment
+          # @default `DD_CLOUDWISE_INTEGRATED_MODE` environment variable, otherwise `true`
+          # @return [Boolean]
+          option :integrated_mode do |o|
+            o.type :bool
+            o.env 'DD_CLOUDWISE_INTEGRATED_MODE'
+            o.default true
+          end
+
+          # Token for integrated mode (DOCC interface authentication)
+          # Format: base64 encoded "account_id@user_id"
+          # @default `DD_CLOUDWISE_TOKEN` environment variable
+          # @return [String,nil]
+          option :token do |o|
+            o.type :string, nilable: true
+            o.env 'DD_CLOUDWISE_TOKEN'
+            o.default nil
+          end
+
+        # API 路径前缀，用于在所有 Cloudwise API 请求前添加统一前缀
+        # 例如: '/doop-agent-api' 会将请求从 '/api/v2/traces' 改为 '/doop-agent-api/api/v2/traces'
+        # 优先级: DD_CLOUDWISE_API_PREFIX > integrated_mode ('/apm') > 无前缀
+        option :api_prefix do |o|
+          o.type :string, nilable: true
+          o.env 'DD_CLOUDWISE_API_PREFIX'
+          o.default nil
+        end
+
           # Heartbeat interval in seconds
           # @default `DD_CLOUDWISE_HEARTBEAT_INTERVAL` environment variable, otherwise `30`
           # @return [Integer]

data/lib/datadog/core/configuration/supported_configurations.rb

@@ -34,9 +34,10 @@ module Datadog
          "DD_APPSEC_WAF_TIMEOUT" => {version: ["A"]},
          "DD_CLOUDWISE_APP_REGISTRATION_INTERVAL" => {version: ["A"]},
          "DD_CLOUDWISE_ENABLED" => {version: ["A"]},
-         "DD_CLOUDWISE_HEARTBEAT_INTERVAL" => {version: ["A"]},
-         "DD_CLOUDWISE_LICENSE_CHECK_INTERVAL" => {version: ["A"]},
          "DD_CLOUDWISE_LICENSE_KEY" => {version: ["A"]},
+         "DD_CLOUDWISE_TOKEN" => {version: ["A"]},
+         "CW_SYS" => {version: ["A"]},
+         "DD_CLOUDWISE_API_PREFIX" => {version: ["A"]},
          "DD_CRASHTRACKING_ENABLED" => {version: ["A"]},
          "DD_DATA_STREAMS_ENABLED" => {version: ["A"]},
          "DD_DBM_PROPAGATION_MODE" => {version: ["A"]},
@@ -48,6 +49,7 @@ module Datadog
          "DD_ENV" => {version: ["A"]},
          "DD_ERROR_TRACKING_HANDLED_ERRORS" => {version: ["A"]},
          "DD_ERROR_TRACKING_HANDLED_ERRORS_INCLUDE" => {version: ["A"]},
+         "DD_EXPERIMENTAL_FLAGGING_PROVIDER_ENABLED" => {version: ["A"]},
          "DD_GIT_COMMIT_SHA" => {version: ["A"]},
          "DD_GIT_REPOSITORY_URL" => {version: ["A"]},
          "DD_HEALTH_METRICS_ENABLED" => {version: ["A"]},
@@ -314,6 +316,7 @@ module Datadog
          "DD_TRACE_TRILOGY_ENABLED" => {version: ["A"]},
          "DD_TRACE_TRILOGY_PEER_SERVICE" => {version: ["A"]},
          "DD_TRACE_TRILOGY_SERVICE_NAME" => {version: ["A"]},
+         "DD_TRACE_WATERDROP_ENABLED" => {version: ["A"]},
          "DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH" => {version: ["A"]},
          "DD_VERSION" => {version: ["A"]},
          "OTEL_TRACES_SAMPLER_ARG" => {version: ["A"]}}.freeze

data/lib/datadog/core/remote/client/capabilities.rb

@@ -3,6 +3,7 @@
 require_relative '../../utils/base64'
 require_relative '../../../appsec/remote'
 require_relative '../../../tracing/remote'
+require_relative '../../../open_feature/remote'
 
 module Datadog
   module Core
@@ -38,6 +39,12 @@ module Datadog
               register_receivers(Datadog::DI::Remote.receivers(@telemetry))
             end
 
+            if settings.respond_to?(:open_feature) && settings.open_feature.enabled
+              register_capabilities(Datadog::OpenFeature::Remote.capabilities)
+              register_products(Datadog::OpenFeature::Remote.products)
+              register_receivers(Datadog::OpenFeature::Remote.receivers(@telemetry))
+            end
+
             register_capabilities(Datadog::Tracing::Remote.capabilities)
             register_products(Datadog::Tracing::Remote.products)
             register_receivers(Datadog::Tracing::Remote.receivers(@telemetry))

data/lib/datadog/core/remote/component.rb

@@ -68,12 +68,12 @@ module Datadog
 
         # Starts the Remote Configuration worker without waiting for first run
         def start
-          @worker.start
+          # @worker.start
         end
 
         # Is the Remote Configuration worker running?
         def started?
-          @worker.started?
+          # @worker.started?
         end
 
         # If the worker is not initialized, initialize it.

data/lib/datadog/core/remote/transport/config.rb

@@ -2,6 +2,7 @@
 
 require_relative '../../../core/transport/request'
 require_relative '../../../core/transport/parcel'
+require_relative 'http/config'
 
 module Datadog
   module Core
@@ -21,15 +22,6 @@ module Datadog
           class Request < Datadog::Core::Transport::Request
           end
 
-          # Config response
-          module Response
-            attr_reader :roots, :targets, :target_files, :client_configs
-
-            def empty?
-              @empty
-            end
-          end
-
           # Config transport
           class Transport
             attr_reader :client, :apis, :default_api, :current_api_id, :logger
@@ -38,7 +30,7 @@ module Datadog
               @apis = apis
               @logger = logger
 
-              @client = HTTP::Client.new(current_api, logger: logger)
+              @client = Remote::Transport::HTTP::Config::Client.new(current_api, logger: logger)
             end
 
             ##### there is only one transport! it's negotiation!

data/lib/datadog/core/remote/transport/http/config.rb

@@ -2,8 +2,7 @@
 
 require 'json'
 
-require_relative '../config'
-require_relative 'client'
+require_relative '../../../transport/http/client'
 require_relative '../../../utils/base64'
 require_relative '../../../utils/truncation'
 require_relative '../../../transport/http/response'
@@ -19,7 +18,6 @@ module Datadog
             # Response from HTTP transport for remote configuration
             class Response
               include Datadog::Core::Transport::HTTP::Response
-              include Core::Remote::Transport::Config::Response
 
               def initialize(http_response, options = {}) # standard:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
                 super(http_response)
@@ -114,6 +112,12 @@ module Datadog
                 end.freeze
               end
 
+              attr_reader :roots, :targets, :target_files, :client_configs
+
+              def empty?
+                @empty
+              end
+
               def inspect
                 "#{super}, #{
                   {
@@ -174,8 +178,8 @@ module Datadog
               end
             end
 
-            # Extensions for HTTP client
-            module Client
+            # Remote transport HTTP client
+            class Client < Core::Transport::HTTP::Client
               def send_config_payload(request)
                 send_request(request) do |api, env|
                   api.send_config(env)
@@ -240,10 +244,6 @@ module Datadog
                 end
               end
             end
-
-            # Add remote configuration behavior to transport components
-            ###### overrides send_payload! which calls send_<endpoint>! kills any other possible endpoint!
-            HTTP::Client.include(Config::Client)
           end
         end
       end

data/lib/datadog/core/remote/transport/http/negotiation.rb

@@ -2,8 +2,7 @@
 
 require 'json'
 
-require_relative '../negotiation'
-require_relative 'client'
+require_relative '../../../transport/http/client'
 require_relative '../../../transport/http/response'
 require_relative '../../../transport/http/api/endpoint'
 
@@ -17,7 +16,6 @@ module Datadog
             # Response from HTTP transport for agent feature negotiation
             class Response
               include Datadog::Core::Transport::HTTP::Response
-              include Core::Remote::Transport::Negotiation::Response
 
               def initialize(http_response, options = {})
                 super(http_response)
@@ -29,10 +27,24 @@ module Datadog
                 @config = options[:config]
                 @span_events = options[:span_events]
               end
+
+              # @!attribute [r] version
+              #   The version of the agent.
+              #   @return [String]
+              # @!attribute [r] endpoints
+              #   The HTTP endpoints the agent supports.
+              #   @return [Array<String>]
+              # @!attribute [r] config
+              #   The agent configuration. These are configured by the user when starting the agent, as well as any defaults.
+              #   @return [Hash]
+              # @!attribute [r] span_events
+              #   Whether the agent supports the top-level span events field in flushed spans.
+              #   @return [Boolean,nil]
+              attr_reader :version, :endpoints, :config, :span_events
             end
 
-            # Extensions for HTTP client
-            module Client
+            # Remote negotiation HTTP client
+            class Client < Core::Transport::HTTP::Client
               def send_info_payload(request)
                 send_request(request) do |api, env|
                   api.send_info(env)
@@ -92,9 +104,6 @@ module Datadog
                 end
               end
             end
-
-            # Add negotiation behavior to transport components
-            HTTP::Client.include(Negotiation::Client)
           end
         end
       end

data/lib/datadog/core/remote/transport/http.rb

@@ -4,6 +4,8 @@ require_relative '../../environment/container'
 require_relative '../../environment/ext'
 require_relative '../../transport/ext'
 require_relative '../../transport/http'
+require_relative 'config'
+require_relative 'negotiation'
 
 # TODO: Improve negotiation to allow per endpoint selection
 #

data/lib/datadog/core/remote/transport/negotiation.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative '../../../core/transport/request'
+require_relative 'http/negotiation'
 
 # TODO: Resolve conceptual conundrum
 #
@@ -30,23 +31,6 @@ module Datadog
           class Request < Datadog::Core::Transport::Request
           end
 
-          # Negotiation response
-          module Response
-            # @!attribute [r] version
-            #   The version of the agent.
-            #   @return [String]
-            # @!attribute [r] endpoints
-            #   The HTTP endpoints the agent supports.
-            #   @return [Array<String>]
-            # @!attribute [r] config
-            #   The agent configuration. These are configured by the user when starting the agent, as well as any defaults.
-            #   @return [Hash]
-            # @!attribute [r] span_events
-            #   Whether the agent supports the top-level span events field in flushed spans.
-            #   @return [Boolean,nil]
-            attr_reader :version, :endpoints, :config, :span_events
-          end
-
           # Negotiation transport
           class Transport
             attr_reader :client, :apis, :default_api, :current_api_id, :logger
@@ -55,7 +39,7 @@ module Datadog
               @apis = apis
               @logger = logger
 
-              @client = HTTP::Client.new(current_api, logger: logger)
+              @client = Remote::Transport::HTTP::Negotiation::Client.new(current_api, logger: logger)
             end
 
             def send_info

data/lib/datadog/core/remote/worker.rb

@@ -25,49 +25,45 @@ module Datadog
         def start
           logger.debug { "remote worker starting (pid: #{Process.pid})" }
 
-          acquire_lock
+          @mutex.synchronize do
+            if @stopped
+              logger.debug('remote worker: refusing to restart after previous stop')
+              return
+            end
 
-          if @stopped
-            logger.debug('remote worker: refusing to restart after previous stop')
-            return
-          end
-
-          return if @starting || @started
+            return if @starting || @started
 
-          @starting = true
+            @starting = true
 
-          thread = Thread.new { poll(@interval) }
-          thread.name = self.class.name
-          thread.thread_variable_set(:fork_safe, true)
-          @thr = thread
+            thread = Thread.new { poll(@interval) }
+            thread.name = self.class.name
+            thread.thread_variable_set(:fork_safe, true)
+            @thr = thread
 
-          @started = true
-          @starting = false
+            @started = true
+            @starting = false
+          end
 
           logger.debug { 'remote worker started' }
-        ensure
-          release_lock
         end
 
         def stop
           logger.debug { "remote worker stopping (pid: #{Process.pid})" }
 
-          acquire_lock
+          @mutex.synchronize do
+            thread = @thr
 
-          thread = @thr
+            if thread
+              thread.kill
+              thread.join
+            end
 
-          if thread
-            thread.kill
-            thread.join
+            @started = false
+            @thr = nil
+            @stopped = true
           end
 
-          @started = false
-          @thr = nil
-          @stopped = true
-
           logger.debug { 'remote worker stopped' }
-        ensure
-          release_lock
         end
 
         def started?
@@ -76,14 +72,6 @@ module Datadog
 
         private
 
-        def acquire_lock
-          @mutex.lock
-        end
-
-        def release_lock
-          @mutex.unlock
-        end
-
         def poll(interval)
           loop do
             break unless @mutex.synchronize { @starting || @started }