trifle-stats 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cace74102291a5e8b9d1de50cc489ea5ca0514e7b23a4a73fb218f9626569f44
-  data.tar.gz: 7149e5a8928348b7631897abb94c33beca2963b9e1a4d8c1490168e2a2bf4e4b
+  metadata.gz: dfb651d581720b40adf3219aab3bf3323b89d3046e624ec0c66bb1b633f6dcca
+  data.tar.gz: f6a79c45b2bf41370cdbfec36d068d8fca48be14ce4c24e258480cbe41577d73
 SHA512:
-  metadata.gz: 6578def9715b7cdee5c236ea592f482888c0c29304224bc5cdae419df49900613cd115a0c5f3e2e920f04aea02cdbe433ad0742b6ceaf981a3a46ecd5c3c541b
-  data.tar.gz: 4d257ea260be8adc9d8a1868199cf1ceb983fc240312b13dc63444bf21ff1c0c2493aa2118a80001c3419758536a2d7e7678bb852b2583930f1e0b58f72b17ad
+  metadata.gz: 22f6f8b84aa2494f75a573ee47023ba8a6774c6fd65b3a022fb3df58360bf9e527388afc463603946f67e6c37083dd3205eeba950d6c18dadb661cddc8a965c6
+  data.tar.gz: dfd898c4beb30d76982c3476b5c3c533f0bf6279feaae86711ff59a7407d7e0ca99a661873f1fcd86a61dc9d59299dd5cd7cef9f3451a23fcda454386d5ec41e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trifle-stats (2.3.0)
+    trifle-stats (2.3.1)
       tzinfo (~> 2.0)
 
 GEM
@@ -10,7 +10,7 @@ GEM
     ast (2.4.2)
     bson (4.12.1)
     byebug (11.1.3)
-    concurrent-ruby (1.3.5)
+    concurrent-ruby (1.3.6)
     diff-lcs (1.4.4)
     dotenv (2.7.6)
     mini_portile2 (2.8.9)

data/lib/trifle/stats/buffer.rb

@@ -105,8 +105,12 @@ module Trifle
         reset!
       end
 
-      def store(operation, keys, values)
-        aggregate? ? store_aggregate(operation, keys, values) : store_linear(operation, keys, values)
+      def store(operation, keys, values, tracking_key)
+        if aggregate?
+          store_aggregate(operation, keys, values, tracking_key)
+        else
+          store_linear(operation, keys, values, tracking_key)
+        end
         @operation_count += 1
       end
 
@@ -135,17 +139,17 @@ module Trifle
         @operation_count = 0
       end
 
-      def store_linear(operation, keys, values)
-        @actions << { operation: operation, keys: keys, values: duplicate(values), count: 1 }
+      def store_linear(operation, keys, values, tracking_key)
+        @actions << build_action(operation, keys, values, tracking_key)
       end
 
-      def store_aggregate(operation, keys, values)
-        signature = signature_for(operation, keys)
+      def store_aggregate(operation, keys, values, tracking_key)
+        signature = signature_for(operation, keys, tracking_key)
         if (entry = @actions[signature])
           entry[:values] = merge_values(operation, entry[:values], values)
           entry[:count] += 1
         else
-          @actions[signature] = { operation: operation, keys: keys, values: duplicate(values), count: 1 }
+          @actions[signature] = build_action(operation, keys, values, tracking_key)
         end
       end
 
@@ -172,11 +176,22 @@ module Trifle
         current
       end
 
-      def signature_for(operation, keys)
+      def signature_for(operation, keys, tracking_key)
+        tracking_marker = tracking_key || '__tracked__'
         identifiers = keys.map do |key|
           [key.prefix, key.key, key.granularity, key.at&.to_i].join(':')
         end
-        "#{operation}-#{identifiers.join('|')}"
+        "#{operation}-#{tracking_marker}-#{identifiers.join('|')}"
+      end
+
+      def build_action(operation, keys, values, tracking_key)
+        {
+          operation: operation,
+          keys: keys,
+          values: duplicate(values),
+          count: 1,
+          tracking_key: tracking_key
+        }
       end
 
       def duplicate(value)
@@ -231,12 +246,12 @@ module Trifle
         self.class.register(self)
       end
 
-      def inc(keys:, values:)
-        enqueue(:inc, keys: keys, values: values)
+      def inc(keys:, values:, tracking_key: nil)
+        enqueue(:inc, keys: keys, values: values, tracking_key: tracking_key)
       end
 
-      def set(keys:, values:)
-        enqueue(:set, keys: keys, values: values)
+      def set(keys:, values:, tracking_key: nil)
+        enqueue(:set, keys: keys, values: values, tracking_key: tracking_key)
       end
 
       def flush!
@@ -263,10 +278,10 @@ module Trifle
 
       private
 
-      def enqueue(operation, keys:, values:)
+      def enqueue(operation, keys:, values:, tracking_key:)
         should_flush = false
         @mutex.synchronize do
-          @queue.store(operation, keys, values)
+          @queue.store(operation, keys, values, tracking_key)
           should_flush = @queue.size >= @size
         end
 
@@ -336,15 +351,29 @@ module Trifle
       end
 
       def process(actions)
-        actions.each do |action|
-          @driver.public_send(
-            action[:operation], keys: action[:keys], values: action[:values], count: action[:count] || 1
-          )
-        end
+        actions.each { |action| dispatch_action(action) }
       ensure
         release_active_record_connection
       end
 
+      def dispatch_action(action)
+        payload = action_payload(action)
+
+        if action[:tracking_key]
+          @driver.public_send(action[:operation], **payload.merge(tracking_key: action[:tracking_key]))
+        else
+          @driver.public_send(action[:operation], **payload)
+        end
+      end
+
+      def action_payload(action)
+        {
+          keys: action[:keys],
+          values: action[:values],
+          count: action[:count] || 1
+        }
+      end
+
       def start_worker
         Thread.new do
           loop do

data/lib/trifle/stats/driver/mongo.rb

@@ -50,11 +50,12 @@ module Trifle
           identifier_for(key)
         end
 
-        def system_data_for(key:, count: 1)
-          self.class.pack(hash: { data: { count: count, keys: { key.key => count } } })
+        def system_data_for(key:, count: 1, tracking_key: nil)
+          tracking_key ||= key.key
+          self.class.pack(hash: { data: { count: count, keys: { tracking_key => count } } })
         end
 
-        def inc(keys:, values:, count: 1) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+        def inc(keys:, values:, count: 1, tracking_key: nil) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
           data = self.class.pack(hash: { data: values })
 
           if @bulk_write
@@ -63,7 +64,14 @@ module Trifle
               expire_at = @expire_after ? key.at + @expire_after : nil
 
               ops << upsert_operation('$inc', filter: filter, data: data, expire_at: expire_at)
-              ops << upsert_operation('$inc', filter: system_identifier_for(key: key), data: system_data_for(key: key, count: count), expire_at: expire_at) if @system_tracking # rubocop:disable Layout/LineLength
+              next unless @system_tracking
+
+              ops << upsert_operation(
+                '$inc',
+                filter: system_identifier_for(key: key),
+                data: system_data_for(key: key, count: count, tracking_key: tracking_key),
+                expire_at: expire_at
+              )
             end
 
             collection.bulk_write(operations)
@@ -74,12 +82,19 @@ module Trifle
               update = build_update('$inc', data: data, expire_at: expire_at)
 
               collection.update_many(filter, update, upsert: true)
-              collection.update_many(system_identifier_for(key: key), build_update('$inc', data: system_data_for(key: key, count: count), expire_at: expire_at), upsert: true) if @system_tracking # rubocop:disable Layout/LineLength
+              next unless @system_tracking
+
+              system_update = build_update(
+                '$inc',
+                data: system_data_for(key: key, count: count, tracking_key: tracking_key),
+                expire_at: expire_at
+              )
+              collection.update_many(system_identifier_for(key: key), system_update, upsert: true)
             end
           end
         end
 
-        def set(keys:, values:, count: 1) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+        def set(keys:, values:, count: 1, tracking_key: nil) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
           data = self.class.pack(hash: { data: values })
 
           if @bulk_write
@@ -88,7 +103,14 @@ module Trifle
               expire_at = @expire_after ? key.at + @expire_after : nil
 
               ops << upsert_operation('$set', filter: filter, data: data, expire_at: expire_at)
-              ops << upsert_operation('$inc', filter: system_identifier_for(key: key), data: system_data_for(key: key, count: count), expire_at: expire_at) if @system_tracking # rubocop:disable Layout/LineLength
+              next unless @system_tracking
+
+              ops << upsert_operation(
+                '$inc',
+                filter: system_identifier_for(key: key),
+                data: system_data_for(key: key, count: count, tracking_key: tracking_key),
+                expire_at: expire_at
+              )
             end
 
             collection.bulk_write(operations)
@@ -99,7 +121,14 @@ module Trifle
               update = build_update('$set', data: data, expire_at: expire_at)
 
               collection.update_many(filter, update, upsert: true)
-              collection.update_many(system_identifier_for(key: key), build_update('$inc', data: system_data_for(key: key, count: count), expire_at: expire_at), upsert: true) if @system_tracking # rubocop:disable Layout/LineLength
+              next unless @system_tracking
+
+              system_update = build_update(
+                '$inc',
+                data: system_data_for(key: key, count: count, tracking_key: tracking_key),
+                expire_at: expire_at
+              )
+              collection.update_many(system_identifier_for(key: key), system_update, upsert: true)
             end
           end
         end

data/lib/trifle/stats/driver/postgres.rb

@@ -51,17 +51,18 @@ module Trifle
           identifier_for(key)
         end
 
-        def system_data_for(key:, count: 1)
-          self.class.pack(hash: { count: count, keys: { key.key => count } })
+        def system_data_for(key:, count: 1, tracking_key: nil)
+          tracking_key ||= key.key
+          self.class.pack(hash: { count: count, keys: { tracking_key => count } })
         end
 
-        def inc(keys:, values:, count: 1)
+        def inc(keys:, values:, count: 1, tracking_key: nil)
           data = self.class.pack(hash: values)
           client.transaction do |c|
             keys.map do |key|
               identifier = identifier_for(key)
               c.exec(inc_query(identifier: identifier, data: data))
-              c.exec(inc_query(identifier: system_identifier_for(key: key), data: system_data_for(key: key, count: count))) if @system_tracking # rubocop:disable Layout/LineLength
+              track_system_data(c, key, count, tracking_key)
             end
           end
         end
@@ -78,17 +79,26 @@ module Trifle
           SQL
         end
 
-        def set(keys:, values:, count: 1)
+        def set(keys:, values:, count: 1, tracking_key: nil)
           data = self.class.pack(hash: values)
           client.transaction do |c|
             keys.map do |key|
               identifier = identifier_for(key)
               c.exec(set_query(identifier: identifier, data: data))
-              c.exec(inc_query(identifier: system_identifier_for(key: key), data: system_data_for(key: key, count: count))) if @system_tracking # rubocop:disable Layout/LineLength
+              track_system_data(c, key, count, tracking_key)
             end
           end
         end
 
+        def track_system_data(connection, key, count, tracking_key)
+          return unless @system_tracking
+
+          system_data = system_data_for(key: key, count: count, tracking_key: tracking_key)
+          connection.exec(
+            inc_query(identifier: system_identifier_for(key: key), data: system_data)
+          )
+        end
+
         def set_query(identifier:, data:)
           columns = identifier.keys.join(', ')
           values = identifier.values.map { |v| format_value(v) }.join(', ')

data/lib/trifle/stats/driver/process.rb

@@ -16,7 +16,7 @@ module Trifle
           "#{self.class.name}(J)"
         end
 
-        def inc(keys:, values:, count: 1) # rubocop:disable Lint/UnusedMethodArgument
+        def inc(keys:, values:, count: 1, tracking_key: nil) # rubocop:disable Lint/UnusedMethodArgument
           keys.map do |key|
             self.class.pack(hash: values).each do |k, c|
               d = @data.fetch(key.join(@separator), {})
@@ -26,7 +26,7 @@ module Trifle
           end
         end
 
-        def set(keys:, values:, count: 1) # rubocop:disable Lint/UnusedMethodArgument
+        def set(keys:, values:, count: 1, tracking_key: nil) # rubocop:disable Lint/UnusedMethodArgument
           keys.map do |key|
             self.class.pack(hash: values).each do |k, c|
               d = @data.fetch(key.join(@separator), {})

data/lib/trifle/stats/driver/redis.rb

@@ -26,11 +26,12 @@ module Trifle
           key.join(separator)
         end
 
-        def system_data_for(key:, count: 1)
-          self.class.pack(hash: { count: count, keys: { key.key => count } })
+        def system_data_for(key:, count: 1, tracking_key: nil)
+          tracking_key ||= key.key
+          self.class.pack(hash: { count: count, keys: { tracking_key => count } })
         end
 
-        def inc(keys:, values:, count: 1) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        def inc(keys:, values:, count: 1, tracking_key: nil) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
           keys.map do |key|
             key.prefix = prefix
             pkey = key.join(separator)
@@ -41,13 +42,13 @@ module Trifle
             next unless @system_tracking
 
             skey = system_join_for(key: key)
-            system_data_for(key: key, count: count).each do |k, c|
+            system_data_for(key: key, count: count, tracking_key: tracking_key).each do |k, c|
               client.hincrby(skey, k, c)
             end
           end
         end
 
-        def set(keys:, values:, count: 1)
+        def set(keys:, values:, count: 1, tracking_key: nil)
           keys.map do |key|
             key.prefix = prefix
             pkey = key.join(separator)
@@ -56,7 +57,7 @@ module Trifle
             next unless @system_tracking
 
             skey = system_join_for(key: key)
-            system_data_for(key: key, count: count).each do |k, c|
+            system_data_for(key: key, count: count, tracking_key: tracking_key).each do |k, c|
               client.hincrby(skey, k, c)
             end
           end

data/lib/trifle/stats/driver/sqlite.rb

@@ -53,18 +53,18 @@ module Trifle
           identifier_for(key)
         end
 
-        def system_data_for(key:, count: 1)
-          self.class.pack(hash: { count: count, keys: { key.key => count } })
+        def system_data_for(key:, count: 1, tracking_key: nil)
+          tracking_key ||= key.key
+          self.class.pack(hash: { count: count, keys: { tracking_key => count } })
         end
 
-        def inc(keys:, values:, count: 1)
+        def inc(keys:, values:, count: 1, tracking_key: nil)
           data = self.class.pack(hash: values)
           client.transaction do |c|
             keys.each do |key|
               identifier = identifier_for(key)
-              # Batch data operations to avoid SQLite parser stack overflow
               batch_data_operations(identifier: identifier, data: data, connection: c, operation: :inc)
-              batch_data_operations(identifier: system_identifier_for(key: key), data: system_data_for(key: key, count: count), connection: c, operation: :inc) if @system_tracking # rubocop:disable Layout/LineLength
+              track_system_data(c, key, count, tracking_key)
             end
           end
         end
@@ -81,18 +81,28 @@ module Trifle
           SQL
         end
 
-        def set(keys:, values:, count: 1)
+        def set(keys:, values:, count: 1, tracking_key: nil)
           data = self.class.pack(hash: values)
           client.transaction do |c|
             keys.each do |key|
               identifier = identifier_for(key)
-              # Batch data operations to avoid SQLite parser stack overflow
               batch_data_operations(identifier: identifier, data: data, connection: c, operation: :set)
-              batch_data_operations(identifier: system_identifier_for(key: key), data: system_data_for(key: key, count: count), connection: c, operation: :inc) if @system_tracking # rubocop:disable Layout/LineLength
+              track_system_data(c, key, count, tracking_key)
             end
           end
         end
 
+        def track_system_data(connection, key, count, tracking_key)
+          return unless @system_tracking
+
+          batch_data_operations(
+            identifier: system_identifier_for(key: key),
+            data: system_data_for(key: key, count: count, tracking_key: tracking_key),
+            connection: connection,
+            operation: :inc
+          )
+        end
+
         def set_query(identifier:, data:)
           columns = identifier.keys.join(', ')
           values = identifier.values.map { |v| format_value(v) }.join(', ')

data/lib/trifle/stats/operations/timeseries/increment.rb

@@ -12,6 +12,7 @@ module Trifle
             @at = keywords.fetch(:at)
             @values = keywords.fetch(:values)
             @config = keywords[:config]
+            @untracked = keywords.fetch(:untracked, false)
           end
 
           def config
@@ -25,10 +26,20 @@ module Trifle
           end
 
           def perform
-            config.storage.inc(
+            payload = {
               keys: config.granularities.map { |granularity| key_for(granularity: granularity) },
               values: values
-            )
+            }
+
+            if tracking_key
+              config.storage.inc(**payload.merge(tracking_key: tracking_key))
+            else
+              config.storage.inc(**payload)
+            end
+          end
+
+          def tracking_key
+            @untracked ? '__untracked__' : nil
           end
         end
       end

data/lib/trifle/stats/operations/timeseries/set.rb

@@ -12,6 +12,7 @@ module Trifle
             @at = keywords.fetch(:at)
             @values = keywords.fetch(:values)
             @config = keywords[:config]
+            @untracked = keywords.fetch(:untracked, false)
           end
 
           def config
@@ -25,10 +26,20 @@ module Trifle
           end
 
           def perform
-            config.storage.set(
+            payload = {
               keys: config.granularities.map { |granularity| key_for(granularity: granularity) },
               values: values
-            )
+            }
+
+            if tracking_key
+              config.storage.set(**payload.merge(tracking_key: tracking_key))
+            else
+              config.storage.set(**payload)
+            end
+          end
+
+          def tracking_key
+            @untracked ? '__untracked__' : nil
           end
         end
       end

data/lib/trifle/stats/version.rb

@@ -2,6 +2,6 @@
 
 module Trifle
   module Stats
-    VERSION = '2.3.0'
+    VERSION = '2.3.1'
   end
 end

data/lib/trifle/stats.rb

@@ -54,21 +54,23 @@ module Trifle
       default
     end
 
-    def self.track(key:, at:, values:, config: nil)
+    def self.track(key:, at:, values:, config: nil, untracked: false)
       Trifle::Stats::Operations::Timeseries::Increment.new(
         key: key,
         at: at,
         values: values,
-        config: config
+        config: config,
+        untracked: untracked
       ).perform
     end
 
-    def self.assert(key:, at:, values:, config: nil)
+    def self.assert(key:, at:, values:, config: nil, untracked: false)
       Trifle::Stats::Operations::Timeseries::Set.new(
         key: key,
         at: at,
         values: values,
-        config: config
+        config: config,
+        untracked: untracked
       ).perform
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trifle-stats
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Jozef Vaclavik
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-01-23 00:00:00.000000000 Z
+date: 2026-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler