oboe 2.6.6.1 → 2.6.7.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.travis.yml +6 -0
- data/Appraisals +6 -16
- data/CHANGELOG.md +30 -14
- data/Gemfile +4 -3
- data/Gemfile.lock +20 -25
- data/Rakefile +5 -1
- data/ext/oboe_metal/extconf.rb +2 -2
- data/gemfiles/mongo.gemfile +33 -0
- data/gemfiles/moped.gemfile +33 -0
- data/lib/base.rb +28 -10
- data/lib/joboe_metal.rb +12 -34
- data/lib/method_profiling.rb +3 -3
- data/lib/oboe/api/layerinit.rb +14 -14
- data/lib/oboe/api/logging.rb +11 -11
- data/lib/oboe/api/profiling.rb +7 -6
- data/lib/oboe/api/tracing.rb +3 -3
- data/lib/oboe/api/util.rb +4 -4
- data/lib/oboe/config.rb +7 -7
- data/lib/oboe/frameworks/padrino.rb +2 -2
- data/lib/oboe/frameworks/rails.rb +11 -11
- data/lib/oboe/frameworks/rails/inst/action_controller.rb +4 -4
- data/lib/oboe/frameworks/rails/inst/action_view.rb +2 -2
- data/lib/oboe/frameworks/rails/inst/action_view_2x.rb +1 -1
- data/lib/oboe/frameworks/rails/inst/action_view_30.rb +1 -1
- data/lib/oboe/frameworks/rails/inst/active_record.rb +1 -1
- data/lib/oboe/frameworks/rails/inst/connection_adapters/mysql.rb +3 -3
- data/lib/oboe/frameworks/rails/inst/connection_adapters/mysql2.rb +2 -2
- data/lib/oboe/frameworks/rails/inst/connection_adapters/postgresql.rb +1 -1
- data/lib/oboe/frameworks/rails/inst/connection_adapters/utils.rb +8 -8
- data/lib/oboe/frameworks/sinatra.rb +33 -3
- data/lib/oboe/frameworks/sinatra/templates.rb +2 -2
- data/lib/oboe/inst/cassandra.rb +19 -19
- data/lib/oboe/inst/dalli.rb +7 -7
- data/lib/oboe/inst/http.rb +5 -5
- data/lib/oboe/inst/memcache.rb +14 -14
- data/lib/oboe/inst/memcached.rb +8 -8
- data/lib/oboe/inst/mongo.rb +2 -2
- data/lib/oboe/inst/moped.rb +29 -29
- data/lib/oboe/inst/rack.rb +3 -3
- data/lib/oboe/inst/redis.rb +24 -24
- data/lib/oboe/inst/resque.rb +4 -4
- data/lib/oboe/loading.rb +6 -6
- data/lib/oboe/logger.rb +4 -4
- data/lib/oboe/version.rb +1 -1
- data/lib/oboe_metal.rb +11 -39
- data/test/frameworks/apps/grape_simple.rb +1 -1
- data/test/frameworks/apps/sinatra_simple.rb +1 -1
- data/test/frameworks/padrino_test.rb +3 -3
- data/test/frameworks/sinatra_test.rb +3 -3
- data/test/instrumentation/cassandra_test.rb +45 -45
- data/test/instrumentation/http_test.rb +6 -6
- data/test/instrumentation/mongo_test.rb +347 -345
- data/test/instrumentation/moped_test.rb +40 -40
- data/test/instrumentation/redis_hashes_test.rb +20 -20
- data/test/instrumentation/redis_keys_test.rb +19 -19
- data/test/instrumentation/redis_lists_test.rb +22 -22
- data/test/instrumentation/redis_misc_test.rb +14 -14
- data/test/instrumentation/redis_sets_test.rb +20 -20
- data/test/instrumentation/redis_sortedsets_test.rb +25 -25
- data/test/instrumentation/redis_strings_test.rb +27 -27
- data/test/instrumentation/resque_test.rb +7 -7
- data/test/minitest_helper.rb +18 -6
- data/test/profiling/method_test.rb +24 -24
- data/test/support/liboboe_settings_test.rb +3 -3
- data/test/support/xtrace_test.rb +2 -2
- metadata +26 -32
- data/gemfiles/rails2.3.gemfile +0 -18
- data/gemfiles/rails2.3.gemfile.lock +0 -95
- data/gemfiles/rails3.0.gemfile +0 -18
- data/gemfiles/rails3.0.gemfile.lock +0 -142
- data/gemfiles/rails3.1.gemfile +0 -18
- data/gemfiles/rails3.1.gemfile.lock +0 -152
- data/gemfiles/rails3.2.gemfile +0 -18
- data/gemfiles/rails3.2.gemfile.lock +0 -150
@@ -1,18 +1,18 @@
|
|
1
1
|
require 'minitest_helper'
|
2
2
|
require "redis"
|
3
|
-
|
3
|
+
|
4
4
|
describe Oboe::Inst::Redis, :lists do
|
5
5
|
attr_reader :entry_kvs, :exit_kvs, :redis, :redis_version
|
6
6
|
|
7
7
|
def min_server_version(version)
|
8
8
|
unless Gem::Version.new(@redis_version) >= Gem::Version.new(version.to_s)
|
9
|
-
skip "supported only on redis-server #{version} or greater"
|
9
|
+
skip "supported only on redis-server #{version} or greater"
|
10
10
|
end
|
11
11
|
end
|
12
12
|
|
13
13
|
before do
|
14
|
-
clear_all_traces
|
15
|
-
|
14
|
+
clear_all_traces
|
15
|
+
|
16
16
|
@redis ||= Redis.new
|
17
17
|
|
18
18
|
@redis_version ||= @redis.info["redis_version"]
|
@@ -23,9 +23,9 @@ describe Oboe::Inst::Redis, :lists do
|
|
23
23
|
end
|
24
24
|
|
25
25
|
it 'Stock Redis should be loaded, defined and ready' do
|
26
|
-
defined?(::Redis).wont_match nil
|
26
|
+
defined?(::Redis).wont_match nil
|
27
27
|
end
|
28
|
-
|
28
|
+
|
29
29
|
it "should trace blpop" do
|
30
30
|
min_server_version(2.0)
|
31
31
|
|
@@ -40,7 +40,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
40
40
|
traces[2]['KVOp'].must_equal "blpop"
|
41
41
|
traces[2]['KVKey'].must_equal "savage"
|
42
42
|
end
|
43
|
-
|
43
|
+
|
44
44
|
it "should trace brpop" do
|
45
45
|
min_server_version(2.0)
|
46
46
|
|
@@ -55,7 +55,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
55
55
|
traces[2]['KVOp'].must_equal "brpop"
|
56
56
|
traces[2]['KVKey'].must_equal "savage"
|
57
57
|
end
|
58
|
-
|
58
|
+
|
59
59
|
it "should trace brpoplpush" do
|
60
60
|
min_server_version(2.2)
|
61
61
|
|
@@ -70,7 +70,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
70
70
|
traces[2]['KVOp'].must_equal "brpoplpush"
|
71
71
|
traces[2]['destination'].must_equal "crawlies"
|
72
72
|
end
|
73
|
-
|
73
|
+
|
74
74
|
it "should trace lindex" do
|
75
75
|
min_server_version(1.0)
|
76
76
|
|
@@ -87,7 +87,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
87
87
|
traces[2]['KVOp'].must_equal "lindex"
|
88
88
|
traces[2]['index'].must_equal "1"
|
89
89
|
end
|
90
|
-
|
90
|
+
|
91
91
|
it "should trace linsert" do
|
92
92
|
min_server_version(2.2)
|
93
93
|
|
@@ -104,7 +104,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
104
104
|
traces[2]['KVOp'].must_equal "linsert"
|
105
105
|
traces[2]['KVKey'].must_equal "gods of old"
|
106
106
|
end
|
107
|
-
|
107
|
+
|
108
108
|
it "should trace llen" do
|
109
109
|
min_server_version(1.0)
|
110
110
|
|
@@ -121,7 +121,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
121
121
|
traces[2]['KVOp'].must_equal "llen"
|
122
122
|
traces[2]['KVKey'].must_equal "gods of old"
|
123
123
|
end
|
124
|
-
|
124
|
+
|
125
125
|
it "should trace lpop" do
|
126
126
|
min_server_version(1.0)
|
127
127
|
|
@@ -138,7 +138,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
138
138
|
traces[2]['KVOp'].must_equal "lpop"
|
139
139
|
traces[2]['KVKey'].must_equal "gods of old"
|
140
140
|
end
|
141
|
-
|
141
|
+
|
142
142
|
it "should trace lpush" do
|
143
143
|
min_server_version(1.0)
|
144
144
|
|
@@ -151,7 +151,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
151
151
|
traces[2]['KVOp'].must_equal "lpush"
|
152
152
|
traces[2]['KVKey'].must_equal "gods of old"
|
153
153
|
end
|
154
|
-
|
154
|
+
|
155
155
|
it "should trace lpushx" do
|
156
156
|
min_server_version(2.2)
|
157
157
|
|
@@ -164,7 +164,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
164
164
|
traces[2]['KVOp'].must_equal "lpushx"
|
165
165
|
traces[2]['KVKey'].must_equal "gods of old"
|
166
166
|
end
|
167
|
-
|
167
|
+
|
168
168
|
it "should trace lrange" do
|
169
169
|
min_server_version(1.0)
|
170
170
|
|
@@ -185,7 +185,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
185
185
|
traces[2]['start'].must_equal "2"
|
186
186
|
traces[2]['stop'].must_equal "4"
|
187
187
|
end
|
188
|
-
|
188
|
+
|
189
189
|
it "should trace lrem" do
|
190
190
|
min_server_version(1.0)
|
191
191
|
|
@@ -205,7 +205,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
205
205
|
traces[2]['KVOp'].must_equal "lrem"
|
206
206
|
traces[2]['KVKey'].must_equal "australia"
|
207
207
|
end
|
208
|
-
|
208
|
+
|
209
209
|
it "should trace lset" do
|
210
210
|
min_server_version(1.0)
|
211
211
|
|
@@ -223,7 +223,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
223
223
|
traces[2]['KVOp'].must_equal "lset"
|
224
224
|
traces[2]['KVKey'].must_equal "australia"
|
225
225
|
end
|
226
|
-
|
226
|
+
|
227
227
|
it "should trace ltrim" do
|
228
228
|
min_server_version(1.0)
|
229
229
|
|
@@ -245,7 +245,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
245
245
|
traces[2]['KVOp'].must_equal "ltrim"
|
246
246
|
traces[2]['KVKey'].must_equal "australia"
|
247
247
|
end
|
248
|
-
|
248
|
+
|
249
249
|
it "should trace rpop" do
|
250
250
|
min_server_version(1.0)
|
251
251
|
|
@@ -262,7 +262,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
262
262
|
traces[2]['KVOp'].must_equal "rpop"
|
263
263
|
traces[2]['KVKey'].must_equal "santa esmeralda"
|
264
264
|
end
|
265
|
-
|
265
|
+
|
266
266
|
it "should trace rpoplpush" do
|
267
267
|
min_server_version(1.2)
|
268
268
|
|
@@ -280,7 +280,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
280
280
|
traces[2]['KVKey'].must_equal "santa esmeralda"
|
281
281
|
traces[2]['destination'].must_equal "the gods of old"
|
282
282
|
end
|
283
|
-
|
283
|
+
|
284
284
|
it "should trace rpush" do
|
285
285
|
min_server_version(1.0)
|
286
286
|
|
@@ -293,7 +293,7 @@ describe Oboe::Inst::Redis, :lists do
|
|
293
293
|
traces[2]['KVOp'].must_equal "rpush"
|
294
294
|
traces[2]['KVKey'].must_equal "boney m"
|
295
295
|
end
|
296
|
-
|
296
|
+
|
297
297
|
it "should trace rpushx" do
|
298
298
|
min_server_version(1.0)
|
299
299
|
|
@@ -1,18 +1,18 @@
|
|
1
1
|
require 'minitest_helper'
|
2
2
|
require "redis"
|
3
|
-
|
3
|
+
|
4
4
|
describe Oboe::Inst::Redis, :misc do
|
5
5
|
attr_reader :entry_kvs, :exit_kvs, :redis, :redis_version
|
6
6
|
|
7
7
|
def min_server_version(version)
|
8
8
|
unless Gem::Version.new(@redis_version) >= Gem::Version.new(version.to_s)
|
9
|
-
skip "supported only on redis-server #{version} or greater"
|
9
|
+
skip "supported only on redis-server #{version} or greater"
|
10
10
|
end
|
11
11
|
end
|
12
12
|
|
13
13
|
before do
|
14
|
-
clear_all_traces
|
15
|
-
|
14
|
+
clear_all_traces
|
15
|
+
|
16
16
|
@redis ||= Redis.new
|
17
17
|
|
18
18
|
@redis_version ||= @redis.info["redis_version"]
|
@@ -35,7 +35,7 @@ describe Oboe::Inst::Redis, :misc do
|
|
35
35
|
traces[2]['channel'].must_equal "channel1"
|
36
36
|
traces[2].has_key?('KVKey').must_equal false
|
37
37
|
end
|
38
|
-
|
38
|
+
|
39
39
|
it "should trace select" do
|
40
40
|
min_server_version(2.0)
|
41
41
|
|
@@ -48,7 +48,7 @@ describe Oboe::Inst::Redis, :misc do
|
|
48
48
|
traces[2]['KVOp'].must_equal "select"
|
49
49
|
traces[2]['db'].must_equal "2"
|
50
50
|
end
|
51
|
-
|
51
|
+
|
52
52
|
it "should trace pipelined operations" do
|
53
53
|
min_server_version(1.2)
|
54
54
|
|
@@ -57,7 +57,7 @@ describe Oboe::Inst::Redis, :misc do
|
|
57
57
|
@redis.zadd("staff", 0, "waiter")
|
58
58
|
@redis.zadd("staff", 1, "busser")
|
59
59
|
@redis.zadd("staff", 2, "chef")
|
60
|
-
|
60
|
+
|
61
61
|
@redis.lpush("fringe", "bishop")
|
62
62
|
@redis.lpush("fringe", "dunham")
|
63
63
|
@redis.lpush("fringe", "broyles")
|
@@ -69,7 +69,7 @@ describe Oboe::Inst::Redis, :misc do
|
|
69
69
|
traces[2]['KVOpCount'].must_equal "6"
|
70
70
|
traces[2]['KVOps'].must_equal "zadd, zadd, zadd, lpush, lpush, lpush"
|
71
71
|
end
|
72
|
-
|
72
|
+
|
73
73
|
it "should trace multi with block" do
|
74
74
|
min_server_version(1.2)
|
75
75
|
|
@@ -78,7 +78,7 @@ describe Oboe::Inst::Redis, :misc do
|
|
78
78
|
@redis.zadd("presidents", 0, "Lincoln")
|
79
79
|
@redis.zadd("presidents", 1, "Adams")
|
80
80
|
@redis.zadd("presidents", 2, "Reagan")
|
81
|
-
|
81
|
+
|
82
82
|
@redis.lpush("hair", "blue")
|
83
83
|
@redis.lpush("hair", "gray")
|
84
84
|
@redis.lpush("hair", "yellow")
|
@@ -90,7 +90,7 @@ describe Oboe::Inst::Redis, :misc do
|
|
90
90
|
traces[2]['KVOpCount'].must_equal "8"
|
91
91
|
traces[2]['KVOps'].must_equal "multi, zadd, zadd, zadd, lpush, lpush, lpush, exec"
|
92
92
|
end
|
93
|
-
|
93
|
+
|
94
94
|
it "should trace eval" do
|
95
95
|
min_server_version(2.6)
|
96
96
|
|
@@ -109,10 +109,10 @@ describe Oboe::Inst::Redis, :misc do
|
|
109
109
|
traces[6]['KVOp'].must_equal "eval"
|
110
110
|
traces[6]['Script'].must_equal "return { KEYS, ARGV }"
|
111
111
|
end
|
112
|
-
|
112
|
+
|
113
113
|
it "should trace evalsha" do
|
114
114
|
min_server_version(2.6)
|
115
|
-
|
115
|
+
|
116
116
|
sha = @redis.script(:load, "return 1")
|
117
117
|
|
118
118
|
Oboe::API.start_trace('redis_test', '', {}) do
|
@@ -124,10 +124,10 @@ describe Oboe::Inst::Redis, :misc do
|
|
124
124
|
traces[2]['KVOp'].must_equal "evalsha"
|
125
125
|
traces[2]['sha'].must_equal sha
|
126
126
|
end
|
127
|
-
|
127
|
+
|
128
128
|
it "should trace script" do
|
129
129
|
min_server_version(2.6)
|
130
|
-
|
130
|
+
|
131
131
|
Oboe::API.start_trace('redis_test', '', {}) do
|
132
132
|
@sha = @redis.script(:load, "return 1")
|
133
133
|
@it_exists1 = @redis.script(:exists, @sha)
|
@@ -1,18 +1,18 @@
|
|
1
1
|
require 'minitest_helper'
|
2
2
|
require "redis"
|
3
|
-
|
3
|
+
|
4
4
|
describe Oboe::Inst::Redis, :sets do
|
5
5
|
attr_reader :entry_kvs, :exit_kvs, :redis, :redis_version
|
6
6
|
|
7
7
|
def min_server_version(version)
|
8
8
|
unless Gem::Version.new(@redis_version) >= Gem::Version.new(version.to_s)
|
9
|
-
skip "supported only on redis-server #{version} or greater"
|
9
|
+
skip "supported only on redis-server #{version} or greater"
|
10
10
|
end
|
11
11
|
end
|
12
12
|
|
13
13
|
before do
|
14
|
-
clear_all_traces
|
15
|
-
|
14
|
+
clear_all_traces
|
15
|
+
|
16
16
|
@redis ||= Redis.new
|
17
17
|
|
18
18
|
@redis_version ||= @redis.info["redis_version"]
|
@@ -21,7 +21,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
21
21
|
@entry_kvs ||= { 'Layer' => 'redis_test', 'Label' => 'entry' }
|
22
22
|
@exit_kvs ||= { 'Layer' => 'redis_test', 'Label' => 'exit' }
|
23
23
|
end
|
24
|
-
|
24
|
+
|
25
25
|
it "should trace sadd" do
|
26
26
|
min_server_version(1.0)
|
27
27
|
|
@@ -34,10 +34,10 @@ describe Oboe::Inst::Redis, :sets do
|
|
34
34
|
traces[2]['KVOp'].must_equal "sadd"
|
35
35
|
traces[2]['KVKey'].must_equal "shrimp"
|
36
36
|
end
|
37
|
-
|
37
|
+
|
38
38
|
it "should trace scard" do
|
39
39
|
min_server_version(1.0)
|
40
|
-
|
40
|
+
|
41
41
|
@redis.sadd("mother sauces", "bechamel")
|
42
42
|
@redis.sadd("mother sauces", "veloute")
|
43
43
|
@redis.sadd("mother sauces", "espagnole")
|
@@ -53,7 +53,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
53
53
|
traces[2]['KVOp'].must_equal "scard"
|
54
54
|
traces[2]['KVKey'].must_equal "mother sauces"
|
55
55
|
end
|
56
|
-
|
56
|
+
|
57
57
|
it "should trace sdiff" do
|
58
58
|
min_server_version(1.0)
|
59
59
|
|
@@ -72,7 +72,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
72
72
|
traces[2]['KVOp'].must_equal "sdiff"
|
73
73
|
traces[2].has_key?('KVKey').must_equal false
|
74
74
|
end
|
75
|
-
|
75
|
+
|
76
76
|
it "should trace sdiffstore" do
|
77
77
|
min_server_version(1.0)
|
78
78
|
|
@@ -91,7 +91,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
91
91
|
traces[2]['KVOp'].must_equal "sdiffstore"
|
92
92
|
traces[2]['destination'].must_equal "dest"
|
93
93
|
end
|
94
|
-
|
94
|
+
|
95
95
|
it "should trace sinter" do
|
96
96
|
min_server_version(1.0)
|
97
97
|
|
@@ -110,7 +110,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
110
110
|
traces[2]['KVOp'].must_equal "sinter"
|
111
111
|
traces[2].has_key?('KVKey').must_equal false
|
112
112
|
end
|
113
|
-
|
113
|
+
|
114
114
|
it "should trace sinterstore" do
|
115
115
|
min_server_version(1.0)
|
116
116
|
|
@@ -129,7 +129,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
129
129
|
traces[2]['KVOp'].must_equal "sinterstore"
|
130
130
|
traces[2]['destination'].must_equal "dest"
|
131
131
|
end
|
132
|
-
|
132
|
+
|
133
133
|
it "should trace sismember" do
|
134
134
|
min_server_version(1.0)
|
135
135
|
|
@@ -150,7 +150,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
150
150
|
traces[2]['KVOp'].must_equal "sismember"
|
151
151
|
traces[2]['KVKey'].must_equal "fibonacci"
|
152
152
|
end
|
153
|
-
|
153
|
+
|
154
154
|
it "should trace smembers" do
|
155
155
|
min_server_version(1.0)
|
156
156
|
|
@@ -169,7 +169,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
169
169
|
traces[2]['KVOp'].must_equal "smembers"
|
170
170
|
traces[2]['KVKey'].must_equal "fibonacci"
|
171
171
|
end
|
172
|
-
|
172
|
+
|
173
173
|
it "should trace smove" do
|
174
174
|
min_server_version(1.0)
|
175
175
|
|
@@ -187,7 +187,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
187
187
|
traces[2]['source'].must_equal "alpha"
|
188
188
|
traces[2]['destination'].must_equal "numbers"
|
189
189
|
end
|
190
|
-
|
190
|
+
|
191
191
|
it "should trace spop" do
|
192
192
|
min_server_version(1.0)
|
193
193
|
|
@@ -204,7 +204,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
204
204
|
traces[2]['KVOp'].must_equal "spop"
|
205
205
|
traces[2]['KVKey'].must_equal "fibonacci"
|
206
206
|
end
|
207
|
-
|
207
|
+
|
208
208
|
it "should trace srandmember" do
|
209
209
|
min_server_version(1.0)
|
210
210
|
|
@@ -221,7 +221,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
221
221
|
traces[2]['KVOp'].must_equal "srandmember"
|
222
222
|
traces[2]['KVKey'].must_equal "fibonacci"
|
223
223
|
end
|
224
|
-
|
224
|
+
|
225
225
|
it "should trace srem" do
|
226
226
|
min_server_version(1.0)
|
227
227
|
|
@@ -238,7 +238,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
238
238
|
traces[2]['KVOp'].must_equal "srem"
|
239
239
|
traces[2]['KVKey'].must_equal "fibonacci"
|
240
240
|
end
|
241
|
-
|
241
|
+
|
242
242
|
it "should trace sunion" do
|
243
243
|
min_server_version(1.0)
|
244
244
|
|
@@ -255,7 +255,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
255
255
|
traces[2]['KVOp'].must_equal "sunion"
|
256
256
|
traces[2].has_key?('KVKey').must_equal false
|
257
257
|
end
|
258
|
-
|
258
|
+
|
259
259
|
it "should trace sunionstore" do
|
260
260
|
min_server_version(1.0)
|
261
261
|
|
@@ -273,7 +273,7 @@ describe Oboe::Inst::Redis, :sets do
|
|
273
273
|
traces[2]['destination'].must_equal "dest"
|
274
274
|
traces[2].has_key?('KVKey').must_equal false
|
275
275
|
end
|
276
|
-
|
276
|
+
|
277
277
|
it "should trace sscan" do
|
278
278
|
min_server_version(2.8)
|
279
279
|
|
@@ -1,18 +1,18 @@
|
|
1
1
|
require 'minitest_helper'
|
2
2
|
require "redis"
|
3
|
-
|
3
|
+
|
4
4
|
describe Oboe::Inst::Redis, :sortedsets do
|
5
5
|
attr_reader :entry_kvs, :exit_kvs, :redis, :redis_version
|
6
6
|
|
7
7
|
def min_server_version(version)
|
8
8
|
unless Gem::Version.new(@redis_version) >= Gem::Version.new(version.to_s)
|
9
|
-
skip "supported only on redis-server #{version} or greater"
|
9
|
+
skip "supported only on redis-server #{version} or greater"
|
10
10
|
end
|
11
11
|
end
|
12
12
|
|
13
13
|
before do
|
14
|
-
clear_all_traces
|
15
|
-
|
14
|
+
clear_all_traces
|
15
|
+
|
16
16
|
@redis ||= Redis.new
|
17
17
|
|
18
18
|
@redis_version ||= @redis.info["redis_version"]
|
@@ -34,10 +34,10 @@ describe Oboe::Inst::Redis, :sortedsets do
|
|
34
34
|
traces[2]['KVOp'].must_equal "zadd"
|
35
35
|
traces[2]['KVKey'].must_equal "time"
|
36
36
|
end
|
37
|
-
|
37
|
+
|
38
38
|
it "should trace zcard" do
|
39
39
|
min_server_version(1.2)
|
40
|
-
|
40
|
+
|
41
41
|
@redis.zadd("sauce", 0, "bechamel")
|
42
42
|
@redis.zadd("sauce", 1, "veloute")
|
43
43
|
@redis.zadd("sauce", 2, "espagnole")
|
@@ -53,10 +53,10 @@ describe Oboe::Inst::Redis, :sortedsets do
|
|
53
53
|
traces[2]['KVOp'].must_equal "zcard"
|
54
54
|
traces[2]['KVKey'].must_equal "sauce"
|
55
55
|
end
|
56
|
-
|
56
|
+
|
57
57
|
it "should trace zcount" do
|
58
58
|
min_server_version(2.0)
|
59
|
-
|
59
|
+
|
60
60
|
@redis.zadd("sauce", 0, "bechamel")
|
61
61
|
@redis.zadd("sauce", 1, "veloute")
|
62
62
|
@redis.zadd("sauce", 2, "espagnole")
|
@@ -72,10 +72,10 @@ describe Oboe::Inst::Redis, :sortedsets do
|
|
72
72
|
traces[2]['KVOp'].must_equal "zcount"
|
73
73
|
traces[2]['KVKey'].must_equal "sauce"
|
74
74
|
end
|
75
|
-
|
75
|
+
|
76
76
|
it "should trace zincrby" do
|
77
77
|
min_server_version(1.2)
|
78
|
-
|
78
|
+
|
79
79
|
@redis.zadd("sauce", 0, "bechamel")
|
80
80
|
@redis.zadd("sauce", 1, "veloute")
|
81
81
|
@redis.zadd("sauce", 2, "espagnole")
|
@@ -91,14 +91,14 @@ describe Oboe::Inst::Redis, :sortedsets do
|
|
91
91
|
traces[2]['KVOp'].must_equal "zincrby"
|
92
92
|
traces[2]['KVKey'].must_equal "sauce"
|
93
93
|
end
|
94
|
-
|
94
|
+
|
95
95
|
it "should trace zinterstore" do
|
96
96
|
min_server_version(2.0)
|
97
|
-
|
97
|
+
|
98
98
|
@redis.zadd("sauce", 0, "bechamel")
|
99
99
|
@redis.zadd("sauce", 1, "veloute")
|
100
100
|
@redis.zadd("sauce", 2, "espagnole")
|
101
|
-
|
101
|
+
|
102
102
|
@redis.zadd("beverage", 0, "milkshake")
|
103
103
|
@redis.zadd("beverage", 1, "soda")
|
104
104
|
|
@@ -112,10 +112,10 @@ describe Oboe::Inst::Redis, :sortedsets do
|
|
112
112
|
traces[2]['destination'].must_equal "zinterstore_dest"
|
113
113
|
traces[2].has_key?('KVKey').must_equal false
|
114
114
|
end
|
115
|
-
|
115
|
+
|
116
116
|
it "should trace zrange" do
|
117
117
|
min_server_version(1.2)
|
118
|
-
|
118
|
+
|
119
119
|
@redis.zadd("sauce", 0, "bechamel")
|
120
120
|
@redis.zadd("sauce", 1, "veloute")
|
121
121
|
@redis.zadd("sauce", 2, "espagnole")
|
@@ -134,7 +134,7 @@ describe Oboe::Inst::Redis, :sortedsets do
|
|
134
134
|
|
135
135
|
it "should trace zrangebyscore" do
|
136
136
|
min_server_version(1.0)
|
137
|
-
|
137
|
+
|
138
138
|
@redis.zadd("sauce", 0, "bechamel")
|
139
139
|
@redis.zadd("sauce", 1, "veloute")
|
140
140
|
@redis.zadd("sauce", 2, "espagnole")
|
@@ -150,10 +150,10 @@ describe Oboe::Inst::Redis, :sortedsets do
|
|
150
150
|
traces[2]['KVOp'].must_equal "zrangebyscore"
|
151
151
|
traces[2]['KVKey'].must_equal "sauce"
|
152
152
|
end
|
153
|
-
|
153
|
+
|
154
154
|
it "should trace zrank" do
|
155
155
|
min_server_version(2.0)
|
156
|
-
|
156
|
+
|
157
157
|
@redis.zadd("sauce", 0, "bechamel")
|
158
158
|
@redis.zadd("sauce", 1, "veloute")
|
159
159
|
@redis.zadd("sauce", 2, "espagnole")
|
@@ -169,10 +169,10 @@ describe Oboe::Inst::Redis, :sortedsets do
|
|
169
169
|
traces[2]['KVOp'].must_equal "zrank"
|
170
170
|
traces[2]['KVKey'].must_equal "sauce"
|
171
171
|
end
|
172
|
-
|
172
|
+
|
173
173
|
it "should trace zrem" do
|
174
174
|
min_server_version(1.2)
|
175
|
-
|
175
|
+
|
176
176
|
@redis.zadd("sauce", 0, "bechamel")
|
177
177
|
@redis.zadd("sauce", 1, "veloute")
|
178
178
|
@redis.zadd("sauce", 2, "espagnole")
|
@@ -191,7 +191,7 @@ describe Oboe::Inst::Redis, :sortedsets do
|
|
191
191
|
|
192
192
|
it "should trace zremrangebyrank" do
|
193
193
|
min_server_version(2.0)
|
194
|
-
|
194
|
+
|
195
195
|
@redis.zadd("sauce", 0, "bechamel")
|
196
196
|
@redis.zadd("sauce", 1, "veloute")
|
197
197
|
@redis.zadd("sauce", 2, "espagnole")
|
@@ -212,7 +212,7 @@ describe Oboe::Inst::Redis, :sortedsets do
|
|
212
212
|
|
213
213
|
it "should trace zremrangebyscore" do
|
214
214
|
min_server_version(1.2)
|
215
|
-
|
215
|
+
|
216
216
|
@redis.zadd("sauce", 0, "bechamel")
|
217
217
|
@redis.zadd("sauce", 1, "veloute")
|
218
218
|
@redis.zadd("sauce", 2, "espagnole")
|
@@ -231,7 +231,7 @@ describe Oboe::Inst::Redis, :sortedsets do
|
|
231
231
|
|
232
232
|
it "should trace zrevrange" do
|
233
233
|
min_server_version(1.2)
|
234
|
-
|
234
|
+
|
235
235
|
@redis.zadd("sauce", 0, "bechamel")
|
236
236
|
@redis.zadd("sauce", 1, "veloute")
|
237
237
|
@redis.zadd("sauce", 2, "espagnole")
|
@@ -252,7 +252,7 @@ describe Oboe::Inst::Redis, :sortedsets do
|
|
252
252
|
|
253
253
|
it "should trace zrevrangebyscore" do
|
254
254
|
min_server_version(1.2)
|
255
|
-
|
255
|
+
|
256
256
|
@redis.zadd("sauce", 0, "bechamel")
|
257
257
|
@redis.zadd("sauce", 1, "veloute")
|
258
258
|
@redis.zadd("sauce", 2, "espagnole")
|
@@ -285,7 +285,7 @@ describe Oboe::Inst::Redis, :sortedsets do
|
|
285
285
|
traces[2]['KVOp'].must_equal "zrevrank"
|
286
286
|
traces[2]['KVKey'].must_equal "letters"
|
287
287
|
end
|
288
|
-
|
288
|
+
|
289
289
|
it "should trace zscore" do
|
290
290
|
min_server_version(1.2)
|
291
291
|
|