cw-datadog 2.23.0.6 → 2.23.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 357524fd08da065c567250e3808034acf9f913a3646454e08e57ba862b86630e
-  data.tar.gz: 1f2e9dd6587bcf9e85dd392292ae7d3383aa0049e6c47564068e3fc2be47ec98
+  metadata.gz: ad65aab58434d4c3d2ccf8a00d2c728231eaca2369aab6d8fac4293d146d7641
+  data.tar.gz: 7e4d9d0fc890f0d6ea2cb11014879f6a86af57f8eb89882fa3cdfc0db1acd3c5
 SHA512:
-  metadata.gz: e5d5e968b104db74f788b813ca07ea400169235353094b1d6376ff9b0d1d54eb45f6fe66cedca3d8e80e7edea1e51626e2e17ddd6ff173756781a7e601f74f2a
-  data.tar.gz: 7446cff8ed80819860f272d20a28bc5629e656ddc029951b177f391b833d1c0b717f64b8ac01baf38da84eed9ad1a9f24736f80fc914c0e1db96186f657c122b
+  metadata.gz: 4ed84231230329b12381aeccf6d3fdaf3b2e24ec250ed86ba9ee6972d254f28ff0db07618807869c468f4409641557515f7e5e8df8e9a776c75e0ae5402ca332
+  data.tar.gz: 17566d9b7b129d408dbbf78904c59ce53931070d91ef6528f3b46402de4aa660f2b91ec263cb67293a9d0bb292668ef82597b97c2823792b3b534578fe58817e

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

@@ -245,6 +245,38 @@ module Datadog
           })
         end
 
+        # DOCC 模式下的应用注册接口（使用 doop-agent-api 前缀）
+        # 在 DOCC 模式下也需要调用 DOOP 模式的应用注册逻辑
+        # 接口路径: /doop-agent-api/v2/app/create
+        # 调用频率: 每3分钟一次
+        def docc_register_application
+          host_ip = get_local_ip
+
+          post('/doop-agent-api/v2/app/create', {
+            serviceType: 'RUBY',
+            accountId: @token_account_id.to_i,
+            hostId: 0,
+            agentId: generate_agent_id(host_ip).to_i,
+            appId: generate_app_id(server_name).to_i,
+            sn: host_ip,
+            sport: get_server_port,
+            appName: server_name,
+            userDirRaw: server_name,
+            codeType: 1012,
+            app_type: 1,
+            vpc: '',
+            env_tag: 'default',
+            service_tag: 'default',
+            version_tag: 'default',
+            business_tag: '',
+            sys: '',
+            host_tag: '{}',
+            tags: {},
+            service_instance_id: generate_service_instance_id(host_ip).to_i,
+            system_uuid: ''
+          })
+        end
+
         # Check if should use integrated mode (DOCC interfaces)
         # 判断是否需要使用融合模式
         # token不为空且integrated_mode=true时启用

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

@@ -7,6 +7,7 @@ require_relative 'heartbeat_worker'
 require_relative 'license_worker'
 require_relative 'app_registration_worker'
 require_relative 'docc_registration_worker'
+require_relative 'docc_app_registration_worker'
 require_relative 'docc_heartbeat_worker'
 require_relative 'docc_operation_worker'
 require_relative 'time_sync_worker'
@@ -49,7 +50,8 @@ module Datadog
       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,
+          :docc_registration_worker, :docc_app_registration_worker,
+          :docc_heartbeat_worker, :docc_operation_worker,
           :time_sync_worker
 
         # 类级别的单例锁，确保全局只初始化一次
@@ -158,7 +160,7 @@ module Datadog
           Cloudwise.log_debug { 'Starting Application registration worker (3 min interval)...' }
           @app_registration_worker.start
 
-          # Start License Worker
+          # Start License Worker (only in traditional mode)
           Cloudwise.log_debug { 'Starting License verification worker (5 min interval)...' }
           @license_worker.start
         end
@@ -192,8 +194,8 @@ module Datadog
           if @client.use_integrated_mode?
             @docc_heartbeat_worker&.stop(true)
             @docc_registration_worker&.stop(true)
+            @docc_app_registration_worker&.stop(true)
             @docc_operation_worker&.stop(true)
-            @license_worker&.stop(true)
             Cloudwise.log_debug { 'Cloudwise DOCC component stopped' }
           else
             @host_id_worker&.stop(true)
@@ -233,8 +235,8 @@ module Datadog
             can_collect_data: probe_status[:can_collect_data],
             probe_active: probe_state.active?,
             probe_suspended: probe_state.suspended?,
-            license_valid: probe_status[:license_valid],
-            license_running: license_worker&.running?,
+            license_valid: @client.use_integrated_mode? ? true : probe_status[:license_valid],
+            license_running: @client.use_integrated_mode? ? false : 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?
@@ -247,6 +249,8 @@ module Datadog
               docc_operation_active: probe_status[:docc_operation_active],
               docc_heartbeat_running: docc_heartbeat_worker&.running?,
               docc_registration_running: docc_registration_worker&.running?,
+              docc_app_registered: probe_status[:app_registered],
+              docc_app_registration_running: docc_app_registration_worker&.running?,
               docc_operation_running: docc_operation_worker&.running?
             )
           else
@@ -322,22 +326,22 @@ module Datadog
             interval: settings.cloudwise.heartbeat_interval
           )
 
-          # 3. DOCC Operation Worker (30s interval)
-          @docc_operation_worker = DOCCOperationWorker.new(
+          # 3. DOCC App Registration Worker (3 min interval, DOOP prefix)
+          @docc_app_registration_worker = DOCCAppRegistrationWorker.new(
             client: client,
             logger: logger,
-            probe_state: probe_state
+            probe_state: probe_state,
+            interval: settings.cloudwise.app_registration_interval
           )
 
-          # 4. License Worker (5 min interval) - License 校验逻辑保持不变
-          @license_worker = LicenseWorker.new(
+          # 4. DOCC Operation Worker (30s interval)
+          @docc_operation_worker = DOCCOperationWorker.new(
             client: client,
             logger: logger,
-            probe_state: probe_state,
-            interval: settings.cloudwise.license_check_interval
+            probe_state: probe_state
           )
 
-          # 5. Time Sync Worker (3 min interval, depends on License)
+          # 5. Time Sync Worker (3 min interval)
           @time_sync_worker = TimeSyncWorker.new(
             client: client,
             logger: logger,
@@ -421,11 +425,11 @@ module Datadog
         end
 
         # Start DOCC workers in background
-        # DOCC 模式启动流程：
+        # DOCC 模式启动流程（不需要 License 校验）：
         # 1. 启动 DOCC 心跳 worker
         # 2. 等待第一次心跳成功
         # 3. 启动 DOCC 注册 worker
-        # 4. 启动 License worker
+        # 4. 启动 App Registration worker (DOOP prefix, 3 min interval)
         # 5. 启动 Time Sync worker (3 min interval)
         # 6. 启动 DOCC 操作 worker
         def start_docc_workers_when_ready
@@ -451,15 +455,10 @@ module Datadog
             @docc_registration_worker.start
 
             # ============================================================
-            # STEP 3: Start License worker
+            # STEP 3: Start App Registration worker (DOOP prefix)
             # ============================================================
-            Cloudwise.log_debug { 'Cloudwise docc: Starting license worker...' }
-            @license_worker.start
-
-            # Wait for first successful license validation
-            until probe_state.license_valid?
-              sleep(1)
-            end
+            Cloudwise.log_debug { 'Cloudwise docc: Starting application registration worker (DOOP prefix)...' }
+            @docc_app_registration_worker.start
 
             # ============================================================
             # STEP 4: Start Time Sync worker (3 min interval)

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

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+require_relative '../worker'
+require_relative '../workers/async'
+require_relative '../workers/polling'
+
+module Datadog
+  module Core
+    module Cloudwise
+      # Worker that registers application in DOCC mode using DOOP prefix
+      # DOCC 模式下调用 DOOP 的应用注册逻辑
+      # 接口路径: /doop-agent-api/v2/app/create
+      # 应用注册失败不影响数据采集
+      class DOCCAppRegistrationWorker < Worker
+        include Workers::Polling
+
+        # 3 minutes interval
+        DEFAULT_INTERVAL = 180
+        # 成功的状态码
+        CODE_SUCCESS = 1000
+
+        attr_reader :client
+
+        def initialize(client:, logger:, probe_state:, **options)
+          @client = client
+          @logger = logger
+          @probe_state = probe_state
+          @registration_successful = false
+
+          # Workers::Async::Thread settings
+          self.fork_policy = options.fetch(:fork_policy, Workers::Async::Thread::FORK_POLICY_STOP)
+
+          # Workers::IntervalLoop settings
+          self.loop_base_interval = options.fetch(:interval, DEFAULT_INTERVAL)
+
+          self.enabled = options.fetch(:enabled, true)
+        end
+
+        def perform
+          Cloudwise.log_debug { 'Cloudwise DOCC: Registering application (DOOP prefix)' }
+
+          result = client.docc_register_application
+
+          process_registration_result(result)
+
+          true
+        rescue => e
+          Cloudwise.log_error { "Cloudwise DOCC: Application registration worker error: #{e.class.name} #{e.message}" }
+          @probe_state.mark_app_unregistered!
+          true # Continue running
+        end
+
+        def registered?
+          @registration_successful
+        end
+
+        # Public method to start the worker
+        def start
+          return false if !enabled? || started?
+
+          # Start the async worker thread
+          perform
+        end
+
+        private
+
+        attr_reader :logger, :probe_state
+
+        def process_registration_result(result)
+          # 接口请求成功且 code == 1000
+          if result[:success] && result[:code] == CODE_SUCCESS
+            @registration_successful = true
+            Cloudwise.log_debug { 'Cloudwise DOCC: Application registration successful (DOOP prefix)' }
+            probe_state.mark_app_registered!
+          else
+            @registration_successful = false
+            error_msg = result[:error] || "code=#{result[:code]}"
+            Cloudwise.log_warn { "Cloudwise DOCC: Application registration failed: #{error_msg}, will retry in #{DEFAULT_INTERVAL}s" }
+            Cloudwise.log_warn { 'Cloudwise DOCC: Note - Registration failure does NOT affect data collection' }
+            probe_state.mark_app_unregistered!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -13,7 +13,7 @@ module Datadog
           # 初始状态：所有条件都未满足，探针不活跃
           @host_id_ready = false        # Host ID 是否已生成
           @heartbeat_active = false     # 心跳是否正常
-          @license_valid = false        # License 是否校验通过
+          @license_valid = false        # License 是否校验通过（仅传统模式使用，DOCC 模式忽略）
           @app_registered = false       # 应用是否已注册（注册失败不影响采集）
 
           # 融合模式状态
@@ -61,7 +61,7 @@ module Datadog
           end
         end
 
-        # License 相关
+        # License 相关（仅传统模式使用，DOCC 模式下不需要 License 校验）
         def mark_license_valid!
           @mutex.synchronize do
             return if @license_valid
@@ -163,12 +163,12 @@ module Datadog
         end
 
         # 探针是否可以采集数据
-        # 如果使用 DOCC 模式：需要 DOCC 心跳 + License + Operation 都正常
+        # 如果使用 DOCC 模式：需要 DOCC 心跳 + Operation 都正常（不需要 License）
         # 如果使用传统模式：需要 Host ID + 心跳 + License 都正常
         def can_collect_data?
           @mutex.synchronize do
             if @use_docc_mode
-              @docc_heartbeat_active && @license_valid && @docc_operation_active
+              @docc_heartbeat_active && @docc_operation_active
             else
               @host_id_ready && @heartbeat_active && @license_valid
             end
@@ -233,7 +233,7 @@ module Datadog
                 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
+                can_collect_data: @docc_heartbeat_active && @docc_operation_active
               )
             else
               base_status.merge(
@@ -252,12 +252,11 @@ module Datadog
           # 直接读取实例变量，避免递归锁定（不调用 can_collect_data? 方法）
           if @use_docc_mode
             # DOCC 模式状态日志
-            if @docc_heartbeat_active && @license_valid && @docc_operation_active
+            if @docc_heartbeat_active && @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(", ")})" }

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

@@ -128,8 +128,9 @@ module Datadog
         end
 
         def perform
-          # 只有在 License 校验通过后才执行时间同步
-          unless probe_state.license_valid?
+          # 传统模式下，只有在 License 校验通过后才执行时间同步
+          # DOCC 模式下不需要 License 校验
+          unless probe_state.using_docc_mode? || probe_state.license_valid?
             Cloudwise.log_debug { 'Cloudwise: Waiting for license validation before time sync' }
             return true
           end

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

@@ -1071,7 +1071,7 @@ module Datadog
             o.default 30
           end
 
-          # License check interval in seconds (5 minutes)
+          # License check interval in seconds (5 minutes, 仅传统模式使用，DOCC 模式不需要 License 校验)
           # @default `DD_CLOUDWISE_LICENSE_CHECK_INTERVAL` environment variable, otherwise `300`
           # @return [Integer]
           option :license_check_interval do |o|

data/lib/datadog/tracing/contrib/cloudwise/propagation.rb

@@ -91,8 +91,15 @@ module Datadog
             host_id = get_host_id
             app_id = generate_app_id(service_name)
             instance_id = get_instance_id
-            # 使用低 64 位 trace_id，与上报保持一致
-            trace_id = Tracing::Utils::TraceId.to_low_order(trace.id).to_s
+            # 如果上游传递了 trace_id_from（例如 Java1 -> Ruby -> Java2），
+            # 则使用上游的 trace_id_from 作为透传的 trace_id，保持端到端追踪链路一致
+            # 否则使用本服务的低 64 位 trace_id
+            upstream_trace_id = trace.get_tag('trace_id_from')
+            trace_id = if upstream_trace_id && !upstream_trace_id.empty? && upstream_trace_id != '-1'
+              upstream_trace_id
+            else
+              Tracing::Utils::TraceId.to_low_order(trace.id).to_s
+            end
             assumed_app_id = generate_assumed_app_id(target_url)
             span_id = span.id.to_s
             segment_id = get_segment_id(span)

data/lib/datadog/version.rb

@@ -5,7 +5,7 @@ module Datadog
     MAJOR = 2
     MINOR = 23
     PATCH = 0
-    PATCH_MINOR = 6
+    PATCH_MINOR = 8
     PRE = nil
     BUILD = nil
     # PRE and BUILD above are modified for dev gems during gem build GHA workflow

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cw-datadog
 version: !ruby/object:Gem::Version
-  version: 2.23.0.6
+  version: 2.23.0.8
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-18 00:00:00.000000000 Z
+date: 2026-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -303,6 +303,7 @@ files:
 - 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_app_registration_worker.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
@@ -1095,8 +1096,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.6/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.23.0.6
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.23.0.8/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.23.0.8
 post_install_message:
 rdoc_options: []
 require_paths: