cw-datadog 2.23.0.4 → 2.23.0.6

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,
@@ -157,7 +158,7 @@ module Datadog
             imagePath: get_agent_path,
             ip: host_ip,
             agentId: generate_agent_id(host_ip),
-            timestamp: Time.now.to_i,
+            timestamp: get_adjusted_timestamp_seconds,
             routingKey: 'HeartBeat',
             classPath: '',
             isFirst: @is_first_heartbeat ? 1 : 0,
@@ -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: {},
@@ -279,7 +280,7 @@ module Datadog
               sample: calculate_sample_rate,
               physical_ip: detect_container? ? get_host_real_ip : '',
               container_id: detect_container? ? get_container_id : '',
-              sys: ENV['CW_SYS'] || 'default',
+              sys: get_cloudwise_sys,
               env_tag: Datadog.configuration.env || 'default'
             }
           }
@@ -325,6 +326,60 @@ module Datadog
           post_docc("/api/ext/gaia/daemon/report/#{@agent_instance_id}", data)
         end
 
+        # 获取服务器时间戳接口
+        # @return [Hash] { success: true/false, server_timestamp: Integer (毫秒), offset_ms: Integer }
+        def fetch_server_timestamp
+          path = apply_api_prefix('/api/v70/timestamp')
+          uri = URI.join(base_url, path)
+
+          Cloudwise.log_debug { "Cloudwise: Fetching server timestamp from #{uri}" }
+
+          http = Net::HTTP.new(uri.host, uri.port)
+          http.use_ssl = (uri.scheme == 'https')
+          http.open_timeout = 5
+          http.read_timeout = 5
+
+          request = Net::HTTP::Get.new(uri.path)
+          request['User-Agent'] = "Datadog-Ruby-Agent/#{Datadog::VERSION::STRING}"
+          request['DD-Internal-Untraced-Request'] = '1'
+
+          # 记录请求前的本地时间
+          local_before = (Time.now.to_f * 1000).to_i
+
+          response = http.request(request)
+
+          # 记录请求后的本地时间
+          local_after = (Time.now.to_f * 1000).to_i
+
+          if response.code.to_i == 200
+            server_timestamp = response.body.to_s.strip.to_i
+
+            # 使用请求前后的中间时间作为本地参考时间
+            local_timestamp = (local_before + local_after) / 2
+
+            # 计算时间偏移（服务器时间 - 本地时间）
+            # 正值表示服务器时间比本地快，负值表示服务器时间比本地慢
+            offset_ms = server_timestamp - local_timestamp
+
+            Cloudwise.log_debug do
+              "Cloudwise: Server timestamp sync - server=#{server_timestamp}, local=#{local_timestamp}, offset=#{offset_ms}ms"
+            end
+
+            {
+              success: true,
+              server_timestamp: server_timestamp,
+              local_timestamp: local_timestamp,
+              offset_ms: offset_ms
+            }
+          else
+            Cloudwise.log_warn { "Cloudwise: path: #{path} Failed to fetch server timestamp: #{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}
+        end
+
         private
 
         def post(path, data)
@@ -344,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}" }
@@ -369,16 +428,40 @@ 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] 校正后的秒级时间戳
+        def get_adjusted_timestamp_seconds
+          local_time_s = Time.now.to_i
+          if defined?(TimeSyncWorker) && TimeSyncWorker.sync_enabled?
+            # offset_ms 是毫秒，转换为秒
+            local_time_s + (TimeSyncWorker.offset_ms / 1000)
+          else
+            local_time_s
           end
         end
 
+        # 获取校正后的毫秒级时间戳
+        # 如果启用了时间同步，会应用偏移量校正
+        # @return [Integer] 校正后的毫秒级时间戳
+        def get_adjusted_timestamp_ms
+          local_time_ms = (Time.now.to_f * 1000).to_i
+          if defined?(TimeSyncWorker) && TimeSyncWorker.sync_enabled?
+            local_time_ms + TimeSyncWorker.offset_ms
+          else
+            local_time_ms
+          end
+        end
 
         # 获取本机 IP 地址
         # 优先获取外网 IP（通过创建 UDP 连接，不实际发送数据）
@@ -432,7 +515,6 @@ module Datadog
           rescue => e
             Cloudwise.log_debug { "Cloudwise: Failed to get IP via interfaces: #{e.message}" }
           end
-
         end
 
         # 获取 Agent 路径
@@ -528,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
 
@@ -623,7 +706,8 @@ module Datadog
             '/api/v1/agent/heartbeat',
             '/api/v1/agent/fuseHeart',
             '/v2/app/create',
-            '/v2/licence/verification'
+            '/v2/licence/verification',
+            '/api/v70/timestamp'
           ]
 
           # 检查是否是需要添加前缀的路径
@@ -689,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)' }
@@ -703,6 +787,21 @@ 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)
+            sys = Datadog.configuration.cloudwise.sys
+            return sys if sys && !sys.empty? && sys != 'default'
+          end
+
+          # 其次从环境变量读取
+          ENV['CW_SYS'] || 'default'
+        end
 
         # Get current run user
         def get_run_user
@@ -722,7 +821,6 @@ module Datadog
           ''
         end
 
-
         # Get system UUID
         # Try multiple methods to get a unique system identifier
         def get_system_uuid
@@ -739,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
@@ -775,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
@@ -868,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

@@ -9,6 +9,9 @@ require_relative 'app_registration_worker'
 require_relative 'docc_registration_worker'
 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
@@ -18,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)
@@ -45,8 +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
+          :license_worker, :app_registration_worker, :logger,
+          :docc_registration_worker, :docc_heartbeat_worker, :docc_operation_worker,
+          :time_sync_worker
 
         # 类级别的单例锁，确保全局只初始化一次
         @initialization_mutex = Mutex.new
@@ -101,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
@@ -185,6 +186,9 @@ module Datadog
         def stop
           return unless @enabled
 
+          # 停止时间同步 worker（两种模式都需要）
+          @time_sync_worker&.stop(true)
+
           if @client.use_integrated_mode?
             @docc_heartbeat_worker&.stop(true)
             @docc_registration_worker&.stop(true)
@@ -213,9 +217,16 @@ 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
+
           base_status = {
             enabled: true,
             integrated_mode: @client.use_integrated_mode?,
@@ -223,7 +234,10 @@ module Datadog
             probe_active: probe_state.active?,
             probe_suspended: probe_state.suspended?,
             license_valid: probe_status[:license_valid],
-            license_running: license_worker&.running?
+            license_running: license_worker&.running?,
+            time_sync_enabled: time_sync_status[:enabled],
+            time_sync_offset_ms: time_sync_status[:offset_ms],
+            time_sync_running: time_sync_worker&.running?
           }
 
           if @client.use_integrated_mode?
@@ -282,6 +296,13 @@ module Datadog
             probe_state: probe_state,
             interval: settings.cloudwise.license_check_interval
           )
+
+          # 5. Time Sync Worker (3 min interval, depends on License)
+          @time_sync_worker = TimeSyncWorker.new(
+            client: client,
+            logger: logger,
+            probe_state: probe_state
+          )
         end
 
         # 初始化 DOCC 模式的 workers
@@ -315,6 +336,13 @@ module Datadog
             probe_state: probe_state,
             interval: settings.cloudwise.license_check_interval
           )
+
+          # 5. Time Sync Worker (3 min interval, depends on License)
+          @time_sync_worker = TimeSyncWorker.new(
+            client: client,
+            logger: logger,
+            probe_state: probe_state
+          )
         end
 
         # 检查实例是否已经启动
@@ -335,7 +363,8 @@ module Datadog
         # 3. Start Heartbeat worker
         # 4. Start App Registration worker (non-blocking)
         # 5. Start License worker
-        # 6. ProbeState controls whether data collection is active
+        # 6. Start Time Sync worker (3 min interval)
+        # 7. ProbeState controls whether data collection is active
         def start_cloudwise_workers_when_ready
           Thread.new do
             Thread.current.name = 'Cloudwise-Initializer'
@@ -368,7 +397,6 @@ module Datadog
             # ============================================================
             # STEP 4: Start License worker
             # ============================================================
-            #
             @license_worker.start
 
             # Wait for first successful license validation
@@ -376,6 +404,12 @@ module Datadog
               sleep(1)
             end
 
+            # ============================================================
+            # STEP 5: Start Time Sync worker (3 min interval)
+            # ============================================================
+            Cloudwise.log_debug { 'Cloudwise: Starting Time Sync worker (3 min interval)...' }
+            @time_sync_worker.start
+
             # ============================================================
             # All validations passed - Probe is now ACTIVE
             # ============================================================
@@ -392,7 +426,8 @@ module Datadog
         # 2. 等待第一次心跳成功
         # 3. 启动 DOCC 注册 worker
         # 4. 启动 License worker
-        # 5. 启动 DOCC 操作 worker
+        # 5. 启动 Time Sync worker (3 min interval)
+        # 6. 启动 DOCC 操作 worker
         def start_docc_workers_when_ready
           Thread.new do
             Thread.current.name = 'Cloudwise-DOCC-Initializer'
@@ -400,11 +435,11 @@ module Datadog
             # ============================================================
             # STEP 1: Start DOCC Heartbeat worker
             # ============================================================
-            Cloudwise.log_debug { 'Cloudwise DOCC: Starting heartbeat worker...' }
+            Cloudwise.log_debug { 'Cloudwise docc: Starting heartbeat worker...' }
             @docc_heartbeat_worker.start
 
             # Wait for first successful heartbeat
-            Cloudwise.log_debug { 'Cloudwise DOCC: Waiting for first successful heartbeat...' }
+            Cloudwise.log_debug { 'Cloudwise docc: Waiting for first successful heartbeat...' }
             until probe_state.docc_heartbeat_active?
               sleep(1)
             end
@@ -412,13 +447,13 @@ module Datadog
             # ============================================================
             # STEP 2: Start DOCC Registration worker
             # ============================================================
-            Cloudwise.log_debug { 'Cloudwise DOCC: Starting registration worker...' }
+            Cloudwise.log_debug { 'Cloudwise docc: Starting registration worker...' }
             @docc_registration_worker.start
 
             # ============================================================
             # STEP 3: Start License worker
             # ============================================================
-            Cloudwise.log_debug { 'Cloudwise DOCC: Starting license worker...' }
+            Cloudwise.log_debug { 'Cloudwise docc: Starting license worker...' }
             @license_worker.start
 
             # Wait for first successful license validation
@@ -427,17 +462,23 @@ module Datadog
             end
 
             # ============================================================
-            # STEP 4: Start DOCC Operation worker
+            # STEP 4: Start Time Sync worker (3 min interval)
             # ============================================================
-            Cloudwise.log_debug { 'Cloudwise DOCC: Starting operation worker...' }
+            Cloudwise.log_debug { 'Cloudwise docc: Starting Time Sync worker (3 min interval)...' }
+            @time_sync_worker.start
+
+            # ============================================================
+            # STEP 5: Start DOCC Operation worker
+            # ============================================================
+            Cloudwise.log_debug { 'Cloudwise docc: Starting operation worker...' }
             @docc_operation_worker.start
 
             # ============================================================
             # All validations passed - Probe is now ACTIVE
             # ============================================================
-            Cloudwise.log_debug { 'Cloudwise DOCC: Data collection and reporting now enabled.' }
+            Cloudwise.log_debug { 'Cloudwise docc: Data collection and reporting now enabled.' }
           rescue => e
-            Cloudwise.log_error { "Cloudwise DOCC: Error in background initializer: #{e.class.name} #{e.message}" }
+            Cloudwise.log_error { "Cloudwise docc: Error in background initializer: #{e.class.name} #{e.message}" }
             Cloudwise.log_error { e.backtrace.join("\n") }
           end
         end
@@ -462,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}" }
@@ -476,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
-