cw-datadog 2.23.0.5 → 2.23.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c828f3cd16def8be8aaf2a7ad6ca5c7d895652ba61a8ab3f2e37e86a3d15c34
-  data.tar.gz: a9a30fab81f579a6f68908e141a4ec2a3a7537bd691d0d99bc96769da2901254
+  metadata.gz: 357524fd08da065c567250e3808034acf9f913a3646454e08e57ba862b86630e
+  data.tar.gz: 1f2e9dd6587bcf9e85dd392292ae7d3383aa0049e6c47564068e3fc2be47ec98
 SHA512:
-  metadata.gz: 8fc7e482cd0bef1fa1ccaf46a9847bca74b4a027f55b2ccf0ed61e9d8978510d36a0cd0e651336cb799834e7c3568f83fd8e8a16884f26d6fc041fda6f4f7ac2
-  data.tar.gz: b1c9a0aba8aabac6543c2721068dc9726fa7851d4b8f8c25588657b3ba1d0b06feda729f89b2eadd3c3a29b51be0aa1c1375722eb802b3bbba0471bb4e2e8c0a
+  metadata.gz: e5d5e968b104db74f788b813ca07ea400169235353094b1d6376ff9b0d1d54eb45f6fe66cedca3d8e80e7edea1e51626e2e17ddd6ff173756781a7e601f74f2a
+  data.tar.gz: 7446cff8ed80819860f272d20a28bc5629e656ddc029951b177f391b833d1c0b717f64b8ac01baf38da84eed9ad1a9f24736f80fc914c0e1db96186f657c122b

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

@@ -9,10 +9,11 @@ module Datadog
   module Core
     module Cloudwise
       # HTTP client for Cloudwise API calls
+      # rubocop:disable CustomCops/EnvUsageCop
       class Client
         attr_reader :base_url, :server_name, :license_key, :logger, :account_id,
-                    :integrated_mode, :token, :token_account_id, :token_user_id,
-                    :agent_instance_id
+          :integrated_mode, :token, :token_account_id, :token_user_id,
+          :agent_instance_id
 
         # Response codes
         CODE_SUCCESS = 1000
@@ -99,20 +100,20 @@ module Datadog
               @account_id = register_response[:data]['account_id'].to_i
 
               # 设置到环境变量 (转为字符串存储)
+              # NOTE: 设置环境变量必须使用 ENV，DATADOG_ENV 只支持读取
               ENV['CLOUDWISE_ACCOUNT_ID'] = @account_id.to_s
               ENV['CLOUDWISE_HOST_ID'] = @host_id.to_s
               ENV['CLOUDWISE_AGENT_ID'] = generate_agent_id(host_ip).to_s
-              ENV['CLOUDWISE_HOST_NAME'] = Socket.gethostname rescue 'unknown'
+              ENV['CLOUDWISE_HOST_NAME'] = safe_gethostname
               ENV['CLOUDWISE_INSTANCE_ID'] = generate_service_instance_id(host_ip).to_s
 
               Cloudwise.log_debug { "Cloudwise: Registered Host, account_id: #{@account_id}, host_id: #{@host_id}" }
-              # 返回 register_host 的响应（包含 account_id）
-              return register_response
             else
               error_msg = register_response[:error] || "code=#{register_response[:code]}"
               Cloudwise.log_error { "Cloudwise: Failed to register host: #{error_msg}" }
-              return register_response
             end
+            # 返回 register_host 的响应（包含 account_id 或错误信息）
+            return register_response
           else
             error_msg = response[:error] || "No hostId in response"
             Cloudwise.log_error { "Cloudwise: Failed to generate host ID: #{error_msg}" }
@@ -125,11 +126,11 @@ module Datadog
         def register_host(host_ip)
           unless @host_id
             Cloudwise.log_error { 'Cloudwise: Cannot register host without host_id' }
-            return { success: false, error: 'host_id not generated', code: nil }
+            return {success: false, error: 'host_id not generated', code: nil}
           end
 
           # 获取系统信息
-          host_name = Socket.gethostname rescue 'default'
+          host_name = safe_gethostname
           sys_version = RUBY_VERSION
 
           post('/v2/app/registerHost', {
@@ -146,7 +147,7 @@ module Datadog
         # 心跳接口
         def heartbeat
           host_ip = get_local_ip
-          host_name = Socket.gethostname rescue 'unknown'
+          host_name = safe_gethostname
 
           post('/api/v1/agent/heartbeat', {
             version: Datadog::VERSION::STRING,
@@ -191,7 +192,7 @@ module Datadog
           host_ip = get_local_ip
 
           post('/v2/licence/verification', {
-            account_id: (@account_id).to_s,
+            account_id: @account_id.to_s,
             agent_id: generate_agent_id(host_ip),
             service_type: 'RUBY',
             version: Datadog::VERSION::STRING,
@@ -232,10 +233,10 @@ module Datadog
             codeType: 1012,
             app_type: 1,
             vpc: '',
-            env_tag:  'default',
-            service_tag:  'default',
-            version_tag:'default',
-            business_tag: '' ,
+            env_tag: 'default',
+            service_tag: 'default',
+            version_tag: 'default',
+            business_tag: '',
             sys: '',
             host_tag: '{}',
             tags: {},
@@ -372,14 +373,15 @@ module Datadog
             }
           else
             Cloudwise.log_warn { "Cloudwise: path: #{path} Failed to fetch server timestamp: #{response.code}" }
-            { success: false, error: "HTTP #{response.code}" }
+            {success: false, error: "HTTP #{response.code}"}
           end
         rescue => e
           Cloudwise.log_error { "Cloudwise: Error fetching server timestamp: #{e.message}" }
-          { success: false, error: e.message }
+          {success: false, error: e.message}
         end
 
         private
+
         def post(path, data)
           # 统一处理 API 路径前缀
           path = apply_api_prefix(path)
@@ -397,19 +399,23 @@ module Datadog
           # 这可以避免在 tracer 未初始化时触发 NoMethodError
           request['DD-Internal-Untraced-Request'] = '1'
           request.body = data.to_json
-          Cloudwise.log_debug { "Cloudwise API request:#{request.method} #{uri.to_s} with data: #{data.inspect}" }
+          Cloudwise.log_debug { "Cloudwise API request:#{request.method} #{uri} with data: #{data.inspect}" }
 
           response = http.request(request)
           handle_response(response, path)
         rescue => e
           Cloudwise.log_error { "Cloudwise API error for #{path}: #{e.class.name} #{e.message}" }
-          { success: false, error: e.message, code: nil }
+          {success: false, error: e.message, code: nil}
         end
 
         def handle_response(response, path)
           case response.code.to_i
           when 200..299
-            body = JSON.parse(response.body) rescue {}
+            body = begin
+              JSON.parse(response.body)
+            rescue
+              {}
+            end
             code = body['code'] || body['status_code']
 
             Cloudwise.log_debug { "Cloudwise API response for #{path}: code=#{code}, body=#{body.inspect}" }
@@ -422,17 +428,16 @@ module Datadog
             }
           when 400..499
             Cloudwise.log_warn { "Cloudwise API client error for #{path}: #{response.code} #{response.body}" }
-            { success: false, error: "Client error: #{response.code}", code: nil }
+            {success: false, error: "Client error: #{response.code}", code: nil}
           when 500..599
             Cloudwise.log_error { "Cloudwise API server error for #{path}: #{response.code} #{response.body}" }
-            { success: false, error: "Server error: #{response.code}", code: nil }
+            {success: false, error: "Server error: #{response.code}", code: nil}
           else
             Cloudwise.log_warn { "Cloudwise API unexpected response for #{path}: #{response.code}" }
-            { success: false, error: "Unexpected response: #{response.code}", code: nil }
+            {success: false, error: "Unexpected response: #{response.code}", code: nil}
           end
         end
 
-
         # 获取校正后的秒级时间戳
         # 如果启用了时间同步，会应用偏移量校正
         # @return [Integer] 校正后的秒级时间戳
@@ -510,7 +515,6 @@ module Datadog
           rescue => e
             Cloudwise.log_debug { "Cloudwise: Failed to get IP via interfaces: #{e.message}" }
           end
-
         end
 
         # 获取 Agent 路径
@@ -606,16 +610,17 @@ module Datadog
 
           # 1. 尝试从 Datadog 配置读取（0.0-1.0 的浮点数）
           if defined?(Datadog.configuration) &&
-             Datadog.configuration.respond_to?(:tracing) &&
-             Datadog.configuration.tracing.respond_to?(:sampling) &&
-             Datadog.configuration.tracing.sampling.respond_to?(:default_rate)
+              Datadog.configuration.respond_to?(:tracing) &&
+              Datadog.configuration.tracing.respond_to?(:sampling) &&
+              Datadog.configuration.tracing.sampling.respond_to?(:default_rate)
             configured_rate = Datadog.configuration.tracing.sampling.default_rate
             rate = configured_rate if configured_rate && configured_rate >= 0.0 && configured_rate <= 1.0
           end
 
           # 2. 尝试从环境变量读取（DD_TRACE_SAMPLE_RATE，0.0-1.0 的浮点数）
-          if rate.nil? && ENV['DD_TRACE_SAMPLE_RATE']
-            env_rate = ENV['DD_TRACE_SAMPLE_RATE'].to_f
+          env_rate_str = DATADOG_ENV['DD_TRACE_SAMPLE_RATE']
+          if rate.nil? && env_rate_str
+            env_rate = env_rate_str.to_f
             rate = env_rate if env_rate >= 0.0 && env_rate <= 1.0
           end
 
@@ -768,7 +773,7 @@ module Datadog
               @account_id = @token_account_id
               Cloudwise.log_debug { "Cloudwise: Token parsed - account_id: #{@token_account_id}, user_id: #{@token_user_id}" }
 
-              #account_id
+              # account_id
               ENV['CLOUDWISE_ACCOUNT_ID'] = @token_account_id.to_s
             else
               Cloudwise.log_warn { 'Cloudwise: Invalid token format (expected base64 of account_id@user_id)' }
@@ -782,15 +787,14 @@ module Datadog
           end
         end
 
-
         # 获取 Cloudwise sys 配置值
         # 优先级: Datadog.configuration.cloudwise.sys > CW_SYS 环境变量 > 默认值 'default'
         # @return [String] sys 值
         def get_cloudwise_sys
           # 优先从配置读取
           if defined?(Datadog.configuration) &&
-             Datadog.configuration.respond_to?(:cloudwise) &&
-             Datadog.configuration.cloudwise.respond_to?(:sys)
+              Datadog.configuration.respond_to?(:cloudwise) &&
+              Datadog.configuration.cloudwise.respond_to?(:sys)
             sys = Datadog.configuration.cloudwise.sys
             return sys if sys && !sys.empty? && sys != 'default'
           end
@@ -817,7 +821,6 @@ module Datadog
           ''
         end
 
-
         # Get system UUID
         # Try multiple methods to get a unique system identifier
         def get_system_uuid
@@ -834,7 +837,7 @@ module Datadog
           end
 
           # Method 3: Try macOS system_profiler
-          if RUBY_PLATFORM =~ /darwin/
+          if RUBY_PLATFORM.match?(/darwin/)
             uuid = `system_profiler SPHardwareDataType 2>/dev/null | awk '/UUID/ { print $3; }'`.strip
             return uuid unless uuid.empty?
           end
@@ -870,6 +873,13 @@ module Datadog
           'unknown'
         end
 
+        # Safe gethostname with rescue
+        def safe_gethostname
+          Socket.gethostname
+        rescue
+          'unknown'
+        end
+
         # Get MAC address
         def get_mac_address
           # Try to get MAC address from network interfaces
@@ -963,10 +973,10 @@ module Datadog
           handle_response(response, path)
         rescue => e
           Cloudwise.log_error { "Cloudwise DOCC API error for #{path}: #{e.class.name} #{e.message}" }
-          { success: false, error: e.message, code: nil }
+          {success: false, error: e.message, code: nil}
         end
-
       end
+      # rubocop:enable CustomCops/EnvUsageCop
     end
   end
 end

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

@@ -11,6 +11,8 @@ require_relative 'docc_heartbeat_worker'
 require_relative 'docc_operation_worker'
 require_relative 'time_sync_worker'
 
+require_relative '../../core/environment/variable_helpers'
+
 module Datadog
   module Core
     module Cloudwise
@@ -19,7 +21,7 @@ module Datadog
       class << self
         # Check if debug logging is enabled
         def debug_enabled?
-          @debug_enabled ||= ENV.fetch('DD_TRACE_DEBUG', 'false').downcase == 'true'
+          @debug_enabled ||= (DATADOG_ENV['DD_TRACE_DEBUG'] || 'false').downcase == 'true'
         end
 
         # Log debug message (only when DD_TRACE_DEBUG=true)
@@ -46,9 +48,9 @@ module Datadog
       # Main component that manages Cloudwise workers with proper initialization order
       class Component
         attr_reader :client, :probe_state, :host_id_worker, :heartbeat_worker,
-                    :license_worker, :app_registration_worker, :logger,
-                    :docc_registration_worker, :docc_heartbeat_worker, :docc_operation_worker,
-                    :time_sync_worker
+          :license_worker, :app_registration_worker, :logger,
+          :docc_registration_worker, :docc_heartbeat_worker, :docc_operation_worker,
+          :time_sync_worker
 
         # 类级别的单例锁，确保全局只初始化一次
         @initialization_mutex = Mutex.new
@@ -103,46 +105,43 @@ module Datadog
             if self.class.initialization_started
               cloudwise_already_started = true
               Cloudwise.log_debug { 'Cloudwise Component already initialized globally' }
-            else
+            elsif self.class.singleton_instance && instance_already_started?
               # 检查是否有已存在的单例实例
-              if self.class.singleton_instance && instance_already_started?
-                cloudwise_already_started = true
-                Cloudwise.log_debug { 'Initializing Datadog components for this Components instance...' }
-              else
-                self.class.initialization_started = true
-                self.class.singleton_instance = self
-              end
+              cloudwise_already_started = true
+              Cloudwise.log_debug { 'Initializing Datadog components for this Components instance...' }
+            else
+              self.class.initialization_started = true
+              self.class.singleton_instance = self
             end
           end
 
           # 如果 Cloudwise 已经启动，只需要为这个新的 Components 实例初始化 Datadog 组件
           if cloudwise_already_started
-            if block
-              block.call  # 立即初始化这个实例的 Datadog 组件
-            end
+            block&.call  # 立即初始化这个实例的 Datadog 组件
             return true
           end
 
-        # 立即初始化 Datadog 组件（不等待 Cloudwise 验证）
-        if block
-          Cloudwise.log_debug { 'Initializing Datadog components immediately...' }
-          block.call
-          Cloudwise.log_debug { 'Datadog components initialized (data collection pending ProbeState)' }
-        end
+          # 立即初始化 Datadog 组件（不等待 Cloudwise 验证）
+          # NOTE: 这里不能使用 block&.call 因为需要在调用前后执行日志
+          if block # rubocop:disable Style/SafeNavigation
+            Cloudwise.log_debug { 'Initializing Datadog components immediately...' }
+            block.call
+            Cloudwise.log_debug { 'Datadog components initialized (data collection pending ProbeState)' }
+          end
 
-        # 根据模式启动不同的 workers
-        if @client.use_integrated_mode?
-          start_docc_workers_when_ready
-        else
-          # Start Host ID Worker in background (will retry until success)
-          Cloudwise.log_debug { 'Starting Host ID generation worker (async, infinite retry)...' }
-          @host_id_worker.perform
+          # 根据模式启动不同的 workers
+          if @client.use_integrated_mode?
+            start_docc_workers_when_ready
+          else
+            # Start Host ID Worker in background (will retry until success)
+            Cloudwise.log_debug { 'Starting Host ID generation worker (async, infinite retry)...' }
+            @host_id_worker.perform
 
-          # Start other Cloudwise workers in background
-          start_cloudwise_workers_when_ready
-        end
+            # Start other Cloudwise workers in background
+            start_cloudwise_workers_when_ready
+          end
 
-        Cloudwise.log_debug { 'Cloudwise Component initialization started (async)' }
+          Cloudwise.log_debug { 'Cloudwise Component initialization started (async)' }
 
           true
         end
@@ -218,15 +217,15 @@ module Datadog
 
         # Get component status
         def status
-          return { enabled: false } unless @enabled
+          return {enabled: false} unless @enabled
 
           probe_status = probe_state.status
           # 获取时间同步状态
           time_sync_status = if defined?(Datadog::Core::Cloudwise::TimeSyncWorker)
-                               Datadog::Core::Cloudwise::TimeSyncWorker.status
-                             else
-                               { enabled: false }
-                             end
+            Datadog::Core::Cloudwise::TimeSyncWorker.status
+          else
+            {enabled: false}
+          end
 
           base_status = {
             enabled: true,
@@ -504,7 +503,10 @@ module Datadog
                 probe_state.mark_host_id_ready!
 
                 # Set environment variable
-                ENV['CLOUDWISE_ACCOUNT_ID'] = client.account_id
+                # NOTE: 设置环境变量必须使用 ENV，DATADOG_ENV 只支持读取
+                # rubocop:disable CustomCops/EnvUsageCop
+                ENV['CLOUDWISE_ACCOUNT_ID'] = client.account_id.to_s
+                # rubocop:enable CustomCops/EnvUsageCop
 
                 Cloudwise.log_debug { "Cloudwise: Host ID generated successfully on attempt #{retry_count}" }
                 Cloudwise.log_debug { "Cloudwise: account_id = #{client.account_id}" }
@@ -518,7 +520,6 @@ module Datadog
               Cloudwise.log_warn { "Cloudwise: Retrying in #{retry_interval} seconds..." }
 
               probe_state.mark_host_id_failed!
-
             rescue => e
               # Exception occurred - log and retry
               Cloudwise.log_error { "Cloudwise: Host ID generation error (attempt #{retry_count}): #{e.class.name} #{e.message}" }

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

@@ -102,4 +102,3 @@ module Datadog
     end
   end
 end
-

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

@@ -79,13 +79,9 @@ module Datadog
 
           # 获取任务数据（data 是一个数组）
           tasks = result[:data]
-          return unless tasks && tasks.is_a?(Array)
+          return unless tasks.is_a?(Array) && !tasks.empty?
 
-          # 如果没有任务，直接返回
-          if tasks.empty?
-            Cloudwise.log_debug { "Cloudwise DOCC: No operations to execute" }
-            return
-          end
+          Cloudwise.log_debug { "Cloudwise DOCC: Processing #{tasks.size} operation(s)" }
 
           # 收集所有任务的执行结果
           results = []
@@ -105,19 +101,19 @@ module Datadog
 
           task_id = task_data['taskId']
           operation = task_data['operate']
-          agent_instance_id = task_data['agentInstanceId']
+          # agent_instance_id = task_data['agentInstanceId']
 
           Cloudwise.log_debug { "Cloudwise DOCC: Received operation - taskId: #{task_id}, operation: #{operation}" }
 
           # 执行操作并返回结果
-          execute_operation(task_id, operation, agent_instance_id)
+          execute_operation(task_id, operation)
         rescue => e
           Cloudwise.log_error { "Cloudwise DOCC: Error processing task #{task_id}: #{e.class.name} #{e.message}" }
           # 返回失败结果
           create_operation_result(task_id, 'failed', "Error processing task: #{e.message}")
         end
 
-        def execute_operation(task_id, operation, agent_instance_id)
+        def execute_operation(task_id, operation)
           case operation
           when OPERATION_AGENT_START
             handle_agent_start(task_id)
@@ -198,4 +194,3 @@ module Datadog
     end
   end
 end
-

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

@@ -86,4 +86,3 @@ module Datadog
     end
   end
 end
-

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

@@ -260,20 +260,18 @@ module Datadog
               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(', ')})" }
+              Cloudwise.log_debug { "Cloudwise DOCC: Probe SUSPENDED - data collection disabled (#{reasons.join(", ")})" }
             end
-          else
+          elsif @host_id_ready && @heartbeat_active && @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 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(', ')})" }
-            end
+            Cloudwise.log_debug { "Cloudwise: Probe SUSPENDED - data collection disabled (#{reasons.join(", ")})" }
           end
         end
       end

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

@@ -66,14 +66,10 @@ module Datadog
 
           # 上次同步时间
           # @return [Integer, nil] 毫秒时间戳
-          def last_sync_time
-            @last_sync_time
-          end
+          attr_reader :last_sync_time
 
           # 设置上次同步时间
-          def last_sync_time=(value)
-            @last_sync_time = value
-          end
+          attr_writer :last_sync_time
 
           # 校正时间戳（纳秒）
           # 将本地时间戳转换为服务器时间戳

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

@@ -206,7 +206,6 @@ module Datadog
         # 1. Immediately if Cloudwise is disabled
         # 2. After Host ID is ready if Cloudwise is enabled
         def initialize_datadog_components(settings)
-
           # 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.
@@ -221,7 +220,7 @@ module Datadog
           @tracer = Datadog::Tracing::Component.build_tracer(settings, agent_settings, logger: @logger)
 
           # Set the components reference on the tracer so it can check Cloudwise state
-          @tracer.instance_variable_set(:@components, self) if @tracer
+          @tracer&.instance_variable_set(:@components, self)
 
           @crashtracker = self.class.build_crashtracker(settings, agent_settings, logger: @logger)
 
@@ -272,7 +271,6 @@ module Datadog
 
         # Starts up components
         def startup!(settings, old_state: nil)
-
           telemetry.start(old_state&.telemetry_enabled?, components: self)
 
           if settings.profiling.enabled

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

@@ -805,15 +805,14 @@ module Datadog
           option :enabled do |o|
             o.env Core::Telemetry::Ext::ENV_ENABLED
             o.default do
+              # 使用 cloudwise 心跳，禁用 Datadog Telemetry
               if Datadog::Core::Environment::Execution.development?
                 Datadog.logger.debug do
                   'Development environment detected, disabling Telemetry. ' \
                     'You can enable it with DD_INSTRUMENTATION_TELEMETRY_ENABLED=true.'
                 end
-                false
-              else
-                false #使用cloudwise 心跳
               end
+              false
             end
             o.type :bool
           end
@@ -942,22 +941,13 @@ module Datadog
         settings :remote do
           # Enable remote configuration. This allows fetching of remote configuration for live updates.
           #
-          # @default `DD_REMOTE_CONFIGURATION_ENABLED` environment variable, otherwise `true`.
-          #   By default, remote configuration is disabled in development environments.
+          # @default `DD_REMOTE_CONFIGURATION_ENABLED` environment variable, otherwise `false`.
+          #   Disabled by default for Cloudwise environment (Cloudwise uses its own configuration mechanism).
           # @return [Boolean]
           option :enabled do |o|
             o.env Core::Remote::Ext::ENV_ENABLED
-            o.default do
-              if Datadog::Core::Environment::Execution.development?
-                Datadog.logger.debug do
-                  'Development environment detected, disabling Remote Configuration. ' \
-                    'You can enable it with DD_REMOTE_CONFIGURATION_ENABLED=true.'
-                end
-                false
-              else
-                true
-              end
-            end
+            # Cloudwise 环境下禁用 Remote Configuration，使用 Cloudwise 自己的配置机制
+            o.default false
             o.type :bool
           end
 
@@ -1029,11 +1019,13 @@ module Datadog
           # Integrated mode - whether agent handles integrated environment
           # @default `DD_CLOUDWISE_INTEGRATED_MODE` environment variable, otherwise `true`
           # @return [Boolean]
+          # rubocop:disable CustomCops/EnvStringValidationCop
           option :integrated_mode do |o|
             o.type :bool
             o.env 'DD_CLOUDWISE_INTEGRATED_MODE'
             o.default true
           end
+          # rubocop:enable CustomCops/EnvStringValidationCop
 
           # Token for integrated mode (DOCC interface authentication)
           # Format: base64 encoded "account_id@user_id"
@@ -1045,22 +1037,22 @@ module Datadog
             o.default nil
           end
 
-        # API 路径前缀模式（简化配置）
-        # 可选值: 'doop', 'apm', 'custom'
-        # 优先级: api_prefix_mode > api_prefix > integrated_mode > 无前缀
-        option :api_prefix_mode do |o|
-          o.type :string, nilable: true
-          o.env 'DD_CLOUDWISE_API_PREFIX_MODE'
-          o.default nil
-        end
+          # API 路径前缀模式（简化配置）
+          # 可选值: 'doop', 'apm', 'custom'
+          # 优先级: api_prefix_mode > api_prefix > integrated_mode > 无前缀
+          option :api_prefix_mode do |o|
+            o.type :string, nilable: true
+            o.env 'DD_CLOUDWISE_API_PREFIX_MODE'
+            o.default nil
+          end
 
-        # API 路径前缀（自定义配置）
-        # 优先级: api_prefix_mode > 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
+          # API 路径前缀（自定义配置）
+          # 优先级: api_prefix_mode > 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
 
           # SYS
           option :sys do |o|
@@ -1072,6 +1064,7 @@ module Datadog
           # Heartbeat interval in seconds
           # @default `DD_CLOUDWISE_HEARTBEAT_INTERVAL` environment variable, otherwise `30`
           # @return [Integer]
+          # rubocop:disable CustomCops/EnvStringValidationCop
           option :heartbeat_interval do |o|
             o.type :int
             o.env 'DD_CLOUDWISE_HEARTBEAT_INTERVAL'
@@ -1086,6 +1079,7 @@ module Datadog
             o.env 'DD_CLOUDWISE_LICENSE_CHECK_INTERVAL'
             o.default 300
           end
+          # rubocop:enable CustomCops/EnvStringValidationCop
 
           # Application registration interval in seconds (3 minutes)
           # @default `DD_CLOUDWISE_APP_REGISTRATION_INTERVAL` environment variable, otherwise `180`