instana 1.193.3 → 1.195.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.circleci/config.yml +4 -0
- data/.rubocop.yml +7 -0
- data/Appraisals +7 -0
- data/Gemfile +3 -0
- data/LICENSE +2 -1
- data/Rakefile +3 -0
- data/benchmarks/10k-rack-traces.rb +3 -0
- data/benchmarks/Gemfile +4 -0
- data/benchmarks/id_generation.rb +4 -0
- data/benchmarks/opentracing.rb +4 -0
- data/benchmarks/rack_vanilla_vs_traced.rb +3 -0
- data/benchmarks/stackprof_rack_tracing.rb +3 -0
- data/benchmarks/time_processing.rb +4 -0
- data/bin/console +3 -0
- data/examples/opentracing.rb +4 -0
- data/examples/tracing.rb +4 -0
- data/extras/license_header.rb +44 -0
- data/gemfiles/aws_30.gemfile +18 -0
- data/gemfiles/cuba_30.gemfile +3 -0
- data/gemfiles/dalli_20.gemfile +3 -0
- data/gemfiles/excon_02.gemfile +3 -0
- data/gemfiles/graphql_10.gemfile +3 -0
- data/gemfiles/grpc_10.gemfile +3 -0
- data/gemfiles/net_http_01.gemfile +3 -0
- data/gemfiles/rack_16.gemfile +3 -0
- data/gemfiles/rack_20.gemfile +3 -0
- data/gemfiles/rails_42.gemfile +3 -0
- data/gemfiles/rails_50.gemfile +3 -0
- data/gemfiles/rails_52.gemfile +3 -0
- data/gemfiles/rails_60.gemfile +3 -0
- data/gemfiles/redis_40.gemfile +3 -0
- data/gemfiles/resque_122.gemfile +3 -0
- data/gemfiles/resque_20.gemfile +3 -0
- data/gemfiles/rest_client_16.gemfile +3 -0
- data/gemfiles/rest_client_20.gemfile +3 -0
- data/gemfiles/roda_20.gemfile +3 -0
- data/gemfiles/roda_30.gemfile +3 -0
- data/gemfiles/sidekiq_42.gemfile +3 -0
- data/gemfiles/sidekiq_50.gemfile +3 -0
- data/gemfiles/sinatra_14.gemfile +3 -0
- data/instana.gemspec +4 -0
- data/lib/instana.rb +3 -0
- data/lib/instana/activator.rb +3 -0
- data/lib/instana/activators/action_cable.rb +24 -0
- data/lib/instana/activators/action_controller_api.rb +3 -0
- data/lib/instana/activators/action_controller_base.rb +3 -0
- data/lib/instana/activators/action_view.rb +3 -0
- data/lib/instana/activators/active_record.rb +3 -0
- data/lib/instana/activators/aws_sdk_dynamodb.rb +20 -0
- data/lib/instana/activators/cuba.rb +3 -0
- data/lib/instana/activators/dalli.rb +3 -0
- data/lib/instana/activators/excon.rb +4 -1
- data/lib/instana/activators/graphql.rb +3 -0
- data/lib/instana/activators/grpc_client.rb +3 -0
- data/lib/instana/activators/grpc_server.rb +3 -0
- data/lib/instana/activators/net_http.rb +3 -0
- data/lib/instana/activators/rack.rb +3 -0
- data/lib/instana/activators/rails.rb +3 -0
- data/lib/instana/activators/redis.rb +3 -0
- data/lib/instana/activators/resque_client.rb +3 -0
- data/lib/instana/activators/resque_worker.rb +3 -0
- data/lib/instana/activators/rest_client.rb +3 -0
- data/lib/instana/activators/roda.rb +3 -0
- data/lib/instana/activators/sidekiq_client.rb +3 -0
- data/lib/instana/activators/sidekiq_worker.rb +3 -0
- data/lib/instana/activators/sinatra.rb +3 -0
- data/lib/instana/agent.rb +3 -0
- data/lib/instana/agent/helpers.rb +3 -0
- data/lib/instana/agent/hooks.rb +3 -0
- data/lib/instana/agent/tasks.rb +3 -0
- data/lib/instana/base.rb +3 -0
- data/lib/instana/collector.rb +3 -0
- data/lib/instana/collectors/gc.rb +3 -0
- data/lib/instana/collectors/memory.rb +3 -0
- data/lib/instana/collectors/thread.rb +3 -0
- data/lib/instana/config.rb +6 -0
- data/lib/instana/frameworks/cuba.rb +3 -0
- data/lib/instana/frameworks/rails.rb +3 -0
- data/lib/instana/frameworks/roda.rb +3 -0
- data/lib/instana/frameworks/sinatra.rb +3 -0
- data/lib/instana/helpers.rb +3 -0
- data/lib/instana/instrumentation/action_cable.rb +53 -0
- data/lib/instana/instrumentation/action_controller.rb +4 -1
- data/lib/instana/instrumentation/action_view.rb +3 -0
- data/lib/instana/instrumentation/active_record.rb +3 -0
- data/lib/instana/instrumentation/aws_sdk_dynamodb.rb +29 -0
- data/lib/instana/instrumentation/dalli.rb +3 -0
- data/lib/instana/instrumentation/excon.rb +11 -3
- data/lib/instana/instrumentation/graphql.rb +3 -0
- data/lib/instana/instrumentation/grpc.rb +3 -0
- data/lib/instana/instrumentation/instrumented_request.rb +62 -6
- data/lib/instana/instrumentation/net-http.rb +9 -1
- data/lib/instana/instrumentation/rack.rb +38 -15
- data/lib/instana/instrumentation/redis.rb +3 -0
- data/lib/instana/instrumentation/resque.rb +3 -0
- data/lib/instana/instrumentation/rest-client.rb +3 -0
- data/lib/instana/instrumentation/sidekiq-client.rb +4 -1
- data/lib/instana/instrumentation/sidekiq-worker.rb +4 -1
- data/lib/instana/opentracing/carrier.rb +3 -0
- data/lib/instana/opentracing/tracer.rb +3 -0
- data/lib/instana/rack.rb +4 -0
- data/lib/instana/secrets.rb +3 -0
- data/lib/instana/setup.rb +3 -0
- data/lib/instana/thread_local.rb +3 -0
- data/lib/instana/tracer.rb +13 -7
- data/lib/instana/tracing/processor.rb +3 -0
- data/lib/instana/tracing/span.rb +11 -2
- data/lib/instana/tracing/span_context.rb +27 -1
- data/lib/instana/util.rb +3 -0
- data/lib/instana/version.rb +4 -1
- data/lib/oj_check.rb +3 -0
- data/lib/opentracing.rb +3 -0
- data/test/activator_test.rb +3 -0
- data/test/agent/agent_test.rb +3 -0
- data/test/benchmarks/bench_id_generation.rb +3 -0
- data/test/benchmarks/bench_opentracing.rb +3 -0
- data/test/config_test.rb +3 -0
- data/test/frameworks/cuba_test.rb +3 -0
- data/test/frameworks/roda_test.rb +4 -0
- data/test/frameworks/sinatra_test.rb +3 -0
- data/test/instana_test.rb +3 -0
- data/test/instrumentation/aws_test.rb +33 -0
- data/test/instrumentation/dalli_test.rb +3 -0
- data/test/instrumentation/excon_test.rb +3 -0
- data/test/instrumentation/graphql_test.rb +3 -0
- data/test/instrumentation/grpc_test.rb +3 -0
- data/test/instrumentation/net_http_test.rb +3 -0
- data/test/instrumentation/rack_instrumented_request_test.rb +49 -1
- data/test/instrumentation/rack_test.rb +144 -0
- data/test/instrumentation/rails_action_cable_test.rb +131 -0
- data/test/instrumentation/rails_action_controller_test.rb +3 -0
- data/test/instrumentation/rails_action_view_test.rb +13 -0
- data/test/instrumentation/rails_active_record_test.rb +3 -2
- data/test/instrumentation/redis_test.rb +3 -0
- data/test/instrumentation/resque_test.rb +3 -0
- data/test/instrumentation/rest_client_test.rb +3 -0
- data/test/instrumentation/sidekiq-client_test.rb +3 -0
- data/test/instrumentation/sidekiq-worker_test.rb +3 -0
- data/test/secrets_test.rb +3 -0
- data/test/support/apps/active_record/active_record.rb +3 -0
- data/test/support/apps/grpc/boot.rb +3 -0
- data/test/support/apps/grpc/grpc_server.rb +3 -0
- data/test/support/apps/http_endpoint/boot.rb +3 -0
- data/test/support/apps/rails/boot.rb +3 -0
- data/test/support/apps/rails/models/block.rb +3 -0
- data/test/support/apps/rails/models/block6.rb +3 -0
- data/test/support/apps/resque/boot.rb +3 -0
- data/test/support/apps/resque/jobs/resque_error_job.rb +3 -0
- data/test/support/apps/resque/jobs/resque_fast_job.rb +3 -0
- data/test/support/apps/sidekiq/boot.rb +4 -0
- data/test/support/apps/sidekiq/jobs/sidekiq_job_1.rb +3 -0
- data/test/support/apps/sidekiq/jobs/sidekiq_job_2.rb +3 -0
- data/test/support/apps/sidekiq/worker.rb +3 -0
- data/test/support/helpers.rb +3 -0
- data/test/test_helper.rb +3 -0
- data/test/tracing/custom_test.rb +3 -0
- data/test/tracing/id_management_test.rb +4 -0
- data/test/tracing/opentracing_test.rb +6 -3
- data/test/tracing/tracer_async_test.rb +3 -0
- data/test/tracing/tracer_test.rb +3 -0
- metadata +12 -2
@@ -0,0 +1,131 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2021
|
3
|
+
|
4
|
+
require 'test_helper'
|
5
|
+
|
6
|
+
require 'rails'
|
7
|
+
require 'action_cable'
|
8
|
+
|
9
|
+
require 'ostruct'
|
10
|
+
require 'logger'
|
11
|
+
|
12
|
+
class RailsActionCableTest < Minitest::Test
|
13
|
+
def setup
|
14
|
+
skip unless defined?(::ActionCable::Connection::Base)
|
15
|
+
end
|
16
|
+
|
17
|
+
def test_transmit_no_parent
|
18
|
+
clear_all!
|
19
|
+
|
20
|
+
connection = mock_connection
|
21
|
+
channel_klass = Class.new(ActionCable::Channel::Base)
|
22
|
+
|
23
|
+
channel_klass
|
24
|
+
.new(connection, :test)
|
25
|
+
.send(:transmit, 'action' => 'sample')
|
26
|
+
|
27
|
+
span, rest = Instana.processor.queued_spans
|
28
|
+
data = span[:data]
|
29
|
+
|
30
|
+
assert_nil rest
|
31
|
+
assert :"rpc-server", span[:n]
|
32
|
+
assert :actioncable, data[:rpc][:flavor]
|
33
|
+
assert channel_klass.to_s, data[:rpc][:call]
|
34
|
+
assert :transmit, data[:rpc][:call_type]
|
35
|
+
assert Socket.gethostname, data[:rpc][:host]
|
36
|
+
end
|
37
|
+
|
38
|
+
def test_transmit_parent
|
39
|
+
clear_all!
|
40
|
+
|
41
|
+
connection = mock_connection
|
42
|
+
connection.instance_variable_set(
|
43
|
+
:@instana_trace_context,
|
44
|
+
Instana::SpanContext.new('ABC', 'ABC')
|
45
|
+
)
|
46
|
+
channel_klass = Class.new(ActionCable::Channel::Base)
|
47
|
+
|
48
|
+
channel_klass
|
49
|
+
.new(connection, :test)
|
50
|
+
.send(:transmit, 'action' => 'sample')
|
51
|
+
|
52
|
+
span, rest = Instana.processor.queued_spans
|
53
|
+
data = span[:data]
|
54
|
+
|
55
|
+
assert_nil rest
|
56
|
+
assert 'ABC', span[:t]
|
57
|
+
assert :"rpc-server", span[:n]
|
58
|
+
assert :actioncable, data[:rpc][:flavor]
|
59
|
+
assert channel_klass.to_s, data[:rpc][:call]
|
60
|
+
assert :transmit, data[:rpc][:call_type]
|
61
|
+
assert Socket.gethostname, data[:rpc][:host]
|
62
|
+
end
|
63
|
+
|
64
|
+
def test_action_no_parent
|
65
|
+
clear_all!
|
66
|
+
|
67
|
+
connection = mock_connection
|
68
|
+
channel_klass = Class.new(ActionCable::Channel::Base) do
|
69
|
+
def sample
|
70
|
+
raise unless Instana.tracer.tracing?
|
71
|
+
end
|
72
|
+
end
|
73
|
+
|
74
|
+
channel_klass
|
75
|
+
.new(connection, :test)
|
76
|
+
.perform_action('action' => 'sample')
|
77
|
+
|
78
|
+
span, rest = Instana.processor.queued_spans
|
79
|
+
data = span[:data]
|
80
|
+
|
81
|
+
assert_nil rest
|
82
|
+
assert :"rpc-server", span[:n]
|
83
|
+
assert :actioncable, data[:rpc][:flavor]
|
84
|
+
assert "#{channel_klass}#sample", data[:rpc][:call]
|
85
|
+
assert :action, data[:rpc][:call_type]
|
86
|
+
assert Socket.gethostname, data[:rpc][:host]
|
87
|
+
end
|
88
|
+
|
89
|
+
def test_action_parent
|
90
|
+
clear_all!
|
91
|
+
|
92
|
+
connection = mock_connection
|
93
|
+
connection.instance_variable_set(
|
94
|
+
:@instana_trace_context,
|
95
|
+
Instana::SpanContext.new('ABC', 'ABC')
|
96
|
+
)
|
97
|
+
channel_klass = Class.new(ActionCable::Channel::Base) do
|
98
|
+
def sample
|
99
|
+
raise unless Instana.tracer.tracing?
|
100
|
+
end
|
101
|
+
end
|
102
|
+
|
103
|
+
channel_klass
|
104
|
+
.new(connection, :test)
|
105
|
+
.perform_action('action' => 'sample')
|
106
|
+
|
107
|
+
span, rest = Instana.processor.queued_spans
|
108
|
+
data = span[:data]
|
109
|
+
|
110
|
+
assert_nil rest
|
111
|
+
assert 'ABC', span[:t]
|
112
|
+
assert :"rpc-server", span[:n]
|
113
|
+
assert :actioncable, data[:rpc][:flavor]
|
114
|
+
assert "#{channel_klass}#sample", data[:rpc][:call]
|
115
|
+
assert :action, data[:rpc][:call_type]
|
116
|
+
assert Socket.gethostname, data[:rpc][:host]
|
117
|
+
end
|
118
|
+
|
119
|
+
private
|
120
|
+
|
121
|
+
def mock_connection
|
122
|
+
server = OpenStruct.new(
|
123
|
+
logger: Logger.new('/dev/null'),
|
124
|
+
worker_pool: nil,
|
125
|
+
config: OpenStruct.new(log_tags: [])
|
126
|
+
)
|
127
|
+
connection = ActionCable::Connection::Base.new(server, {})
|
128
|
+
connection.define_singleton_method(:transmit) { |*_args| true }
|
129
|
+
connection
|
130
|
+
end
|
131
|
+
end
|
@@ -1,3 +1,6 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2021
|
3
|
+
|
1
4
|
require 'test_helper'
|
2
5
|
|
3
6
|
class RailsActionViewTest < Minitest::Test
|
@@ -28,6 +31,16 @@ class RailsActionViewTest < Minitest::Test
|
|
28
31
|
assert_equal 'Default', span[:data][:actionview][:name]
|
29
32
|
end
|
30
33
|
|
34
|
+
def test_render_view_direct
|
35
|
+
get '/render_view_direct'
|
36
|
+
assert last_response.ok?
|
37
|
+
|
38
|
+
spans = ::Instana.processor.queued_spans
|
39
|
+
span = find_first_span_by_name(spans, :actionview)
|
40
|
+
|
41
|
+
assert_equal 'Default', span[:data][:actionview][:name]
|
42
|
+
end
|
43
|
+
|
31
44
|
def test_render_nothing
|
32
45
|
# `render nothing: true` was removed in 5.1
|
33
46
|
skip unless Rails::VERSION::MAJOR <= 5 && Rails::VERSION::MINOR <= 1
|
data/test/secrets_test.rb
CHANGED
data/test/support/helpers.rb
CHANGED
data/test/test_helper.rb
CHANGED
data/test/tracing/custom_test.rb
CHANGED
@@ -1,3 +1,6 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2017
|
3
|
+
|
1
4
|
require 'test_helper'
|
2
5
|
require 'rack/test'
|
3
6
|
require 'rack/lobster'
|
@@ -301,7 +304,7 @@ class OpenTracerTest < Minitest::Test
|
|
301
304
|
assert_equal second_span[:s], third_span[:p]
|
302
305
|
|
303
306
|
# Every span should have baggage
|
304
|
-
assert_equal(
|
307
|
+
assert_equal({}, entry_span.context.baggage)
|
305
308
|
assert_equal({:my_bag=>1}, ac_span.context.baggage)
|
306
309
|
assert_equal({:my_bag=>1}, av_span.context.baggage)
|
307
310
|
end
|
@@ -328,9 +331,9 @@ class OpenTracerTest < Minitest::Test
|
|
328
331
|
spans = ::Instana.processor.queued_spans
|
329
332
|
assert_equal 3, spans.length
|
330
333
|
|
331
|
-
assert_equal(
|
334
|
+
assert_equal({}, entry_span.context.baggage)
|
332
335
|
assert_equal({:my_bag=>1}, ac_span.context.baggage)
|
333
|
-
assert_equal(
|
336
|
+
assert_equal({}, av_span.context.baggage)
|
334
337
|
end
|
335
338
|
|
336
339
|
def test_start_active_span
|
data/test/tracing/tracer_test.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: instana
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.195.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Peter Giacomo Lombardo
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-02-
|
11
|
+
date: 2021-02-25 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -170,7 +170,9 @@ files:
|
|
170
170
|
- bin/setup
|
171
171
|
- examples/opentracing.rb
|
172
172
|
- examples/tracing.rb
|
173
|
+
- extras/license_header.rb
|
173
174
|
- gemfiles/.bundle/config
|
175
|
+
- gemfiles/aws_30.gemfile
|
174
176
|
- gemfiles/cuba_30.gemfile
|
175
177
|
- gemfiles/dalli_20.gemfile
|
176
178
|
- gemfiles/excon_02.gemfile
|
@@ -196,10 +198,12 @@ files:
|
|
196
198
|
- instana.gemspec
|
197
199
|
- lib/instana.rb
|
198
200
|
- lib/instana/activator.rb
|
201
|
+
- lib/instana/activators/action_cable.rb
|
199
202
|
- lib/instana/activators/action_controller_api.rb
|
200
203
|
- lib/instana/activators/action_controller_base.rb
|
201
204
|
- lib/instana/activators/action_view.rb
|
202
205
|
- lib/instana/activators/active_record.rb
|
206
|
+
- lib/instana/activators/aws_sdk_dynamodb.rb
|
203
207
|
- lib/instana/activators/cuba.rb
|
204
208
|
- lib/instana/activators/dalli.rb
|
205
209
|
- lib/instana/activators/excon.rb
|
@@ -234,9 +238,11 @@ files:
|
|
234
238
|
- lib/instana/frameworks/roda.rb
|
235
239
|
- lib/instana/frameworks/sinatra.rb
|
236
240
|
- lib/instana/helpers.rb
|
241
|
+
- lib/instana/instrumentation/action_cable.rb
|
237
242
|
- lib/instana/instrumentation/action_controller.rb
|
238
243
|
- lib/instana/instrumentation/action_view.rb
|
239
244
|
- lib/instana/instrumentation/active_record.rb
|
245
|
+
- lib/instana/instrumentation/aws_sdk_dynamodb.rb
|
240
246
|
- lib/instana/instrumentation/dalli.rb
|
241
247
|
- lib/instana/instrumentation/excon.rb
|
242
248
|
- lib/instana/instrumentation/graphql.rb
|
@@ -273,6 +279,7 @@ files:
|
|
273
279
|
- test/frameworks/roda_test.rb
|
274
280
|
- test/frameworks/sinatra_test.rb
|
275
281
|
- test/instana_test.rb
|
282
|
+
- test/instrumentation/aws_test.rb
|
276
283
|
- test/instrumentation/dalli_test.rb
|
277
284
|
- test/instrumentation/excon_test.rb
|
278
285
|
- test/instrumentation/graphql_test.rb
|
@@ -280,6 +287,7 @@ files:
|
|
280
287
|
- test/instrumentation/net_http_test.rb
|
281
288
|
- test/instrumentation/rack_instrumented_request_test.rb
|
282
289
|
- test/instrumentation/rack_test.rb
|
290
|
+
- test/instrumentation/rails_action_cable_test.rb
|
283
291
|
- test/instrumentation/rails_action_controller_test.rb
|
284
292
|
- test/instrumentation/rails_action_view_test.rb
|
285
293
|
- test/instrumentation/rails_active_record_test.rb
|
@@ -360,8 +368,10 @@ test_files:
|
|
360
368
|
- test/instrumentation/rails_active_record_test.rb
|
361
369
|
- test/instrumentation/redis_test.rb
|
362
370
|
- test/instrumentation/dalli_test.rb
|
371
|
+
- test/instrumentation/rails_action_cable_test.rb
|
363
372
|
- test/instrumentation/excon_test.rb
|
364
373
|
- test/instrumentation/grpc_test.rb
|
374
|
+
- test/instrumentation/aws_test.rb
|
365
375
|
- test/support/helpers.rb
|
366
376
|
- test/support/apps/sidekiq/boot.rb
|
367
377
|
- test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
|