cw-datadog 2.23.0.7 → 2.23.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 767d32bfe21955c161a202aa6f76f7664bb2ac5fb7360a07838772c2bc3cdbc3
-  data.tar.gz: b72a9c5a95d19c01d2b94d751e7fec196d0750383e5dca4c4d3985c20f25323d
+  metadata.gz: ad65aab58434d4c3d2ccf8a00d2c728231eaca2369aab6d8fac4293d146d7641
+  data.tar.gz: 7e4d9d0fc890f0d6ea2cb11014879f6a86af57f8eb89882fa3cdfc0db1acd3c5
 SHA512:
-  metadata.gz: 40a7be0754bd238dbc77b1817eee6ba0fecac7f896382d23f7cc6e3c0ba79fa90c0cc303a1f0bc538fbf798db16fbff2f24485cd2bf865cf9dd5808a9085b8cd
-  data.tar.gz: 5999b9758ab07a66bca413a01c89d842aceed792accbc2934e5cff9c8646a0cb24b579d630e8d0d92f4d1014b295a207065db174fda75231e1afe97ee31d4e76
+  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
 
         # 类级别的单例锁，确保全局只初始化一次
@@ -192,6 +194,7 @@ 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)
             Cloudwise.log_debug { 'Cloudwise DOCC component stopped' }
           else
@@ -246,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
@@ -321,14 +326,22 @@ module Datadog
             interval: settings.cloudwise.heartbeat_interval
           )
 
-          # 3. DOCC Operation Worker (30s interval)
+          # 3. DOCC App Registration Worker (3 min interval, DOOP prefix)
+          @docc_app_registration_worker = DOCCAppRegistrationWorker.new(
+            client: client,
+            logger: logger,
+            probe_state: probe_state,
+            interval: settings.cloudwise.app_registration_interval
+          )
+
+          # 4. DOCC Operation Worker (30s interval)
           @docc_operation_worker = DOCCOperationWorker.new(
             client: client,
             logger: logger,
             probe_state: probe_state
           )
 
-          # 4. Time Sync Worker (3 min interval)
+          # 5. Time Sync Worker (3 min interval)
           @time_sync_worker = TimeSyncWorker.new(
             client: client,
             logger: logger,
@@ -416,8 +429,9 @@ module Datadog
         # 1. 启动 DOCC 心跳 worker
         # 2. 等待第一次心跳成功
         # 3. 启动 DOCC 注册 worker
-        # 4. 启动 Time Sync worker (3 min interval)
-        # 5. 启动 DOCC 操作 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
           Thread.new do
             Thread.current.name = 'Cloudwise-DOCC-Initializer'
@@ -441,13 +455,19 @@ module Datadog
             @docc_registration_worker.start
 
             # ============================================================
-            # STEP 3: Start Time Sync worker (3 min interval)
+            # STEP 3: Start App Registration worker (DOOP prefix)
+            # ============================================================
+            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)
             # ============================================================
             Cloudwise.log_debug { 'Cloudwise docc: Starting Time Sync worker (3 min interval)...' }
             @time_sync_worker.start
 
             # ============================================================
-            # STEP 4: Start DOCC Operation worker
+            # STEP 5: Start DOCC Operation worker
             # ============================================================
             Cloudwise.log_debug { 'Cloudwise docc: Starting operation worker...' }
             @docc_operation_worker.start

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/version.rb

@@ -5,7 +5,7 @@ module Datadog
     MAJOR = 2
     MINOR = 23
     PATCH = 0
-    PATCH_MINOR = 7
+    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.7
+  version: 2.23.0.8
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-07 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.7/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.23.0.7
+  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: