tingyun_rpm 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03acd867faa468e8cf34e5db0c625be623e83b40
-  data.tar.gz: ff2a3e050fa55b6691e24a6d095d76d1095c983b
+  metadata.gz: 3e8dd7aa76a5fc1e81648a4240e704b5c7402587
+  data.tar.gz: df892c7c3fc9223d1348f8961a77c53d5c794196
 SHA512:
-  metadata.gz: ed68cd19c263c869ee5a013e3c94043f74c71d93b34e613e11503fc10ab9f6c58d8adce2360ad90ba7cfc47262b44f184cbe6b2c9e8159adc6098e9793a72c7e
-  data.tar.gz: 3f1dca653319d616cff3c65af9e88082c6a9560617a063a46a90db1cd2ed09e3680a714a155f0a24e72b60867d2f3738714338bf2235e834bf6cab416e003f84
+  metadata.gz: 3b9f5b9fd4a36429475e707ad24a6733c2b40f7fadfe9e01df0c4b814cd77b2b4b72725231457871a2ed4f8daad2e2679e565424fe54ce0c174c19865df2ff05
+  data.tar.gz: 44f175d0d5bb19c57d4b2867c90dc6d2fb97047715e8055afd9182ebac0f5be29789bdf458ec7ccda8831b6e73153cf342b03702aae5e24cf6612db6f97f10a6

data/lib/ting_yun/agent/collector/sql_sampler.rb

@@ -154,7 +154,7 @@ module TingYun
           end
         end
 
-        def merge!
+        def merge!(sql_traces)
           @samples_lock.synchronize do
             sql_traces.each do |trace|
               existing_trace = @sql_traces[trace.sql]

data/lib/ting_yun/agent/collector/transaction_sampler.rb

@@ -196,7 +196,7 @@ module TingYun
           end
         end
 
-        def merge!
+        def merge!(previous)
 
           @lock.synchronize do
             @sample_buffers.each do |buffer|

data/lib/ting_yun/agent/instance_methods/container_data_manager.rb

@@ -124,7 +124,7 @@ module TingYun
             @service.send(endpoint, items)
           rescue => e
             TingYun::Agent.logger.info("Unable to send #{endpoint} data, will try again later. Error: ", e)
-            container.merge!(items)
+            # container.merge!(items)
           ensure
             items = nil # take the initiative to GC
           end

data/lib/ting_yun/version.rb

@@ -7,7 +7,7 @@ module TingYun
     MAJOR = 1
 
     MINOR = 1
-    TINY = 1
+    TINY = 2
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tingyun_rpm
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - tingyun