cw-datadog 2.23.0.3 → 2.23.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e48258b923a9015853cdfcb2b879dfcf9cc347ca9c8ade2ec013d66c0752ed93
-  data.tar.gz: '0998633db06aa8661eeb1f75bb6b4a18460109ae6815671cdcc6e10f8def8a30'
+  metadata.gz: bd6025da8b149a6b2277f316f7549afc34f428ce4de309db359dfc9addc38986
+  data.tar.gz: da6349523059c13f04fb61e415e081926d6d8d16f2946558473765371ad951cd
 SHA512:
-  metadata.gz: 216d0de9105aecd55f60d887be3c1779d3fdb51aa120f454a4b8ab7093f6e0e64fe06df5d9ea69677c94a190ed1cd767f67be0fd98c255b137c64495f9208447
-  data.tar.gz: 126ae7bae30741f6b010cf6e13dd5ff013f0a2e69a82bf2a156043260142781e520f4d87341bebbd4d928e599790094e67af55f505e1f08c138eca515e2ef77e
+  metadata.gz: e14911f3d08e21faa4875f030b9889efd3909fc6c30cbd3e01f5cb716014a468f28800307b3535b5d54895a90b14cb1d838b88281f724ef4e872b1f632014085
+  data.tar.gz: fbe9e9791dfd7e1b3cad8b0e74eac6ee79c579bc5c3357e231c4a5fc3c44722b58acc7860bd2f3674cf04a6e9deba41cf3729fee4508114568665a12f6c4c494

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

@@ -22,14 +22,15 @@ module Datadog
         # DOCC response codes
         DOCC_CODE_SUCCESS = 100000
 
-        def initialize(base_url:, server_name:, license_key:, logger:, integrated_mode: true, token: nil, api_prefix: nil)
+        def initialize(base_url:, server_name:, license_key:, logger:, integrated_mode: true, token: nil, api_prefix: nil, api_prefix_mode: nil)
           @base_url = normalize_url(base_url)
           @server_name = server_name
           @license_key = license_key
           @logger = logger
           @integrated_mode = integrated_mode
           @token = token
-          @api_prefix = api_prefix  # 统一的 API 路径前缀
+          @api_prefix = api_prefix  # 自定义 API 路径前缀
+          @api_prefix_mode = api_prefix_mode  # API 前缀模式（简化配置）
           @host_id = nil
           @account_id = nil
           @is_first_heartbeat = true
@@ -63,7 +64,8 @@ module Datadog
             logger: logger,
             integrated_mode: settings.cloudwise.integrated_mode,
             token: settings.cloudwise.token,
-            api_prefix: settings.cloudwise.api_prefix
+            api_prefix: settings.cloudwise.api_prefix,
+            api_prefix_mode: settings.cloudwise.api_prefix_mode
           )
         end
 
@@ -197,6 +199,22 @@ module Datadog
           })
         end
 
+        # 熔断状态上报接口
+        # @param fuse_state [Integer] 熔断状态码
+        # @param fuse_describe [String] 熔断描述
+        def report_fuse_state(fuse_state:, fuse_describe:)
+          host_ip = get_local_ip
+
+          post('/api/v1/agent/fuseHeart', {
+            version: Datadog::VERSION::STRING,
+            accountId: @account_id,
+            agentId: generate_agent_id(host_ip),
+            fuseState: fuse_state,
+            fuseDescribe: fuse_describe,
+            appId: generate_app_id(server_name)
+          })
+        end
+
         # 应用注册接口
         def register_application
           host_ip = get_local_ip
@@ -261,7 +279,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'] || '',
+              sys: ENV['CW_SYS'] || 'default',
               env_tag: Datadog.configuration.env || 'default'
             }
           }
@@ -590,7 +608,7 @@ module Datadog
         end
 
         # 统一处理 API 路径前缀
-        # 优先级：DD_CLOUDWISE_API_PREFIX > integrated_mode (/apm) > 无前缀
+        # 优先级：api_prefix_mode > api_prefix > integrated_mode (/apm) > 无前缀
         # @param path [String] 原始路径
         # @return [String] 处理后的路径
         def apply_api_prefix(path)
@@ -603,6 +621,7 @@ module Datadog
             '/v2/app/generateHostId',
             '/v2/app/registerHost',
             '/api/v1/agent/heartbeat',
+            '/api/v1/agent/fuseHeart',
             '/v2/app/create',
             '/v2/licence/verification'
           ]
@@ -611,21 +630,50 @@ module Datadog
           needs_prefix = cloudwise_api_paths.any? { |p| path.start_with?(p) }
           return path unless needs_prefix
 
-          # 优先级 1: 显式配置的 api_prefix（最高优先级）
+          # 优先级 1: api_prefix_mode 模式配置（最高优先级，简化配置）
+          if @api_prefix_mode && !@api_prefix_mode.empty?
+            prefix = get_prefix_by_mode(@api_prefix_mode)
+            return "#{prefix}#{path}" if prefix
+          end
+
+          # 优先级 2: 显式配置的 api_prefix（自定义前缀）
           if @api_prefix && !@api_prefix.empty?
             prefix = @api_prefix.start_with?('/') ? @api_prefix : "/#{@api_prefix}"
             return "#{prefix}#{path}"
           end
 
-          # 优先级 2: integrated_mode 使用 /apm 前缀
+          # 优先级 3: integrated_mode 使用 /apm 前缀
           if use_integrated_mode?
             return "/apm#{path}"
           end
 
-          # 优先级 3: 无前缀（默认）
+          # 优先级 4: 无前缀（默认）
           path
         end
 
+        # 根据模式获取前缀
+        # @param mode [String] 前缀模式：'doop', 'apm', 'custom'
+        # @return [String, nil] 前缀字符串，如果模式无效返回 nil
+        def get_prefix_by_mode(mode)
+          case mode.to_s.downcase
+          when 'doop'
+            '/doop-agent-api'
+          when 'apm'
+            '/apm'
+          when 'custom'
+            # 使用 api_prefix 配置的自定义前缀
+            if @api_prefix && !@api_prefix.empty?
+              @api_prefix.start_with?('/') ? @api_prefix : "/#{@api_prefix}"
+            else
+              Cloudwise.log_warn { "Cloudwise: api_prefix_mode='custom' but api_prefix is not set" }
+              nil
+            end
+          else
+            Cloudwise.log_warn { "Cloudwise: Unknown api_prefix_mode '#{mode}', ignoring" }
+            nil
+          end
+        end
+
         # Parse token to extract account_id and user_id
         # Token format: base64("account_id@user_id")
         def parse_token

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

@@ -290,8 +290,7 @@ module Datadog
           @docc_registration_worker = DOCCRegistrationWorker.new(
             client: client,
             logger: logger,
-            probe_state: probe_state,
-            interval: settings.cloudwise.docc_registration_interval
+            probe_state: probe_state
           )
 
           # 2. DOCC Heartbeat Worker (30s interval)
@@ -306,8 +305,7 @@ module Datadog
           @docc_operation_worker = DOCCOperationWorker.new(
             client: client,
             logger: logger,
-            probe_state: probe_state,
-            interval: settings.cloudwise.docc_operation_interval
+            probe_state: probe_state
           )
 
           # 4. License Worker (5 min interval) - License 校验逻辑保持不变

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

@@ -19,6 +19,22 @@ module Datadog
         # 成功的状态码
         CODE_SUCCESS = 1000
 
+        # 熔断状态定义
+        FUSE_STATE_NORMAL = 0      # 正常
+        FUSE_STATE_FUSING = 1      # 熔断
+
+        # 熔断描述定义
+        FUSE_DESCRIBE_LICENSE_EXPIRED = 7        # License过期熔断
+        FUSE_DESCRIBE_AGENT_SUSPENDED = 8        # Agent暂停熔断
+        FUSE_DESCRIBE_LICENSE_OVER_QUOTA = 9     # License超配额熔断
+        FUSE_DESCRIBE_LICENSE_INTERFACE_ERROR = 10  # License接口异常熔断
+
+        # License 响应码定义
+        LICENSE_CODE_AGENT_SUSPENDED = 4113      # Agent暂停
+        LICENSE_CODE_OVER_QUOTA = 4114           # License超配额
+        LICENSE_CODE_EXPIRED = 4116              # License过期
+        LICENSE_CODE_INTERFACE_ERROR = 4120      # License接口异常
+
         attr_reader :client
 
         def initialize(client:, logger:, probe_state:, **options)
@@ -26,6 +42,8 @@ module Datadog
           @logger = logger
           @probe_state = probe_state
           @failure_count = 0
+          @last_fuse_state = nil      # 记录最后一次的熔断状态
+          @last_fuse_describe = nil   # 记录最后一次的熔断描述
 
           # Workers::Async::Thread settings
           self.fork_policy = options.fetch(:fork_policy, Workers::Async::Thread::FORK_POLICY_STOP)
@@ -79,19 +97,34 @@ module Datadog
           # msg 字段在响应的顶层（result[:message]），是字符串 "true" 或 "false"
           msg = result[:message]
 
-          # License 校验成功 (code == 1000)
+          # License 校验成功 (code == 1000 且 msg == 'true')
           if code == CODE_SUCCESS && msg == 'true'
             Cloudwise.log_debug { 'Cloudwise: License valid' }
             probe_state.mark_license_valid!
             @failure_count = 0  # 重置失败计数
+            # 上报正常状态（如果状态发生变化）
+            report_fuse_state_if_changed(FUSE_STATE_NORMAL, nil)
+            return
+          end
+
+          # 特殊情况：code == 1000 但 msg == 'false'，视为 License 过期
+          if code == CODE_SUCCESS && msg == 'false'
+            Cloudwise.log_error { "Cloudwise: License verification failed - code #{code} with msg false (License expired)" }
+            probe_state.mark_license_invalid!
+            @failure_count = 0  # 重置失败计数（因为接口成功返回了）
+            # 上报为License过期熔断状态
+            report_fuse_state_if_changed(FUSE_STATE_FUSING, FUSE_DESCRIBE_LICENSE_EXPIRED)
             return
           end
 
-          # License 校验失败 (code != 1000)
+          # 其他 License 校验失败情况 (code != 1000)
           Cloudwise.log_error { "Cloudwise: License verification failed with code #{code}" }
-          Cloudwise.log_error { "Cloudwise: Data collection suspended due to invalid license" }
           probe_state.mark_license_invalid!
           @failure_count = 0  # 重置失败计数（因为接口成功返回了）
+
+          # 根据错误码上报相应的熔断状态
+          fuse_describe = map_license_code_to_fuse_describe(code)
+          report_fuse_state_if_changed(FUSE_STATE_FUSING, fuse_describe)
         end
 
         def handle_license_failure
@@ -102,8 +135,59 @@ module Datadog
           if @failure_count >= MAX_RETRIES
             Cloudwise.log_error { "Cloudwise: License verification failed #{@failure_count} times, marking as invalid" }
             probe_state.mark_license_invalid!
+
+            # 上报License接口异常熔断状态
+            report_fuse_state_if_changed(FUSE_STATE_FUSING, FUSE_DESCRIBE_LICENSE_INTERFACE_ERROR)
+          end
+        end
+
+        # 将License错误码映射为熔断描述
+        def map_license_code_to_fuse_describe(license_code)
+          case license_code
+          when LICENSE_CODE_AGENT_SUSPENDED
+            FUSE_DESCRIBE_AGENT_SUSPENDED
+          when LICENSE_CODE_OVER_QUOTA
+            FUSE_DESCRIBE_LICENSE_OVER_QUOTA
+          when LICENSE_CODE_EXPIRED
+            FUSE_DESCRIBE_LICENSE_EXPIRED
+          when LICENSE_CODE_INTERFACE_ERROR
+            FUSE_DESCRIBE_LICENSE_INTERFACE_ERROR
+          else
+            # 其他未知的License错误码，统一按接口异常处理
+            FUSE_DESCRIBE_LICENSE_INTERFACE_ERROR
           end
         end
+
+        # 仅在状态发生变化时上报熔断状态
+        # @param fuse_state [Integer] 熔断状态: 0-正常, 1-熔断
+        # @param fuse_describe [Integer, nil] 熔断描述: 7/8/9/10，正常状态时为nil
+        def report_fuse_state_if_changed(fuse_state, fuse_describe)
+          # 检查状态是否发生变化
+          if @last_fuse_state == fuse_state && @last_fuse_describe == fuse_describe
+            Cloudwise.log_debug { "Cloudwise: Fuse state unchanged (state: #{fuse_state}, describe: #{fuse_describe}), skip reporting" }
+            return
+          end
+
+          # 状态发生变化，进行上报
+          Cloudwise.log_info { "Cloudwise: Fuse state changed from (#{@last_fuse_state}, #{@last_fuse_describe}) to (#{fuse_state}, #{fuse_describe})" }
+
+          # 构造上报参数
+          fuse_describe_str = fuse_describe ? fuse_describe.to_s : fuse_state.to_s
+
+          # 调用Client的上报接口
+          result = client.report_fuse_state(fuse_state: fuse_state, fuse_describe: fuse_describe_str)
+
+          if result[:success]
+            Cloudwise.log_debug { "Cloudwise: Fuse state reported successfully (state: #{fuse_state}, describe: #{fuse_describe})" }
+            # 更新最后一次的状态
+            @last_fuse_state = fuse_state
+            @last_fuse_describe = fuse_describe
+          else
+            Cloudwise.log_error { "Cloudwise: Failed to report fuse state: #{result[:error]}" }
+          end
+        rescue => e
+          Cloudwise.log_error { "Cloudwise: Error reporting fuse state: #{e.class.name} #{e.message}" }
+        end
       end
     end
   end

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

@@ -1044,15 +1044,30 @@ module Datadog
             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') > 无前缀
+        # 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
 
+          # SYS
+          option :sys do |o|
+            o.type :string, nilable: true
+            o.env 'CW_SYS'
+            o.default 'default'
+          end
+
           # Heartbeat interval in seconds
           # @default `DD_CLOUDWISE_HEARTBEAT_INTERVAL` environment variable, otherwise `30`
           # @return [Integer]

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

@@ -37,6 +37,7 @@ module Datadog
          "DD_CLOUDWISE_LICENSE_KEY" => {version: ["A"]},
          "DD_CLOUDWISE_TOKEN" => {version: ["A"]},
          "CW_SYS" => {version: ["A"]},
+         "DD_CLOUDWISE_API_PREFIX_MODE" => {version: ["A"]},
          "DD_CLOUDWISE_API_PREFIX" => {version: ["A"]},
          "DD_CRASHTRACKING_ENABLED" => {version: ["A"]},
          "DD_DATA_STREAMS_ENABLED" => {version: ["A"]},

data/lib/datadog/tracing/transport/http/api.rb

@@ -42,14 +42,24 @@ module Datadog
           end
 
           # 获取 Traces V4 API 路径
-          # 优先级：DD_CLOUDWISE_API_PREFIX > integrated_mode > 默认
+          # 优先级：api_prefix_mode > api_prefix > integrated_mode > 默认
           def get_traces_v4_path
             base_path = '/api/v2/traces'
 
-            # 优先级 1: 显式配置的 api_prefix（最高优先级）
-            if defined?(Datadog.configuration) &&
-               Datadog.configuration.respond_to?(:cloudwise) &&
-               Datadog.configuration.cloudwise.respond_to?(:api_prefix)
+            return base_path unless defined?(Datadog.configuration) &&
+                                   Datadog.configuration.respond_to?(:cloudwise)
+
+            # 优先级 1: api_prefix_mode 模式配置（最高优先级，简化配置）
+            if Datadog.configuration.cloudwise.respond_to?(:api_prefix_mode)
+              api_prefix_mode = Datadog.configuration.cloudwise.api_prefix_mode
+              if api_prefix_mode && !api_prefix_mode.empty?
+                prefix = get_prefix_by_mode(api_prefix_mode)
+                return "#{prefix}#{base_path}" if prefix
+              end
+            end
+
+            # 优先级 2: 显式配置的 api_prefix（自定义前缀）
+            if Datadog.configuration.cloudwise.respond_to?(:api_prefix)
               api_prefix = Datadog.configuration.cloudwise.api_prefix
               if api_prefix && !api_prefix.empty?
                 prefix = api_prefix.start_with?('/') ? api_prefix : "/#{api_prefix}"
@@ -57,15 +67,38 @@ module Datadog
               end
             end
 
-            # 优先级 2: integrated_mode 使用 /apm 前缀
+            # 优先级 3: integrated_mode 使用 /apm 前缀
             if cloudwise_integrated_mode?
               return "/apm#{base_path}"
             end
 
-            # 优先级 3: 无前缀（默认）
+            # 优先级 4: 无前缀（默认）
             base_path
           end
 
+          # 根据模式获取前缀
+          # @param mode [String] 前缀模式：'doop', 'apm', 'custom'
+          # @return [String, nil] 前缀字符串，如果模式无效返回 nil
+          def get_prefix_by_mode(mode)
+            case mode.to_s.downcase
+            when 'doop'
+              '/doop-agent-api'
+            when 'apm'
+              '/apm'
+            when 'custom'
+              # 使用 api_prefix 配置的自定义前缀
+              if Datadog.configuration.cloudwise.respond_to?(:api_prefix)
+                api_prefix = Datadog.configuration.cloudwise.api_prefix
+                if api_prefix && !api_prefix.empty?
+                  return api_prefix.start_with?('/') ? api_prefix : "/#{api_prefix}"
+                end
+              end
+              nil
+            else
+              nil
+            end
+          end
+
           # 检查是否启用 integrated_mode
           def cloudwise_integrated_mode?
             return false unless defined?(Datadog.configuration) &&

data/lib/datadog/version.rb

@@ -5,7 +5,7 @@ module Datadog
     MAJOR = 2
     MINOR = 23
     PATCH = 0
-    PATCH_MINOR = 3
+    PATCH_MINOR = 4
     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.3
+  version: 2.23.0.4
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-01 00:00:00.000000000 Z
+date: 2025-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -1070,8 +1070,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.3/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.23.0.3
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.23.0.4/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.23.0.4
 post_install_message:
 rdoc_options: []
 require_paths: