tingyun_rpm 1.1.1 → 1.1.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 03acd867faa468e8cf34e5db0c625be623e83b40
4
- data.tar.gz: ff2a3e050fa55b6691e24a6d095d76d1095c983b
3
+ metadata.gz: 3e8dd7aa76a5fc1e81648a4240e704b5c7402587
4
+ data.tar.gz: df892c7c3fc9223d1348f8961a77c53d5c794196
5
5
  SHA512:
6
- metadata.gz: ed68cd19c263c869ee5a013e3c94043f74c71d93b34e613e11503fc10ab9f6c58d8adce2360ad90ba7cfc47262b44f184cbe6b2c9e8159adc6098e9793a72c7e
7
- data.tar.gz: 3f1dca653319d616cff3c65af9e88082c6a9560617a063a46a90db1cd2ed09e3680a714a155f0a24e72b60867d2f3738714338bf2235e834bf6cab416e003f84
6
+ metadata.gz: 3b9f5b9fd4a36429475e707ad24a6733c2b40f7fadfe9e01df0c4b814cd77b2b4b72725231457871a2ed4f8daad2e2679e565424fe54ce0c174c19865df2ff05
7
+ data.tar.gz: 44f175d0d5bb19c57d4b2867c90dc6d2fb97047715e8055afd9182ebac0f5be29789bdf458ec7ccda8831b6e73153cf342b03702aae5e24cf6612db6f97f10a6
@@ -154,7 +154,7 @@ module TingYun
154
154
  end
155
155
  end
156
156
 
157
- def merge!
157
+ def merge!(sql_traces)
158
158
  @samples_lock.synchronize do
159
159
  sql_traces.each do |trace|
160
160
  existing_trace = @sql_traces[trace.sql]
@@ -196,7 +196,7 @@ module TingYun
196
196
  end
197
197
  end
198
198
 
199
- def merge!
199
+ def merge!(previous)
200
200
 
201
201
  @lock.synchronize do
202
202
  @sample_buffers.each do |buffer|
@@ -124,7 +124,7 @@ module TingYun
124
124
  @service.send(endpoint, items)
125
125
  rescue => e
126
126
  TingYun::Agent.logger.info("Unable to send #{endpoint} data, will try again later. Error: ", e)
127
- container.merge!(items)
127
+ # container.merge!(items)
128
128
  ensure
129
129
  items = nil # take the initiative to GC
130
130
  end
@@ -7,7 +7,7 @@ module TingYun
7
7
  MAJOR = 1
8
8
 
9
9
  MINOR = 1
10
- TINY = 1
10
+ TINY = 2
11
11
 
12
12
  STRING = [MAJOR, MINOR, TINY].compact.join('.')
13
13
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tingyun_rpm
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - tingyun