activeagents-telemetry-ruby_llm 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5abf7d85a5deec9d008170f9c9a3e50d619024b7bad8c1f01eea3eda3d3befc6
-  data.tar.gz: ea10cb9f3cb45700fe8ad0642c72eb3c6e01576c1e4353d274998ead5f3f7243
+  metadata.gz: 255ca4c32e9f775c8b2e45ab431ae81ee410fa3002d66dce026ba06d948da4b6
+  data.tar.gz: 1afbdf608524f69045341e10cd7a6f722854cc49977e27ff511cafcc8368fa72
 SHA512:
-  metadata.gz: 67e5b7d06a3de8510dead200b6ec9a4da44172d24b46c3ea02646cfd4fad1fc3c5acb960798e17a5957f61d8dcd4bd7efc392ae08f8e46ef19b084014e357073
-  data.tar.gz: 16dde44b30870de36415b0958b85eabff49caf639238baf140107e6b2a986effe21bf0eea529c78b5810d90816098cac8c35f09800304c3c5cddd3c7ab6b3c22
+  metadata.gz: 5b316442b6a5bb9044df92b691d6d4dee824d12522c45f4367d252cf7041aeee2be2060ce3a604f9b0e36b814c04e78ef5280646ad67ae7f893c29f0a1799c2b
+  data.tar.gz: 2fe33cb43e2a35659c2112decb662199b461f756e8ef63560e4e7b63151fde0fdcfa1a4f042c6f0419bead7e41787ec43ba51fdbcee58bc4cd1550014a3f56b5

data/lib/activeagents/telemetry/ruby_llm/version.rb

@@ -3,7 +3,7 @@
 module ActiveAgents
   module Telemetry
     module RubyLLM
-      VERSION = "0.3.0"
+      VERSION = "0.3.1"
     end
   end
 end

data/lib/activeagents/telemetry/ruby_llm.rb

@@ -43,6 +43,9 @@ module ActiveAgents
 
       DEFAULT_AGENT = { name: "RubyLLM::Chat", action: "chat" }.freeze
 
+      # Span token keys and the reader that answers each on a RubyLLM 2.x +Tokens+.
+      TOKEN_READERS = { "input" => :input, "output" => :output, "thinking" => :thinking }.freeze
+
       State = Struct.new(:depth, :started_at, :tool_spans, :rounds, :tokens, :chat_key, :agent)
 
       class << self
@@ -306,22 +309,39 @@ module ActiveAgents
           text.to_s[0, CONTENT_LIMIT]
         end
 
+        # Tokens for one round. RubyLLM 2.x puts the round's +Tokens+ on the
+        # payload and moves the per-message readers to +message.tokens+; 1.x
+        # has +input_tokens+ and friends on each assistant message and nothing
+        # on the payload. The payload is read first, then the messages the
+        # round added, with either generation's readers.
         def token_totals(payload)
+          tokens = payload_tokens(payload[:tokens]) || message_tokens(payload)
+          tokens["total"] = tokens.values.sum
+          tokens
+        end
+
+        def payload_tokens(tokens)
+          return unless TOKEN_READERS.values.all? { |reader| tokens.respond_to?(reader) }
+
+          TOKEN_READERS.to_h { |key, reader| [ key, tokens.public_send(reader).to_i ] }
+        end
+
+        def message_tokens(payload)
           initial_count = Array(payload[:input_messages]).size
           new_messages = Array(payload[:messages_after])[initial_count..] || []
           assistant_messages = new_messages.select { |message| message.respond_to?(:role) && message.role.to_s == "assistant" }
 
-          tokens = {
-            "input" => sum_tokens(assistant_messages, :input_tokens),
-            "output" => sum_tokens(assistant_messages, :output_tokens),
-            "thinking" => sum_tokens(assistant_messages, :thinking_tokens)
-          }
-          tokens["total"] = tokens.values.sum
-          tokens
+          TOKEN_READERS.to_h { |key, reader| [ key, assistant_messages.sum { |message| message_token_count(message, key, reader) } ] }
         end
 
-        def sum_tokens(messages, method_name)
-          messages.sum { |message| message.respond_to?(method_name) ? message.public_send(method_name).to_i : 0 }
+        # A 1.x message answers +input_tokens+; a 2.x message answers
+        # +tokens.input+.
+        def message_token_count(message, key, reader)
+          legacy_reader = :"#{key}_tokens"
+          return message.public_send(legacy_reader).to_i if message.respond_to?(legacy_reader)
+
+          tokens = message.tokens if message.respond_to?(:tokens)
+          tokens.respond_to?(reader) ? tokens.public_send(reader).to_i : 0
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeagents-telemetry-ruby_llm
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ActiveAgents
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-13 00:00:00.000000000 Z
+date: 2026-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeagents-telemetry