agentbill-sdk 7.17.0 → 9.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55eed0a2b3bf82cdd116d56d4fdd3f41c8ab60166be0d456d1a5791a2bf12dbd
-  data.tar.gz: aae409ee8bd40d1ba774364ce570c6d5e4da4ad81847dc466433e755a2dc0e7d
+  metadata.gz: 0ee9e7fe3afb95e290b137974dadcb40147cc4b3855985688bf5ece9c037930b
+  data.tar.gz: 52fdd0c0634edc3bd36425244a0fc923e2b820bfced8fe8a14ace7538e55225d
 SHA512:
-  metadata.gz: 5ca68a5403e625c73793d0d26b68795b56660f348e70d49b977981dc78f46429804cc25a736e1146763566472c78e8749263c1e42ba36d36670b18bbc709ead7
-  data.tar.gz: 831a7b5f9170db9a40b52411771a992a07d683c73fc31a350c69e1070d37f6007d3e44902b5c503dd254aa08e21f87f68ea7ac69965025900f9de73cabeb490b
+  metadata.gz: c567fa89b467b00d36f1df21ac752ea772d6c333af73df20f4ea986739acc2490e57d52568d1604a8b4067588f1796d7e94ae2e7cf3ee3ecfca71c6cdfe4c5c2
+  data.tar.gz: 3a18a47c140ed7eb1d6a46f5ee8ddc04ab91ce822bae23f7f8dcecbadf444b9b80f95f83f5006e56ddaa6cd468ddd7bad3b3940ffc030fc92116e8341b14a99b

data/CHANGELOG.md

@@ -5,6 +5,29 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.19.3] - 2026-02-24
+
+### Fixed
+- **OTLP Normalizer**: `company.id` → `agentbill.company_id` resource attribute — fixes collector rejection
+
+## [7.19.2] - 2026-02-24
+
+### Fixed
+- **M365 Seeder v1.1.0** — 3 critical fixes under Shared OTLP Normalizer topic:
+  1. **Identity Resolution (0% → 100%)**: Auto-provisions customers before seeding
+  2. **Valid Trace/Span IDs**: Uses `generateDedupFromSource()` — eliminates normalizer repair warnings
+  3. **Batched Collector Calls**: 50 spans/batch with 500ms delay — fixes 504 timeouts
+
+## [7.19.1] - 2026-02-24
+
+### Added
+- **Version Alignment**: Aligned with Python SDK v7.19.1 — M365 Copilot test data seeder for pipeline validation without enterprise account
+
+## [7.19.0] - 2026-02-24
+
+### Changed
+- **Version Alignment**: Aligned with Python SDK v7.19.0 shared OTLP normalizer and connector migration
+
 ## [7.6.3] - 2025-12-17
 
 ### Changed
@@ -60,7 +83,7 @@ agentbill.track_signal(
 - **CRITICAL**: Fixed authentication header to use `X-API-Key` instead of `Authorization: Bearer` format
 - Updated `track_signal()` method in agentbill.rb to use correct authentication
 - Updated `flush()` method in tracer.rb to use correct authentication
-- Signals now properly authenticate with record-signals and otel-collector edge functions
+- Signals now properly authenticate with the unified OTEL pipeline (otel-collector)
 
 ## [2.0.1] - 2025-10-25
 

data/lib/agentbill/attributes.rb

@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+# Canonical attribute constants for OTEL span attributes.
+#
+# Single source of truth for all attribute keys used across the SDK.
+# Prevents string drift between signals.rb, tracer.rb, and wrapper code.
+#
+# v9.5.5: Added multi-modality attributes (R3 alignment with Python/TS/Go).
+
+module AgentBill
+  module Attributes
+    # Core signal attributes
+    ATTR_EVENT_NAME       = 'agentbill.event_name'
+    ATTR_IS_BUSINESS_EVENT = 'agentbill.is_business_event'
+    ATTR_IDEMPOTENCY_KEY  = 'agentbill.idempotency_key'
+    ATTR_DATA_SOURCE      = 'agentbill.data_source'
+
+    # Identity
+    ATTR_CUSTOMER_ID = 'agentbill.customer_id'
+    ATTR_AGENT_ID    = 'agentbill.agent_id'
+
+    # Business data
+    ATTR_REVENUE    = 'agentbill.revenue'
+    ATTR_CURRENCY   = 'agentbill.currency'
+    ATTR_EVENT_TYPE = 'agentbill.event_type'
+    ATTR_EVENT_VALUE = 'agentbill.event_value'
+
+    # Linking
+    ATTR_SESSION_ID       = 'agentbill.session_id'
+    ATTR_ORDER_ID         = 'agentbill.order_id'
+    ATTR_ORDER_EXTERNAL_ID = 'agentbill.order_external_id'
+    ATTR_PARENT_SPAN_ID   = 'agentbill.parent_span_id'
+    ATTR_METADATA         = 'agentbill.metadata'
+
+    # AI telemetry (OpenTelemetry Semantic Conventions)
+    ATTR_MODEL            = 'gen_ai.request.model'
+    ATTR_PROVIDER         = 'gen_ai.system'
+    ATTR_PROMPT_TOKENS    = 'gen_ai.usage.prompt_tokens'
+    ATTR_COMPLETION_TOKENS = 'gen_ai.usage.completion_tokens'
+    ATTR_TOTAL_TOKENS     = 'gen_ai.usage.total_tokens'
+    ATTR_LATENCY_MS       = 'agentbill.latency_ms'
+    ATTR_PROMPT_HASH      = 'agentbill.prompt_hash'
+
+    # Modality / operation name (OTEL Semantic Convention: gen_ai.operation.name)
+    # Official values: chat, embeddings, text_completion, create_image, audio_speech, audio_transcription
+    ATTR_OPERATION_NAME = 'gen_ai.operation.name'
+
+    # Image generation — request params (pricing tier) vs usage (quantity billed)
+    ATTR_IMAGE_SIZE    = 'gen_ai.request.image_size'         # e.g. "1024x1024" — determines price tier
+    ATTR_IMAGE_QUALITY = 'gen_ai.request.image_quality'      # e.g. "hd", "standard" — determines price tier
+    ATTR_IMAGE_COUNT   = 'gen_ai.usage.image_count'          # actual images generated — quantity billed
+
+    # Audio — request params vs usage
+    ATTR_AUDIO_INPUT_FORMAT     = 'gen_ai.request.audio_input_format'
+    ATTR_AUDIO_OUTPUT_FORMAT    = 'gen_ai.request.audio_output_format'
+    ATTR_AUDIO_DURATION_SECONDS = 'gen_ai.usage.audio_duration_seconds'
+
+    # TTS — request params vs usage
+    ATTR_TTS_VOICE      = 'gen_ai.request.tts_voice'
+    ATTR_TTS_CHARACTERS = 'gen_ai.usage.characters'
+
+    # Embedding — request params vs usage
+    ATTR_EMBEDDING_DIMENSIONS  = 'gen_ai.request.embedding_dimensions'
+    ATTR_EMBEDDING_INPUT_COUNT = 'gen_ai.usage.embedding_input_count'
+
+    # Cache attributes
+    ATTR_CACHE_HIT   = 'agentbill.cache_hit'
+    ATTR_FROM_CACHE  = 'agentbill.from_cache'
+    ATTR_TOKENS_SAVED = 'agentbill.tokens_saved'
+    ATTR_COST_SAVED  = 'agentbill.cost_saved'
+
+    # Cost tracing (Phase 1: enable_cost_tracing flag)
+    ATTR_COST_TRACING_ENABLED = 'agentbill.cost_tracing.enabled'
+
+    # Manual cost (Phase 3 – two-variant model)
+    ATTR_COST_PROVIDED = 'agentbill.cost.provided'  # bool: server skips model_pricing
+    ATTR_COST_PROVIDER = 'agentbill.cost.provider'  # str: maps from CostData.vendor
+    ATTR_COST_AMOUNT   = 'agentbill.cost.amount'    # float: pre-calculated cost
+    ATTR_COST_CURRENCY = 'agentbill.cost.currency'  # str: currency code
+
+    # Business grouping (whitelist)
+    GROUPING_KEYS = %w[session_id workflow_id batch_id correlation_id].freeze
+
+    # Bulk
+    ATTR_BULK_INDEX   = 'agentbill.bulk_index'
+    ATTR_BULK_REQUEST = 'agentbill.bulk_request'
+
+    # Resource / SDK constants
+    RESOURCE_SERVICE_NAME = 'agentbill-ruby-sdk'
+    SDK_VERSION           = '9.5.5'
+    SCOPE_NAME            = 'agentbill.signals'
+    SCOPE_NAME_BULK       = 'agentbill.signals.bulk'
+    SIGNAL_SPAN_NAME      = 'agentbill.trace.signal'
+  end
+end

data/lib/agentbill/ollama_wrapper.rb

@@ -1,5 +1,6 @@
 # Ollama Wrapper for AgentBill Ruby SDK (Local, $0 cost)
-require_relative 'pricing'
+# v7.17.3: Fixed to use OTEL spans instead of deleted track-ai-usage endpoint
+
 
 module AgentBill
   class OllamaWrapper
@@ -43,12 +44,14 @@ module AgentBill
           input_tokens = response[:prompt_eval_count] || 0
           output_tokens = response[:eval_count] || 0
 
-          track_usage(model, 'ollama', input_tokens, output_tokens, latency, 0, config)
-
+          # v7.17.3: Track via OTEL span attributes (no track_usage call)
           span.set_attributes({
             # ✅ OTEL GenAI compliant attributes
             'gen_ai.usage.input_tokens' => input_tokens,
             'gen_ai.usage.output_tokens' => output_tokens,
+            'gen_ai.usage.total_tokens' => input_tokens + output_tokens,
+            'agentbill.event_name' => 'ollama_local',
+            'agentbill.latency_ms' => latency,
             # ⚠️ Backward compatibility
             'response.prompt_eval_count' => input_tokens,
             'response.eval_count' => output_tokens,
@@ -64,6 +67,8 @@ module AgentBill
           raise
         ensure
           span.finish
+          # v7.17.3: Auto-flush span to OTEL collector
+          tracer.flush_sync rescue nil
         end
       end
     end
@@ -94,12 +99,14 @@ module AgentBill
           input_tokens = response[:prompt_eval_count] || 0
           output_tokens = response[:eval_count] || 0
 
-          track_usage(model, 'ollama', input_tokens, output_tokens, latency, 0, config)
-
+          # v7.17.3: Track via OTEL span attributes (no track_usage call)
           span.set_attributes({
             # ✅ OTEL GenAI compliant attributes
             'gen_ai.usage.input_tokens' => input_tokens,
             'gen_ai.usage.output_tokens' => output_tokens,
+            'gen_ai.usage.total_tokens' => input_tokens + output_tokens,
+            'agentbill.event_name' => 'ollama_generate',
+            'agentbill.latency_ms' => latency,
             # ⚠️ Backward compatibility
             'response.prompt_eval_count' => input_tokens,
             'response.eval_count' => output_tokens,
@@ -115,39 +122,12 @@ module AgentBill
           raise
         ensure
           span.finish
+          # v7.17.3: Auto-flush span to OTEL collector
+          tracer.flush_sync rescue nil
         end
       end
     end
 
-    def track_usage(model, provider, input_tokens, output_tokens, latency, cost, config)
-      uri = URI("#{config[:base_url] || 'https://api.agentbill.io'}/functions/v1/track-ai-usage")
-
-      payload = {
-        api_key: config[:api_key],
-        customer_id: config[:customer_id],
-        agent_id: config[:agent_id],
-        event_name: 'ai_request',
-        model: model,
-        provider: provider,
-        prompt_tokens: input_tokens,
-        completion_tokens: output_tokens,
-        latency_ms: latency,
-        cost: cost
-      }
-
-      begin
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        http.read_timeout = 10
-
-        request = Net::HTTP::Post.new(uri.path)
-        request['Content-Type'] = 'application/json'
-        request.body = payload.to_json
-
-        http.request(request)
-      rescue => e
-        puts "[AgentBill] Tracking failed: #{e.message}" if config[:debug]
-      end
-    end
+    # v7.17.3: track_usage method DELETED - all tracking now goes through OTEL spans
   end
 end

data/lib/agentbill/perplexity_wrapper.rb

@@ -1,5 +1,6 @@
 # Perplexity AI Wrapper for AgentBill Ruby SDK
-require_relative 'pricing'
+# v7.17.3: Fixed to use OTEL spans instead of deleted track-ai-usage endpoint
+
 
 module AgentBill
   class PerplexityWrapper
@@ -35,67 +36,40 @@ module AgentBill
 
           input_tokens = response.dig(:usage, :prompt_tokens) || 0
           output_tokens = response.dig(:usage, :completion_tokens) || 0
-          cost = Pricing.calculate_cost(model, input_tokens, output_tokens, 'perplexity')
-
-          track_usage(model, 'perplexity', input_tokens, output_tokens, latency, cost, config)
+          # v9.1.0: Cost calculated server-side from token counts in span
 
+          # v7.17.3: Track via OTEL span attributes (no track_usage call)
           span.set_attributes({
             # ✅ OTEL GenAI compliant attributes
             'gen_ai.usage.input_tokens' => input_tokens,
             'gen_ai.usage.output_tokens' => output_tokens,
+            'gen_ai.usage.total_tokens' => input_tokens + output_tokens,
             'gen_ai.response.id' => response.dig(:id),
+            'agentbill.event_name' => 'ai_request',
+            'agentbill.latency_ms' => latency,
             # ⚠️ Backward compatibility
             'response.prompt_tokens' => input_tokens,
             'response.completion_tokens' => output_tokens,
-            'latency_ms' => latency,
-            'cost' => cost
+            'latency_ms' => latency
           })
           span.set_status(0)
+          span.set_status(0)
 
-          puts "[AgentBill] ✓ Perplexity chat tracked: $#{format('%.6f', cost)}" if config[:debug]
+          puts "[AgentBill] ✓ Perplexity call: #{input_tokens}in/#{output_tokens}out tokens (cost calculated server-side)" if config[:debug]
           response
         rescue => e
           span.set_status(1, e.message)
           raise
         ensure
           span.finish
+          # v7.17.3: Auto-flush span to OTEL collector
+          tracer.flush_sync rescue nil
         end
       end
 
       @client
     end
 
-    private
-
-    def track_usage(model, provider, input_tokens, output_tokens, latency, cost, config)
-      uri = URI("#{config[:base_url] || 'https://api.agentbill.io'}/functions/v1/track-ai-usage")
-
-      payload = {
-        api_key: config[:api_key],
-        customer_id: config[:customer_id],
-        agent_id: config[:agent_id],
-        event_name: 'ai_request',
-        model: model,
-        provider: provider,
-        prompt_tokens: input_tokens,
-        completion_tokens: output_tokens,
-        latency_ms: latency,
-        cost: cost
-      }
-
-      begin
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        http.read_timeout = 10
-
-        request = Net::HTTP::Post.new(uri.path)
-        request['Content-Type'] = 'application/json'
-        request.body = payload.to_json
-
-        http.request(request)
-      rescue => e
-        puts "[AgentBill] Tracking failed: #{e.message}" if config[:debug]
-      end
-    end
+    # v7.17.3: track_usage method DELETED - all tracking now goes through OTEL spans
   end
 end

data/lib/agentbill/signals.rb

@@ -2,6 +2,7 @@
 
 require 'securerandom'
 require 'net/http'
+require 'digest'
 require 'json'
 require 'uri'
 require 'time'
@@ -12,7 +13,7 @@ module AgentBill
   # Signal module for tracking business events and linking revenue to AI traces.
   module Signals
     BASE_URL = 'https://api.agentbill.io'
-    VERSION = '7.16.1'
+    VERSION = '9.4.0'
 
     @config = {}
 
@@ -46,6 +47,9 @@ module AgentBill
     # @option options [Float] :event_value Event value
     # @option options [String] :order_id Order ID to link to (v7.8.0)
     # @option options [String] :order_external_id External order ID (v7.8.0)
+    # @option options [Hash] :group_by Business grouping keys (v9.2.0) — session_id, workflow_id, batch_id, correlation_id
+    # @option options [String] :idempotency_key Dedup key (v9.2.0) — auto-generated if not provided
+    # @option options [Hash] :cost_data Manual cost/usage data (v9.2.0 Phase 3)
     #
     # @return [Hash] Result with success status
     #
@@ -72,6 +76,10 @@ module AgentBill
       generated_span_id = options[:span_id] || SecureRandom.hex(8)
       generated_trace_id = trace_id || SecureRandom.hex(16)
       now_ns = (Time.now.to_f * 1_000_000_000).to_i
+      timestamp_s = Time.now.to_i
+
+      # Auto-generate idempotency key
+      idempotency_key = options[:idempotency_key] || Digest::SHA256.hexdigest("#{generated_trace_id}:#{event_name}:#{timestamp_s}")[0, 32]
 
       # Build OTEL-compliant span attributes
       attributes = [
@@ -96,6 +104,37 @@ module AgentBill
       attributes << { key: 'agentbill.order_external_id', value: { stringValue: options[:order_external_id] } } if options[:order_external_id]
       attributes << { key: 'agentbill.metadata', value: { stringValue: JSON.generate(options[:metadata]) } } if options[:metadata]
 
+      # v9.2.0: Idempotency key
+      attributes << { key: 'agentbill.idempotency_key', value: { stringValue: idempotency_key } }
+
+      # v9.2.0: Business grouping (whitelisted keys only)
+      grouping_keys = %w[session_id workflow_id batch_id correlation_id].freeze
+      if options[:group_by].is_a?(Hash)
+        options[:group_by].each do |key, value|
+          attributes << { key: "agentbill.#{key}", value: { stringValue: value.to_s } } if grouping_keys.include?(key.to_s)
+        end
+      end
+
+      # v9.4.0: enable_cost_tracing flag
+      if config[:enable_cost_tracing]
+        attributes << { key: 'agentbill.cost_tracing.enabled', value: { boolValue: true } }
+      end
+
+      # v9.2.0: Manual cost (Phase 3 – two-variant model)
+      if options[:cost_data].is_a?(Hash)
+        cd = options[:cost_data]
+        attributes << { key: 'agentbill.cost.provider', value: { stringValue: cd[:vendor] } } if cd[:vendor]
+        if cd[:cost].is_a?(Hash)
+          attributes << { key: 'agentbill.cost.provided', value: { boolValue: true } }
+          attributes << { key: 'agentbill.cost.amount', value: { doubleValue: cd[:cost][:amount] } }
+          attributes << { key: 'agentbill.cost.currency', value: { stringValue: cd[:cost][:currency] || 'USD' } }
+        end
+        if cd[:attributes].is_a?(Hash)
+          attributes << { key: 'gen_ai.request.model', value: { stringValue: cd[:attributes][:model] } } if cd[:attributes][:model]
+          attributes << { key: 'gen_ai.usage.prompt_tokens', value: { intValue: cd[:attributes][:input_tokens] } } if cd[:attributes][:input_tokens]
+          attributes << { key: 'gen_ai.usage.completion_tokens', value: { intValue: cd[:attributes][:output_tokens] } } if cd[:attributes][:output_tokens]
+        end
+      end
       # Build OTEL payload
       payload = {
         resourceSpans: [{
@@ -195,5 +234,38 @@ module AgentBill
         **options
       )
     end
+
+    # Create a signal explicitly linked to an AI trace for cost attribution.
+    #
+    # This is the recommended way to link business events to AI costs.
+    # Requires trace_id from the AI call you want to attribute costs to.
+    # Sets enable_cost_tracing=true automatically.
+    #
+    # v9.4.0: Added as part of P2 Architecture Alignment (Python parity).
+    #
+    # @param event_name [String] Name of the business event
+    # @param trace_id [String] Trace ID from the AI call
+    # @param revenue [Float] Revenue amount
+    # @param options [Hash] Additional signal options
+    # @return [Hash] Result with status
+    #
+    # @example
+    #   AgentBill.cost_attributed_signal('purchase', 'abc123', 99.99, metadata: { product_id: 'prod-123' })
+    def cost_attributed_signal(event_name, trace_id:, revenue:, **options)
+      config = Signals.get_config
+      prev_config = config.dup
+      Signals.set_config(config.merge(enable_cost_tracing: true))
+
+      begin
+        signal(
+          event_name,
+          trace_id: trace_id,
+          revenue: revenue,
+          **options
+        )
+      ensure
+        Signals.set_config(prev_config)
+      end
+    end
   end
 end

data/lib/agentbill/version.rb

@@ -1,3 +1,3 @@
 module AgentBill
-  VERSION = "7.17.0"
+  VERSION = "9.4.0"
 end

data/lib/agentbill/wrappers.rb

@@ -15,7 +15,7 @@ module AgentBill
   # Base class for AgentBill wrapper classes.
   class BaseWrapper
     BASE_URL = 'https://api.agentbill.io/functions/v1'
-    VERSION = '7.16.1'
+    VERSION = '7.17.3'
 
     attr_reader :provider_name
 

data/lib/agentbill.rb

@@ -4,7 +4,7 @@ require 'securerandom'
 require 'digest'
 require_relative 'agentbill/version'
 require_relative 'agentbill/tracer'
-require_relative 'agentbill/pricing'
+
 require_relative 'agentbill/customers'
 require_relative 'agentbill/agents'
 require_relative 'agentbill/orders'
@@ -32,9 +32,7 @@ module AgentBill
       [1, text.to_s.length / 4].max
     end
 
-    def estimate_cost(model, input_tokens, output_tokens, provider = 'openai')
-      Pricing.calculate_cost(model, input_tokens, output_tokens, provider)
-    end
+    # v9.1.0: estimate_cost() REMOVED. Cost is 100% server-side via model_pricing table.
 
     def validate_request(model, messages, estimated_output_tokens = 1000)
       # Always validate when customer_id is present - backend will check DB policies
@@ -72,60 +70,8 @@ module AgentBill
       end
     end
 
-    # NOTE: track_usage is deprecated in v7.0.2 - signals now go through OTEL collector
-    def track_usage(model, provider, input_tokens, output_tokens, latency_ms, cost, event_name = 'ai_request', trace_id = nil, span_id = nil)
-      # v7.0.2: Route signals through otel-collector with proper span format
-      uri = URI("#{@config[:base_url] || 'https://api.agentbill.io'}/functions/v1/otel-collector")
-      
-      trace_id ||= SecureRandom.hex(16)
-      span_id ||= SecureRandom.hex(8)
-      now_ns = (Time.now.to_f * 1_000_000_000).to_i.to_s
-      
-      payload = {
-        resourceSpans: [{
-          resource: {
-            attributes: [
-              { key: 'service.name', value: { stringValue: 'agentbill-ruby-sdk' } },
-              { key: 'agentbill.customer_id', value: { stringValue: @config[:customer_id] || '' } }
-            ]
-          },
-          scopeSpans: [{
-            scope: { name: 'agentbill.signals', version: '7.16.1' },
-            spans: [{
-              traceId: trace_id,
-              spanId: span_id,
-              name: 'agentbill.trace.signal',
-              kind: 1,
-              startTimeUnixNano: now_ns,
-              endTimeUnixNano: now_ns,
-              attributes: [
-                { key: 'agentbill.event_name', value: { stringValue: event_name } },
-                { key: 'agentbill.is_business_event', value: { boolValue: true } },
-                { key: 'gen_ai.request.model', value: { stringValue: model } },
-                { key: 'gen_ai.system', value: { stringValue: provider } }
-              ],
-              status: { code: 1 }
-            }]
-          }]
-        }]
-      }
-      
-      begin
-        http = Net::HTTP.new(uri.host, uri.port)
-        http.use_ssl = true
-        http.read_timeout = 10
-        
-        request = Net::HTTP::Post.new(uri.path)
-        request['Content-Type'] = 'application/json'
-        request['x-api-key'] = @config[:api_key]
-        request.body = payload.to_json
-        
-        http.request(request)
-        puts "[AgentBill] Usage tracked via OTEL: $#{format('%.4f', cost)}" if @config[:debug]
-      rescue => e
-        puts "[AgentBill] Tracking failed: #{e.message}" if @config[:debug]
-      end
-    end
+    # v7.17.3: track_usage method DELETED - all tracking now goes through OTEL spans
+    # Use self.tracer.start_span() + span.finish() + self.tracer.flush_sync() instead
 
     public
 
@@ -218,7 +164,7 @@ module AgentBill
           # Signals should be created explicitly via track_signal()
           input_tokens = response.dig(:usage, :prompt_tokens) || 0
           output_tokens = response.dig(:usage, :completion_tokens) || 0
-          cost = config[:_client].send(:estimate_cost, model, input_tokens, output_tokens)
+          # v9.1.0: Cost calculated server-side from token counts in span
           
           span.set_attributes({
             # ✅ OTEL GenAI compliant attributes
@@ -234,13 +180,14 @@ module AgentBill
           })
           span.set_status(0)
           
-          puts "[AgentBill] ✓ OTEL span created: $#{format('%.4f', cost)} (use track_signal() for signals)" if config[:debug]
+          puts "[AgentBill] ✓ OpenAI call: #{input_tokens}in/#{output_tokens}out tokens (cost calculated server-side)" if config[:debug]
           
           # v7.5.0: Cache AI response for semantic caching
           response_content = response.dig(:choices, 0, :message, :content) || ''
-          prompt_text = messages.map { |m| m[:content] }.join(' ')
-          prompt_hash = Digest::SHA256.hexdigest(prompt_text)[0..15]
-          config[:_client].send(:cache_response, model, prompt_hash, response_content, input_tokens + output_tokens, cost)
+          # v9.1.0: Fixed prompt_hash to match backend algorithm (SHA-256 of JSON, full hash)
+          prompt_text = JSON.generate(messages)
+          prompt_hash = Digest::SHA256.hexdigest(prompt_text)
+          config[:_client].send(:cache_response, model, prompt_hash, response_content, input_tokens + output_tokens, 0)
           
           response
         rescue => e
@@ -296,7 +243,7 @@ module AgentBill
           # NOTE: wrap() only creates OTEL spans, NOT signals
           input_tokens = response.dig(:usage, :input_tokens) || 0
           output_tokens = response.dig(:usage, :output_tokens) || 0
-          cost = config[:_client].send(:estimate_cost, model, input_tokens, output_tokens, 'anthropic')
+          # v9.1.0: Cost calculated server-side from token counts in span
           
           span.set_attributes({
             # ✅ OTEL GenAI compliant attributes
@@ -367,25 +314,59 @@ module AgentBill
     def track_signal(**params)
       raise ArgumentError, "event_name is required" unless params[:event_name]
       
-      uri = URI("#{@config[:base_url] || 'https://api.agentbill.io'}/functions/v1/record-signals")
+      # v7.17.1: Unified OTEL model - route through otel-collector
+      uri = URI("#{@config[:base_url] || 'https://api.agentbill.io'}/functions/v1/otel-collector")
       
-      # Add timestamp if not provided
-      params[:timestamp] ||= Time.now.to_f
+      # Generate trace context
+      trace_id = params[:trace_id] || SecureRandom.hex(16)
+      span_id = params[:span_id] || SecureRandom.hex(8)
+      now_ns = (Time.now.to_f * 1_000_000_000).to_i
       
-      # Auto-fill customer_id or customer_external_id from config if not provided
-      if !params[:customer_id] && !params[:customer_external_id] && @config[:customer_id]
-        # Check if it's a UUID format - send as customer_id, else customer_external_id
-        uuid_regex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
-        is_uuid = @config[:customer_id].match?(uuid_regex)
-        if is_uuid
-          params[:customer_id] = @config[:customer_id]
-        else
-          params[:customer_external_id] = @config[:customer_id]
-        end
-      end
+      # Auto-fill customer_id from config if not provided
+      customer_id = params[:customer_id] || params[:customer_external_id] || @config[:customer_id] || ""
+      agent_id = params[:agent_id] || params[:agent_external_id] || @config[:agent_id] || ""
       
-      # Remove nil values
-      payload = params.reject { |_, v| v.nil? }
+      # Build OTEL-compliant span attributes
+      attributes = [
+        { "key" => "agentbill.event_name", "value" => { "stringValue" => params[:event_name] } },
+        { "key" => "agentbill.is_business_event", "value" => { "boolValue" => true } },
+        { "key" => "agentbill.data_source", "value" => { "stringValue" => "ruby-sdk" } },
+      ]
+      
+      attributes << { "key" => "agentbill.customer_id", "value" => { "stringValue" => customer_id.to_s } } if customer_id && customer_id != ""
+      attributes << { "key" => "agentbill.agent_id", "value" => { "stringValue" => agent_id.to_s } } if agent_id && agent_id != ""
+      attributes << { "key" => "agentbill.revenue", "value" => { "doubleValue" => params[:revenue] } } if params[:revenue]
+      attributes << { "key" => "agentbill.currency", "value" => { "stringValue" => params[:currency] || "USD" } } if params[:revenue]
+      attributes << { "key" => "agentbill.model", "value" => { "stringValue" => params[:model] } } if params[:model]
+      attributes << { "key" => "agentbill.session_id", "value" => { "stringValue" => params[:session_id] } } if params[:session_id]
+      attributes << { "key" => "agentbill.metadata", "value" => { "stringValue" => params[:metadata].to_json } } if params[:metadata]
+      
+      # Build OTEL payload
+      otel_payload = {
+        "resourceSpans" => [{
+          "resource" => {
+            "attributes" => [
+              { "key" => "service.name", "value" => { "stringValue" => "agentbill-ruby-sdk" } },
+              { "key" => "agentbill.customer_id", "value" => { "stringValue" => customer_id.to_s } },
+              { "key" => "agentbill.agent_id", "value" => { "stringValue" => agent_id.to_s } },
+            ]
+          },
+          "scopeSpans" => [{
+            "scope" => { "name" => "agentbill.signals", "version" => "7.17.3" },
+            "spans" => [{
+              "traceId" => trace_id,
+              "spanId" => span_id,
+              "parentSpanId" => params[:parent_span_id] || "",
+              "name" => "agentbill.trace.signal",
+              "kind" => 1,
+              "startTimeUnixNano" => now_ns.to_s,
+              "endTimeUnixNano" => now_ns.to_s,
+              "attributes" => attributes,
+              "status" => { "code" => 1 }
+            }]
+          }]
+        }]
+      }
       
       begin
         http = Net::HTTP.new(uri.host, uri.port)
@@ -394,13 +375,12 @@ module AgentBill
         request = Net::HTTP::Post.new(uri.path)
         request['X-API-Key'] = @config[:api_key]
         request['Content-Type'] = 'application/json'
-        request.body = payload.to_json
+        request.body = otel_payload.to_json
         
         response = http.request(request)
         
         if @config[:debug]
-          trace_info = params[:trace_id] ? " (trace: #{params[:trace_id]})" : ""
-          puts "[AgentBill] Signal tracked: #{params[:event_name]}#{trace_info}"
+          puts "[AgentBill] Signal tracked via OTEL: #{params[:event_name]} (trace: #{trace_id})"
         end
         
         response.code == '200'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: agentbill-sdk
 version: !ruby/object:Gem::Version
-  version: 7.17.0
+  version: 9.4.0
 platform: ruby
 authors:
 - AgentBill
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-02 00:00:00.000000000 Z
+date: 2026-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,13 +72,13 @@ files:
 - examples/zero_config.rb
 - lib/agentbill.rb
 - lib/agentbill/agents.rb
+- lib/agentbill/attributes.rb
 - lib/agentbill/customers.rb
 - lib/agentbill/distributed.rb
 - lib/agentbill/exceptions.rb
 - lib/agentbill/ollama_wrapper.rb
 - lib/agentbill/orders.rb
 - lib/agentbill/perplexity_wrapper.rb
-- lib/agentbill/pricing.rb
 - lib/agentbill/signal_types.rb
 - lib/agentbill/signals.rb
 - lib/agentbill/tracer.rb

data/lib/agentbill/pricing.rb

@@ -1,52 +0,0 @@
-# AgentBill SDK Pricing - LOCAL ESTIMATION ONLY
-#
-# IMPORTANT: Cost calculation is now 100% SERVER-SIDE
-# The server uses the model_pricing database table (synced by sync-model-pricing).
-# This module is kept ONLY for local estimation/display purposes.
-# The AUTHORITATIVE cost is always calculated server-side.
-
-module AgentBill
-  module Pricing
-    # Default fallback rates for local estimation only
-    DEFAULT_INPUT_PER_1M = 1.0
-    DEFAULT_OUTPUT_PER_1M = 2.0
-
-    class << self
-      # LOCAL ESTIMATION ONLY - for display purposes.
-      # Actual cost is calculated server-side using model_pricing database.
-      def calculate_cost(model, input_tokens, output_tokens, provider = 'openai')
-        # Ollama is free
-        return 0.0 if provider == 'ollama' || model.to_s.start_with?('ollama/')
-
-        # Simple default estimate - server calculates actual cost
-        input_cost = (input_tokens.to_f / 1_000_000) * DEFAULT_INPUT_PER_1M
-        output_cost = (output_tokens.to_f / 1_000_000) * DEFAULT_OUTPUT_PER_1M
-        input_cost + output_cost
-      end
-
-      # LOCAL ESTIMATION ONLY for image generation
-      def calculate_image_cost(model, size, quality = 'standard')
-        if model.include?('dall-e-3')
-          quality == 'hd' ? 0.08 : 0.04
-        else
-          0.02
-        end
-      end
-
-      # LOCAL ESTIMATION ONLY for audio
-      def calculate_audio_cost(model, duration_seconds: 0, chars: 0)
-        if model == 'whisper-1'
-          (duration_seconds.to_f / 60.0) * 0.006
-        elsif model.start_with?('tts-')
-          (chars.to_f / 1_000_000) * 15.0
-        else
-          0.0
-        end
-      end
-
-      def embedding_model?(model)
-        model.downcase.include?('embedding') || model.downcase.include?('embed')
-      end
-    end
-  end
-end