thinkingdata-ruby 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba7de0dac467fe8c90747854c7701e0af035463b9b48b4708308e4c28d242c90
-  data.tar.gz: fa29bd005cbe4b32cceecd85d726e79b7b0e0fb4e51346b649f25d7b44affcca
+  metadata.gz: 5faa8253295effbc9ff765bc22bca617bd822ee9d4c7de19bbbce266413f3c1f
+  data.tar.gz: 4872918901d705fc9ae980279dfdae1a15b2e266a7372df3a4ae9e1d8c9b676d
 SHA512:
-  metadata.gz: e73fadf565e9143fd67ad1c99e1472ee027d7eda707a4b2452705b620d05d1f223b71e99d61b84c0bbb353792f2f1f62212c7d2c04e670c736ee5e94db74291e
-  data.tar.gz: 39fce15278418ba6d92dface6276acee8760953954ff5521fb115f91c81bf83807e063e7caf6a59db0fd8e388407f74a7a0748d02b99086d3de91c8f2b0ffd31
+  metadata.gz: 4aba5b203c92631de33b27362947fed059eb6b9ff8d2b1946e2a196d99fcf9b832087f528df72c6a37e5f2424bc2a59eaf556493182b83bf7542761ea5053c93
+  data.tar.gz: 975676199eb20cac647afafff3982d220fd11814c84f538819cb58741c9ab3e27493dba586110a3d02c2fd73843815df5ef74baac8a85b16a4aac7abe4456676

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### v2.0.2
+**Date:** 2026/06/05
+
+**Notes:**
+
+* Enhance the stability of the SDK
+
 ### v2.0.1
 **Date:** 2026/05/13
 

data/lib/thinkingdata-ruby/td_analytics.rb

@@ -48,9 +48,7 @@ module ThinkingData
     LIB_PROPERTIES = {
       '#lib' => 'ruby',
       '#lib_version' => ThinkingData::VERSION,
-    }
-
-    @dynamic_block = nil
+    }.freeze
 
     ##
     # Init function
@@ -60,7 +58,7 @@ module ThinkingData
     def initialize(consumer, error_handler = nil, uuid: false)
       @error_handler = error_handler || TDErrorHandler.new
       @consumer = consumer
-      @super_properties = {}
+      @super_properties = {}.freeze
       @uuid_enable = uuid
       @mutex = Mutex.new
       TDLog.info("SDK init success.")
@@ -74,13 +72,11 @@ module ThinkingData
           @error_handler.handle(IllegalParameterError.new("Invalid super properties"))
           return false
         end
+        formatted = {}
         properties.each do |k, v|
-          if v.is_a?(Time)
-            @super_properties[k] = _format_time(v)
-          else
-            @super_properties[k] = v
-          end
+          formatted[k] = v.is_a?(Time) ? _format_time(v) : v
         end
+        @super_properties = @super_properties.merge(formatted).freeze
       end
     end
 
@@ -88,7 +84,7 @@ module ThinkingData
     # Clear super properties
     def clear_super_properties
       @mutex.synchronize do
-        @super_properties = {}
+        @super_properties = {}.freeze
       end
     end
 
@@ -341,7 +337,7 @@ module ThinkingData
     # Report data immediately
     def flush
       TDLog.info("SDK flush data.")
-      return true unless defined? @consumer.flush
+      return true unless @consumer.respond_to?(:flush)
       ret = true
       begin
         @consumer.flush
@@ -355,7 +351,7 @@ module ThinkingData
     ##
     # Close and exit sdk
     def close
-      return true unless defined? @consumer.close
+      return true unless @consumer.respond_to?(:close)
       ret = true
       # Consumer 自身已有锁保护，无需在此加锁
       begin
@@ -375,12 +371,17 @@ module ThinkingData
     def _internal_track(type, properties: {}, event_name: nil, event_id:nil, account_id: nil, distinct_id: nil, ip: nil,first_check_id: nil, time: nil)
       ret = true
 
-      # 只在访问共享状态时加锁
+      # Snapshot @dynamic_block under the mutex for memory visibility;
+      # @super_properties is a frozen hash replaced atomically — safe lock-free read.
+      # The dynamic block is called OUTSIDE the mutex to prevent deadlocks
+      # (if the block calls back into TDAnalytics) and throughput collapse.
       if type == :track || type == :track_update || type == :track_overwrite
-        @mutex.synchronize do
-          dynamic_properties = @dynamic_block.respond_to?(:call) ? @dynamic_block.call : {}
-          properties = LIB_PROPERTIES.merge(@super_properties).merge(dynamic_properties).merge(properties)
-        end
+        block = @mutex.synchronize { @dynamic_block }
+        dynamic_properties = block.respond_to?(:call) ? block.call : {}
+        properties = LIB_PROPERTIES.merge(@super_properties).merge(dynamic_properties).merge(properties)
+      else
+        # user_* methods: dup to avoid mutating the caller's hash
+        properties = properties.dup
       end
 
       data = {
@@ -390,6 +391,8 @@ module ThinkingData
       properties.each do |k, v|
         if v.is_a?(Time)
           properties[k] = _format_time(v)
+        elsif v.is_a?(Array)
+          properties[k] = v.map { |e| e.is_a?(Time) ? _format_time(e) : e }
         end
       end
 
@@ -466,13 +469,6 @@ module ThinkingData
         if type == :user_add
           raise IllegalParameterError.new("Property value for user add must be numbers") unless v.is_a?(Integer) || v.is_a?(Float)
         end
-        if v.is_a?(Array)
-          v.each_index do |i|
-            if v[i].is_a?(Time)
-              v[i] = _format_time(v[i])
-            end
-          end
-        end
       end
       true
     end

data/lib/thinkingdata-ruby/td_batch_consumer.rb

@@ -21,6 +21,7 @@ module ThinkingData
       @max_length = [max_buffer_length, MAX_LENGTH].min
       @buffers = []
       @mutex = Mutex.new
+      @owner_pid = Process.pid
       TDLog.info("TDBatchConsumer init success. ServerUrl: #{server_url}, appId: #{app_id}")
     end
 
@@ -42,6 +43,7 @@ module ThinkingData
     def add(message)
       TDLog.info("Enqueue data to buffer. buffer size: #{@buffers.length}, data: #{message}")
       need_flush = false
+      _reset_after_fork_if_needed
       @mutex.synchronize do
         @buffers << message
         need_flush = @buffers.length >= @max_length
@@ -50,11 +52,13 @@ module ThinkingData
     end
 
     def close
+      _reset_after_fork_if_needed
       flush
       TDLog.info("TDBatchConsumer close.")
     end
 
     def flush
+      _reset_after_fork_if_needed
       TDLog.info("TDBatchConsumer flush data.")
       data_to_send = nil
       @mutex.synchronize do
@@ -64,8 +68,9 @@ module ThinkingData
 
       return if data_to_send.empty?
 
-      begin
-        data_to_send.each_slice(@max_length) do |chunk|
+      chunks = data_to_send.each_slice(@max_length).to_a
+      chunks.each_with_index do |chunk, idx|
+        begin
           if @compress
             wio = StringIO.new("w")
             gzip_io = Zlib::GzipWriter.new(wio)
@@ -81,7 +86,7 @@ module ThinkingData
                      'compress' => compress_type,
                      'TE-Integration-Type'=>'Ruby',
                      'TE-Integration-Version'=>ThinkingData::VERSION,
-                     'TE-Integration-Count'=>data_to_send.count,
+                     'TE-Integration-Count'=>chunk.count,
                      'TA_Integration-Extra'=>'batch'}
           request = CaseSensitivePost.new(@server_uri.request_uri, headers)
           request.body = data
@@ -106,13 +111,25 @@ module ThinkingData
           if result['code'] != 0
             raise ServerError.new("Could not write to TE, server responded with #{response_code} returning: '#{response_body}'")
           end
+        rescue => e
+          # Re-enqueue the failed chunk AND every not-yet-sent chunk to the back,
+          # so that raising here never drops data still pending in this flush.
+          # New data already in @buffers stays ahead, failed data retries next flush.
+          remaining = chunks[idx..-1].flatten(1)
+          @mutex.synchronize { @buffers = @buffers + remaining }
+          raise e
         end
-      rescue
-        raise
       end
     end
 
     private
+    def _reset_after_fork_if_needed
+      return if @owner_pid == Process.pid
+      @owner_pid = Process.pid
+      @mutex = Mutex.new
+      @buffers = []
+    end
+
     def _request(uri, request)
       client = Net::HTTP.new(uri.host, uri.port)
       client.use_ssl = uri.scheme === 'https' ? true : false

data/lib/thinkingdata-ruby/td_logger_consumer.rb

@@ -1,4 +1,5 @@
 require 'logger'
+require 'fileutils'
 require 'thinkingdata-ruby/td_errors'
 
 module ThinkingData
@@ -43,11 +44,13 @@ module ThinkingData
       @log_path = log_path
       @full_prefix = "#{log_path}/#{prefix}"
       @mutex = Mutex.new
+      @owner_pid = Process.pid
       TDLog.info("TDLoggerConsumer init success. LogPath: #{log_path}")
       _reset
     end
 
     def add(msg)
+      _reset_after_fork_if_needed
       @mutex.synchronize do
         unless Time.now.strftime(@suffix_mode) == @current_suffix
           @logger.close
@@ -66,6 +69,7 @@ module ThinkingData
     end
 
     def close
+      _reset_after_fork_if_needed
       @mutex.synchronize do
         @logger.close
       end
@@ -75,7 +79,7 @@ module ThinkingData
     private
 
     def _reset
-      Dir::mkdir(@log_path) unless Dir::exist?(@log_path)
+      FileUtils.mkdir_p(@log_path)
       @logger = HeadlessLogger.new("#{@full_prefix}.#{@current_suffix}")
       @logger.level = HeadlessLogger::INFO
       @logger.formatter = proc do |severity, datetime, progname, msg|
@@ -83,5 +87,13 @@ module ThinkingData
       end
     end
 
+    def _reset_after_fork_if_needed
+      return if @owner_pid == Process.pid
+      @owner_pid = Process.pid
+      @mutex = Mutex.new
+      @logger = nil  # Don't close — FD is shared with parent
+      _reset
+    end
+
   end
 end

data/lib/thinkingdata-ruby/td_version.rb

@@ -1,3 +1,3 @@
 module ThinkingData
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinkingdata-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - ThinkingData
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-05-14 00:00:00.000000000 Z
+date: 2026-06-05 00:00:00.000000000 Z
 dependencies: []
 description: The official ThinkingData Analytics API for ruby
 email: sdk@thinkingdata.cn