instana 1.9.6 → 1.9.7

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.
Files changed (37) hide show
  1. checksums.yaml +4 -4
  2. data/Configuration.md +2 -2
  3. data/Troubleshooting.md +1 -1
  4. data/lib/instana/agent.rb +4 -4
  5. data/lib/instana/agent/helpers.rb +2 -2
  6. data/lib/instana/base.rb +0 -16
  7. data/lib/instana/collector.rb +1 -1
  8. data/lib/instana/config.rb +1 -1
  9. data/lib/instana/instrumentation/net-http.rb +1 -1
  10. data/lib/instana/instrumentation/rack.rb +4 -3
  11. data/lib/instana/tracer.rb +4 -5
  12. data/lib/instana/tracing/processor.rb +1 -1
  13. data/lib/instana/tracing/trace.rb +3 -8
  14. data/lib/instana/version.rb +1 -1
  15. data/test/frameworks/rack_test.rb +4 -2
  16. data/test/frameworks/rails/actioncontroller_test.rb +10 -10
  17. data/test/frameworks/rails/actionview3_test.rb +22 -22
  18. data/test/frameworks/rails/actionview4_test.rb +22 -22
  19. data/test/frameworks/rails/actionview5_test.rb +22 -22
  20. data/test/frameworks/rails/activerecord3_test.rb +6 -6
  21. data/test/frameworks/rails/activerecord4_test.rb +6 -6
  22. data/test/frameworks/rails/activerecord5_test.rb +4 -4
  23. data/test/instrumentation/dalli_test.rb +14 -14
  24. data/test/instrumentation/excon_test.rb +7 -7
  25. data/test/instrumentation/grpc_test.rb +2 -2
  26. data/test/instrumentation/net-http_test.rb +7 -7
  27. data/test/instrumentation/redis_test.rb +1 -1
  28. data/test/instrumentation/resque_test.rb +5 -5
  29. data/test/instrumentation/rest-client_test.rb +2 -2
  30. data/test/instrumentation/sidekiq-client_test.rb +2 -2
  31. data/test/instrumentation/sidekiq-worker_test.rb +3 -3
  32. data/test/test_helper.rb +1 -1
  33. data/test/tracing/custom_test.rb +3 -3
  34. data/test/tracing/opentracing_test.rb +14 -14
  35. data/test/tracing/tracer_async_test.rb +3 -3
  36. data/test/tracing/tracer_test.rb +8 -8
  37. metadata +2 -2
data/test/instrumentation/excon_test.rb CHANGED
@@ -23,12 +23,12 @@ class ExconTest < Minitest::Test
23
23
  end
24
24
 
25
25
  traces = Instana.processor.queued_traces
26
- assert_equal 2, traces.count
26
+ assert_equal 2, traces.length
27
27
  rs_trace = traces[0]
28
28
  http_trace = traces[1]
29
29
 
30
30
  # Excon validation
31
- assert_equal 2, http_trace.spans.count
31
+ assert_equal 2, http_trace.spans.length
32
32
  spans = http_trace.spans.to_a
33
33
  first_span = spans[0]
34
34
  second_span = spans[1]
@@ -51,7 +51,7 @@ class ExconTest < Minitest::Test
51
51
  assert !second_span.key?(:stack)
52
52
 
53
53
  # Rack server trace validation
54
- assert_equal 1, rs_trace.spans.count
54
+ assert_equal 1, rs_trace.spans.length
55
55
  rs_span = rs_trace.spans.to_a[0]
56
56
 
57
57
  # Rack server trace should have the same trace ID
@@ -78,11 +78,11 @@ class ExconTest < Minitest::Test
78
78
  end
79
79
 
80
80
  traces = Instana.processor.queued_traces
81
- assert_equal 1, traces.count
81
+ assert_equal 1, traces.length
82
82
  http_trace = traces.first
83
83
 
84
84
  # Excon validation
85
- assert_equal 2, http_trace.spans.count
85
+ assert_equal 2, http_trace.spans.length
86
86
  spans = http_trace.spans.to_a
87
87
  first_span = spans[0]
88
88
  second_span = spans[1]
@@ -126,11 +126,11 @@ class ExconTest < Minitest::Test
126
126
  end
127
127
 
128
128
  traces = Instana.processor.queued_traces
129
- assert_equal 4, traces.count
129
+ assert_equal 4, traces.length
130
130
  http_trace = traces[3]
131
131
 
132
132
  # Excon validation
133
- assert_equal 4, http_trace.spans.count
133
+ assert_equal 4, http_trace.spans.length
134
134
  spans = http_trace.spans.to_a
135
135
  first_span = spans[0]
136
136
  second_span = spans[1]
data/test/instrumentation/grpc_test.rb CHANGED
@@ -24,7 +24,7 @@ class GrpcTest < Minitest::Test
24
24
  end
25
25
 
26
26
  def assert_client_trace(client_trace, call: '', call_type: '', error: nil)
27
- assert_equal 2, client_trace.spans.count
27
+ assert_equal 2, client_trace.spans.length
28
28
  spans = client_trace.spans.to_a
29
29
  first_span = spans[0]
30
30
  second_span = spans[1]
@@ -50,7 +50,7 @@ class GrpcTest < Minitest::Test
50
50
  end
51
51
 
52
52
  def assert_server_trace(server_trace, call: '', call_type: '', error: nil)
53
- assert_equal 1, server_trace.spans.count
53
+ assert_equal 1, server_trace.spans.length
54
54
  span = server_trace.spans.to_a.first
55
55
 
56
56
  # Span name validation
data/test/instrumentation/net-http_test.rb CHANGED
@@ -29,7 +29,7 @@ class NetHTTPTest < Minitest::Test
29
29
  http_trace = traces[1]
30
30
 
31
31
  # Net::HTTP trace validation
32
- assert_equal 2, http_trace.spans.count
32
+ assert_equal 2, http_trace.spans.length
33
33
  spans = http_trace.spans.to_a
34
34
  first_span = spans[0]
35
35
  second_span = spans[1]
@@ -49,7 +49,7 @@ class NetHTTPTest < Minitest::Test
49
49
  assert !second_span.key?(:stack)
50
50
 
51
51
  # Rack server trace validation
52
- assert_equal 1, rs_trace.spans.count
52
+ assert_equal 1, rs_trace.spans.length
53
53
  rs_span = rs_trace.spans.to_a[0]
54
54
 
55
55
  # Rack server trace should have the same trace ID
@@ -77,7 +77,7 @@ class NetHTTPTest < Minitest::Test
77
77
  http_trace = traces[1]
78
78
 
79
79
  # Net::HTTP trace validation
80
- assert_equal 2, http_trace.spans.count
80
+ assert_equal 2, http_trace.spans.length
81
81
  spans = http_trace.spans.to_a
82
82
  first_span = spans[0]
83
83
  second_span = spans[1]
@@ -97,7 +97,7 @@ class NetHTTPTest < Minitest::Test
97
97
  assert !second_span.key?(:stack)
98
98
 
99
99
  # Rack server trace validation
100
- assert_equal 1, rs_trace.spans.count
100
+ assert_equal 1, rs_trace.spans.length
101
101
  rs_span = rs_trace.spans.to_a[0]
102
102
 
103
103
  # Rack server trace should have the same trace ID
@@ -122,7 +122,7 @@ class NetHTTPTest < Minitest::Test
122
122
  end
123
123
 
124
124
  traces = Instana.processor.queued_traces
125
- assert_equal 1, traces.count
125
+ assert_equal 1, traces.length
126
126
  t = traces[0]
127
127
  assert_equal 1, t.spans.count
128
128
  assert t.has_error?
@@ -150,10 +150,10 @@ class NetHTTPTest < Minitest::Test
150
150
  end
151
151
 
152
152
  traces = Instana.processor.queued_traces
153
- assert_equal 2, traces.count
153
+ assert_equal 2, traces.length
154
154
 
155
155
  request_trace = traces[1]
156
- assert_equal 2, request_trace.spans.count
156
+ assert_equal 2, request_trace.spans.length
157
157
  assert request_trace.has_error?
158
158
  http_span = request_trace.spans.to_a[1]
159
159
 
data/test/instrumentation/redis_test.rb CHANGED
@@ -97,7 +97,7 @@ class RedisTest < Minitest::Test
97
97
  assert_equal 1, ::Instana.processor.queue_count
98
98
  trace = ::Instana.processor.queued_traces.first
99
99
 
100
- assert_equal 2, trace.spans.count
100
+ assert_equal 2, trace.spans.length
101
101
  first_span, second_span = trace.spans.to_a
102
102
 
103
103
  # first_span is the parent of second_span
data/test/instrumentation/resque_test.rb CHANGED
@@ -26,7 +26,7 @@ class ResqueClientTest < Minitest::Test
26
26
  end
27
27
 
28
28
  traces = Instana.processor.queued_traces
29
- assert_equal 1, traces.count
29
+ assert_equal 1, traces.length
30
30
 
31
31
  spans = traces[0].spans.to_a
32
32
  assert_equal 3, spans.count
@@ -47,7 +47,7 @@ class ResqueClientTest < Minitest::Test
47
47
  end
48
48
 
49
49
  traces = Instana.processor.queued_traces
50
- assert_equal 1, traces.count
50
+ assert_equal 1, traces.length
51
51
 
52
52
  spans = traces[0].spans.to_a
53
53
  assert_equal 3, spans.count
@@ -66,7 +66,7 @@ class ResqueClientTest < Minitest::Test
66
66
  end
67
67
 
68
68
  traces = Instana.processor.queued_traces
69
- assert_equal 1, traces.count
69
+ assert_equal 1, traces.length
70
70
 
71
71
  spans = traces[0].spans.to_a
72
72
  assert_equal 3, spans.count
@@ -84,7 +84,7 @@ class ResqueClientTest < Minitest::Test
84
84
  @worker.work(0)
85
85
 
86
86
  traces = Instana.processor.queued_traces
87
- assert_equal 1, traces.count
87
+ assert_equal 1, traces.length
88
88
 
89
89
  spans = traces[0].spans.to_a
90
90
  assert_equal 3, spans.count
@@ -111,7 +111,7 @@ class ResqueClientTest < Minitest::Test
111
111
  @worker.work(0)
112
112
 
113
113
  traces = Instana.processor.queued_traces
114
- assert_equal 1, traces.count
114
+ assert_equal 1, traces.length
115
115
 
116
116
  spans = traces[0].spans.to_a
117
117
  resque_span = spans[0]
data/test/instrumentation/rest-client_test.rb CHANGED
@@ -24,7 +24,7 @@ class RestClientTest < Minitest::Test
24
24
  http_trace = traces[1]
25
25
 
26
26
  # RestClient trace validation
27
- assert_equal 3, http_trace.spans.count
27
+ assert_equal 3, http_trace.spans.length
28
28
  spans = http_trace.spans.to_a
29
29
  first_span = spans[0]
30
30
  second_span = spans[1]
@@ -48,7 +48,7 @@ class RestClientTest < Minitest::Test
48
48
  assert_equal "200", third_span[:data][:http][:status]
49
49
 
50
50
  # Rack server trace validation
51
- assert_equal 1, rs_trace.spans.count
51
+ assert_equal 1, rs_trace.spans.length
52
52
  rs_span = rs_trace.spans.to_a[0]
53
53
 
54
54
  # Rack server trace should have the same trace ID
data/test/instrumentation/sidekiq-client_test.rb CHANGED
@@ -68,7 +68,7 @@ class SidekiqClientTest < Minitest::Test
68
68
  assert_equal 1, ::Instana.processor.queue_count
69
69
  client_trace = Instana.processor.queued_traces.first
70
70
 
71
- assert_equal 2, client_trace.spans.count
71
+ assert_equal 2, client_trace.spans.length
72
72
  spans = client_trace.spans.to_a
73
73
  first_span = spans[0]
74
74
  second_span = spans[1]
@@ -89,7 +89,7 @@ class SidekiqClientTest < Minitest::Test
89
89
  assert_equal 1, ::Instana.processor.queue_count
90
90
  client_trace = Instana.processor.queued_traces.first
91
91
 
92
- assert_equal 2, client_trace.spans.count
92
+ assert_equal 2, client_trace.spans.length
93
93
  spans = client_trace.spans.to_a
94
94
  first_span = spans[0]
95
95
  second_span = spans[1]
data/test/instrumentation/sidekiq-worker_test.rb CHANGED
@@ -148,7 +148,7 @@ class SidekiqServerTest < Minitest::Test
148
148
  end
149
149
 
150
150
  def assert_successful_worker_trace(worker_trace)
151
- assert_equal 1, worker_trace.spans.count
151
+ assert_equal 1, worker_trace.spans.length
152
152
  span = worker_trace.spans.first
153
153
 
154
154
  assert_equal :'sidekiq-worker', span[:n]
@@ -159,7 +159,7 @@ class SidekiqServerTest < Minitest::Test
159
159
  end
160
160
 
161
161
  def assert_failed_worker_trace(worker_trace)
162
- assert_equal 1, worker_trace.spans.count
162
+ assert_equal 1, worker_trace.spans.length
163
163
  span = worker_trace.spans.first
164
164
 
165
165
  assert_equal :'sidekiq-worker', span[:n]
@@ -173,7 +173,7 @@ class SidekiqServerTest < Minitest::Test
173
173
  end
174
174
 
175
175
  def assert_client_trace(client_trace, job)
176
- assert_equal 2, client_trace.spans.count
176
+ assert_equal 2, client_trace.spans.length
177
177
  first_span, second_span = client_trace.spans.to_a
178
178
 
179
179
  assert_equal :sdk, first_span[:n]
data/test/test_helper.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
2
- ENV['INSTANA_GEM_TEST'] = 'true'
2
+ ENV['INSTANA_TEST'] = 'true'
3
3
  require "rubygems"
4
4
  require "bundler/setup"
5
5
  Bundler.require(:default, :test)
data/test/tracing/custom_test.rb CHANGED
@@ -14,7 +14,7 @@ class CustomTracingTest < Minitest::Test
14
14
  assert_equal false, ::Instana.tracer.tracing?
15
15
 
16
16
  traces = ::Instana.processor.queued_traces
17
- assert_equal 1, traces.count
17
+ assert_equal 1, traces.length
18
18
  t = traces.first
19
19
  assert_equal 1, t.spans.size
20
20
  assert t.valid?
@@ -63,7 +63,7 @@ class CustomTracingTest < Minitest::Test
63
63
  assert_equal false, ::Instana.tracer.tracing?
64
64
 
65
65
  traces = ::Instana.processor.queued_traces
66
- assert_equal 1, traces.count
66
+ assert_equal 1, traces.length
67
67
  t = traces.first
68
68
  assert_equal 2, t.spans.size
69
69
  assert t.valid?
@@ -122,7 +122,7 @@ class CustomTracingTest < Minitest::Test
122
122
  assert_equal false, ::Instana.tracer.tracing?
123
123
 
124
124
  traces = ::Instana.processor.queued_traces
125
- assert_equal 1, traces.count
125
+ assert_equal 1, traces.length
126
126
  t = traces.first
127
127
  assert_equal 2, t.spans.size
128
128
  assert t.valid?
data/test/tracing/opentracing_test.rb CHANGED
@@ -80,13 +80,13 @@ class OpenTracerTest < Minitest::Test
80
80
  assert last_response.ok?
81
81
 
82
82
  traces = ::Instana.processor.queued_traces
83
- assert_equal 1, traces.count
83
+ assert_equal 1, traces.length
84
84
 
85
85
  trace = traces[0]
86
86
  assert trace.valid?
87
87
 
88
88
  # Span validation
89
- assert_equal 3, trace.spans.count
89
+ assert_equal 3, trace.spans.length
90
90
  first_span, second_span, third_span = trace.spans.to_a
91
91
 
92
92
  assert_equal :rack, first_span.name
@@ -130,13 +130,13 @@ class OpenTracerTest < Minitest::Test
130
130
  assert last_response.ok?
131
131
 
132
132
  traces = ::Instana.processor.queued_traces
133
- assert_equal 1, traces.count
133
+ assert_equal 1, traces.length
134
134
 
135
135
  trace = traces[0]
136
136
  assert trace.valid?
137
137
 
138
138
  # Span validation
139
- assert_equal 3, trace.spans.count
139
+ assert_equal 3, trace.spans.length
140
140
  first_span = trace.spans.to_a.first
141
141
 
142
142
  # Make sure context was picked up and continued in the resulting
@@ -272,12 +272,12 @@ class OpenTracerTest < Minitest::Test
272
272
 
273
273
  traces = ::Instana.processor.queued_traces
274
274
 
275
- assert_equal 1, traces.count
275
+ assert_equal 1, traces.length
276
276
 
277
277
  trace = traces.first
278
278
  first_span, second_span, third_span = trace.spans.to_a
279
279
 
280
- assert_equal 3, trace.spans.count
280
+ assert_equal 3, trace.spans.length
281
281
  assert trace.valid?
282
282
 
283
283
  # IDs
@@ -303,10 +303,10 @@ class OpenTracerTest < Minitest::Test
303
303
 
304
304
  traces = ::Instana.processor.queued_traces
305
305
 
306
- assert_equal 1, traces.count
306
+ assert_equal 1, traces.length
307
307
  trace = traces.first
308
308
  assert trace.valid?
309
- assert_equal 3, trace.spans.count
309
+ assert_equal 3, trace.spans.length
310
310
 
311
311
  first_span, second_span, third_span = trace.spans.to_a
312
312
 
@@ -334,10 +334,10 @@ class OpenTracerTest < Minitest::Test
334
334
 
335
335
  traces = ::Instana.processor.queued_traces
336
336
 
337
- assert_equal 1, traces.count
337
+ assert_equal 1, traces.length
338
338
  trace = traces.first
339
339
  assert trace.valid?
340
- assert_equal 3, trace.spans.count
340
+ assert_equal 3, trace.spans.length
341
341
 
342
342
  first_span, second_span, third_span = trace.spans.to_a
343
343
 
@@ -377,10 +377,10 @@ class OpenTracerTest < Minitest::Test
377
377
 
378
378
  traces = ::Instana.processor.queued_traces
379
379
 
380
- assert_equal 1, traces.count
380
+ assert_equal 1, traces.length
381
381
  trace = traces.first
382
382
  assert trace.valid?
383
- assert_equal 3, trace.spans.count
383
+ assert_equal 3, trace.spans.length
384
384
 
385
385
  assert_equal nil, entry_span_context.baggage[:my_bag]
386
386
  assert_equal 1, ac_span_context.baggage[:my_bag]
@@ -411,10 +411,10 @@ class OpenTracerTest < Minitest::Test
411
411
 
412
412
  traces = ::Instana.processor.queued_traces
413
413
 
414
- assert_equal 1, traces.count
414
+ assert_equal 1, traces.length
415
415
  trace = traces.first
416
416
  assert trace.valid?
417
- assert_equal 3, trace.spans.count
417
+ assert_equal 3, trace.spans.length
418
418
 
419
419
  # Context
420
420
  assert_equal true, entry_span_context.baggage.empty?
data/test/tracing/tracer_async_test.rb CHANGED
@@ -26,7 +26,7 @@ class TracerAsyncTest < Minitest::Test
26
26
  ::Instana.tracer.log_end(:rack, {:rack_end_kv => 1})
27
27
 
28
28
  traces = ::Instana.processor.queued_traces
29
- assert_equal 1, traces.count
29
+ assert_equal 1, traces.length
30
30
  t = traces.first
31
31
  assert_equal 2, t.spans.size
32
32
  spans = t.spans.to_a
@@ -80,7 +80,7 @@ class TracerAsyncTest < Minitest::Test
80
80
  sleep 1
81
81
 
82
82
  traces = ::Instana.processor.queued_traces
83
- assert_equal 2, traces.count
83
+ assert_equal 2, traces.length
84
84
  first_trace, second_trace = traces
85
85
 
86
86
  # Both traces should have the same ID
@@ -222,7 +222,7 @@ class TracerAsyncTest < Minitest::Test
222
222
  # Begin trace validation
223
223
  traces = ::Instana.processor.queued_traces
224
224
 
225
- assert_equal 1, traces.count
225
+ assert_equal 1, traces.length
226
226
  trace = traces.first
227
227
  assert_equal 4, trace.spans.size
228
228
  first_span, second_span, third_span, fourth_span = trace.spans.to_a
data/test/tracing/tracer_test.rb CHANGED
@@ -31,7 +31,7 @@ class TracerTest < Minitest::Test
31
31
  end
32
32
 
33
33
  traces = ::Instana.processor.queued_traces
34
- assert_equal 1, traces.count
34
+ assert_equal 1, traces.length
35
35
  t = traces.first
36
36
  assert_equal 1, t.spans.size
37
37
  assert t.valid?
@@ -64,7 +64,7 @@ class TracerTest < Minitest::Test
64
64
  assert exception_raised
65
65
 
66
66
  traces = ::Instana.processor.queued_traces
67
- assert_equal 1, traces.count
67
+ assert_equal 1, traces.length
68
68
  t = traces.first
69
69
  assert_equal 1, t.spans.size
70
70
  assert t.valid?
@@ -95,7 +95,7 @@ class TracerTest < Minitest::Test
95
95
  end
96
96
 
97
97
  traces = ::Instana.processor.queued_traces
98
- assert_equal 1, traces.count
98
+ assert_equal 1, traces.length
99
99
  t = traces.first
100
100
  assert_equal 2, t.spans.size
101
101
  assert t.valid?
@@ -114,7 +114,7 @@ class TracerTest < Minitest::Test
114
114
  assert_equal false, ::Instana.tracer.tracing?
115
115
 
116
116
  traces = ::Instana.processor.queued_traces
117
- assert_equal 1, traces.count
117
+ assert_equal 1, traces.length
118
118
  t = traces.first
119
119
  assert_equal 1, t.spans.size
120
120
  assert t.valid?
@@ -143,7 +143,7 @@ class TracerTest < Minitest::Test
143
143
  assert_equal false, ::Instana.tracer.tracing?
144
144
 
145
145
  traces = ::Instana.processor.queued_traces
146
- assert_equal 1, traces.count
146
+ assert_equal 1, traces.length
147
147
 
148
148
  t = traces.first
149
149
  assert_equal 2, t.spans.size
@@ -174,7 +174,7 @@ class TracerTest < Minitest::Test
174
174
  assert exception_raised
175
175
 
176
176
  traces = ::Instana.processor.queued_traces
177
- assert_equal 1, traces.count
177
+ assert_equal 1, traces.length
178
178
 
179
179
  t = traces.first
180
180
  assert_equal 1, t.spans.size
@@ -190,7 +190,7 @@ class TracerTest < Minitest::Test
190
190
  ::Instana.tracer.log_end(:test_trace, {:close_one => 1})
191
191
 
192
192
  traces = ::Instana.processor.queued_traces
193
- assert_equal 1, traces.count
193
+ assert_equal 1, traces.length
194
194
 
195
195
  t = traces.first
196
196
  assert_equal 1, t.spans.size
@@ -205,7 +205,7 @@ class TracerTest < Minitest::Test
205
205
  end
206
206
 
207
207
  traces = ::Instana.processor.queued_traces
208
- assert_equal 1, traces.count
208
+ assert_equal 1, traces.length
209
209
  t = traces.first
210
210
  assert_equal 1, t.spans.size
211
211
  assert t.valid?