instana 1.193.3.pre1 → 1.195.0
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 +22 -12
- data/.gitignore +2 -1
- data/.rubocop.yml +7 -0
- data/Appraisals +11 -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 +4 -0
- data/gemfiles/dalli_20.gemfile +4 -0
- data/gemfiles/excon_02.gemfile +4 -0
- data/gemfiles/graphql_10.gemfile +4 -0
- data/gemfiles/grpc_10.gemfile +4 -0
- data/gemfiles/net_http_01.gemfile +4 -0
- data/gemfiles/rack_16.gemfile +4 -0
- data/gemfiles/rack_20.gemfile +4 -0
- data/gemfiles/rails_42.gemfile +5 -0
- data/gemfiles/rails_50.gemfile +5 -0
- data/gemfiles/rails_52.gemfile +5 -0
- data/gemfiles/rails_60.gemfile +5 -0
- data/gemfiles/redis_40.gemfile +4 -0
- data/gemfiles/resque_122.gemfile +4 -0
- data/gemfiles/resque_20.gemfile +4 -0
- data/gemfiles/rest_client_16.gemfile +4 -0
- data/gemfiles/rest_client_20.gemfile +4 -0
- data/gemfiles/roda_20.gemfile +4 -0
- data/gemfiles/roda_30.gemfile +4 -0
- data/gemfiles/sidekiq_42.gemfile +4 -0
- data/gemfiles/sidekiq_50.gemfile +4 -0
- data/gemfiles/sinatra_14.gemfile +4 -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 +21 -0
- data/lib/instana/activators/action_controller_base.rb +21 -0
- data/lib/instana/activators/action_view.rb +21 -0
- data/lib/instana/activators/active_record.rb +21 -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 +3 -0
- 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 +22 -31
- 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 +84 -0
- data/lib/instana/instrumentation/action_view.rb +30 -0
- data/lib/instana/instrumentation/active_record.rb +50 -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/{frameworks/rails/actioncontroller_test.rb → instrumentation/rails_action_controller_test.rb} +40 -21
- data/test/instrumentation/rails_action_view_test.rb +151 -0
- data/test/instrumentation/rails_active_record_test.rb +122 -0
- 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 +24 -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 +29 -23
- data/lib/instana/frameworks/instrumentation/abstract_mysql_adapter.rb +0 -56
- data/lib/instana/frameworks/instrumentation/action_controller.rb +0 -194
- data/lib/instana/frameworks/instrumentation/action_view.rb +0 -39
- data/lib/instana/frameworks/instrumentation/active_record.rb +0 -27
- data/lib/instana/frameworks/instrumentation/mysql2_adapter.rb +0 -83
- data/lib/instana/frameworks/instrumentation/mysql_adapter.rb +0 -60
- data/lib/instana/frameworks/instrumentation/postgresql_adapter.rb +0 -99
- data/test/frameworks/rails/actionview3_test.rb +0 -210
- data/test/frameworks/rails/actionview4_test.rb +0 -208
- data/test/frameworks/rails/actionview5_test.rb +0 -221
- data/test/frameworks/rails/activerecord_test.rb +0 -279
- data/test/frameworks/rails_test.rb +0 -15
@@ -0,0 +1,20 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2021
|
3
|
+
|
4
|
+
module Instana
|
5
|
+
module Activators
|
6
|
+
class AwsDynamoDB < Activator
|
7
|
+
def can_instrument?
|
8
|
+
defined?(Aws::DynamoDB::Client)
|
9
|
+
end
|
10
|
+
|
11
|
+
def instrument
|
12
|
+
require 'instana/instrumentation/aws_sdk_dynamodb'
|
13
|
+
|
14
|
+
::Aws::DynamoDB::Client.add_plugin(Instana::Instrumentation::DynamoDB)
|
15
|
+
|
16
|
+
true
|
17
|
+
end
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
data/lib/instana/agent.rb
CHANGED
data/lib/instana/agent/hooks.rb
CHANGED
data/lib/instana/agent/tasks.rb
CHANGED
data/lib/instana/base.rb
CHANGED
data/lib/instana/collector.rb
CHANGED
data/lib/instana/config.rb
CHANGED
@@ -1,3 +1,6 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2016
|
3
|
+
|
1
4
|
module Instana
|
2
5
|
class Config
|
3
6
|
|
@@ -52,6 +55,9 @@ module Instana
|
|
52
55
|
# ::Instana.config[:sanitize_sql] = false
|
53
56
|
@config[:sanitize_sql] = true
|
54
57
|
|
58
|
+
# W3 Trace Context Support
|
59
|
+
@config[:w3_trace_correlation] = ENV.fetch('INSTANA_W3C_TRACE_CORRELATION', 'true').eql?('true')
|
60
|
+
|
55
61
|
@config[:action_controller] = { :enabled => true }
|
56
62
|
@config[:action_view] = { :enabled => true }
|
57
63
|
@config[:active_record] = { :enabled => true }
|
@@ -1,39 +1,30 @@
|
|
1
|
-
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2016
|
2
3
|
|
3
|
-
if
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
::Instana.logger = ::Rails.logger if ::Rails.logger
|
4
|
+
if ::Rails::VERSION::MAJOR < 3
|
5
|
+
::Rails.configuration.after_initialize do
|
6
|
+
# In Rails, let's use the Rails logger
|
7
|
+
::Instana.logger = ::Rails.logger if ::Rails.logger
|
8
8
|
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
end
|
9
|
+
if ::Instana.config[:tracing][:enabled]
|
10
|
+
::Instana.logger.debug "Instrumenting Rack"
|
11
|
+
::Rails.configuration.middleware.insert 0, ::Instana::Rack
|
12
|
+
else
|
13
|
+
::Instana.logger.info "Rack: Tracing disabled via config. Not enabling middleware."
|
15
14
|
end
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
if ::Instana.config[:tracing][:enabled]
|
24
|
-
::Instana.logger.debug "Instrumenting Rack"
|
25
|
-
app.config.middleware.insert 0, ::Instana::Rack
|
26
|
-
else
|
27
|
-
::Instana.logger.info "Rack: Tracing disabled via config. Not enabling middleware."
|
28
|
-
end
|
29
|
-
end
|
15
|
+
end
|
16
|
+
else
|
17
|
+
module ::Instana
|
18
|
+
class Railtie < ::Rails::Railtie
|
19
|
+
initializer 'instana.rack' do |app|
|
20
|
+
# In Rails, let's use the Rails logger
|
21
|
+
::Instana.logger = ::Rails.logger if ::Rails.logger
|
30
22
|
|
31
23
|
if ::Instana.config[:tracing][:enabled]
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
end
|
24
|
+
::Instana.logger.debug "Instrumenting Rack"
|
25
|
+
app.config.middleware.insert 0, ::Instana::Rack
|
26
|
+
else
|
27
|
+
::Instana.logger.info "Rack: Tracing disabled via config. Not enabling middleware."
|
37
28
|
end
|
38
29
|
end
|
39
30
|
end
|
data/lib/instana/helpers.rb
CHANGED
@@ -0,0 +1,53 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2021
|
3
|
+
|
4
|
+
module Instana
|
5
|
+
module Instrumentation
|
6
|
+
module ActionCableConnection
|
7
|
+
def instana_trace_context
|
8
|
+
@instana_trace_context
|
9
|
+
end
|
10
|
+
|
11
|
+
def process
|
12
|
+
@instana_trace_context ||= ::Instana.tracer.tracing? ? ::Instana.tracer.current_span.context : {}
|
13
|
+
super
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
17
|
+
module ActionCableChannel
|
18
|
+
def transmit(*args)
|
19
|
+
rpc_tags = {
|
20
|
+
service: ::Instana::Util.get_app_name,
|
21
|
+
rpc: {
|
22
|
+
flavor: :actioncable,
|
23
|
+
call: self.class.to_s,
|
24
|
+
call_type: :transmit,
|
25
|
+
host: Socket.gethostname
|
26
|
+
}
|
27
|
+
}
|
28
|
+
|
29
|
+
context = connection.instana_trace_context
|
30
|
+
::Instana.tracer.start_or_continue_trace(:'rpc-server', rpc_tags, context) do
|
31
|
+
super(*args)
|
32
|
+
end
|
33
|
+
end
|
34
|
+
|
35
|
+
def dispatch_action(action, data)
|
36
|
+
rpc_tags = {
|
37
|
+
service: ::Instana::Util.get_app_name,
|
38
|
+
rpc: {
|
39
|
+
flavor: :actioncable,
|
40
|
+
call: "#{self.class}##{action}",
|
41
|
+
call_type: :action,
|
42
|
+
host: Socket.gethostname
|
43
|
+
}
|
44
|
+
}
|
45
|
+
|
46
|
+
context = connection.instana_trace_context
|
47
|
+
::Instana.tracer.start_or_continue_trace(:'rpc-server', rpc_tags, context) do
|
48
|
+
super(action, data)
|
49
|
+
end
|
50
|
+
end
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
@@ -0,0 +1,84 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2021
|
3
|
+
|
4
|
+
module Instana
|
5
|
+
module Instrumentation
|
6
|
+
module ActionController
|
7
|
+
def process_action(*args)
|
8
|
+
call_payload = {
|
9
|
+
actioncontroller: {
|
10
|
+
controller: self.class.name,
|
11
|
+
action: action_name
|
12
|
+
}
|
13
|
+
}
|
14
|
+
|
15
|
+
request.env['INSTANA_HTTP_PATH_TEMPLATE'] = matched_path_template
|
16
|
+
::Instana::Tracer.trace(:actioncontroller, call_payload) { super(*args) }
|
17
|
+
end
|
18
|
+
|
19
|
+
def render(*args, &block)
|
20
|
+
call_payload = {
|
21
|
+
actionview: {
|
22
|
+
name: describe_render_options(args.first) || 'Default'
|
23
|
+
}
|
24
|
+
}
|
25
|
+
|
26
|
+
::Instana::Tracer.trace(:actionview, call_payload) { super(*args, &block) }
|
27
|
+
end
|
28
|
+
|
29
|
+
private
|
30
|
+
|
31
|
+
def matched_path_template
|
32
|
+
Rails.application.routes.router.recognize(request) do |route, _, _|
|
33
|
+
path = route.path
|
34
|
+
return path.spec.to_s
|
35
|
+
end
|
36
|
+
|
37
|
+
nil
|
38
|
+
end
|
39
|
+
|
40
|
+
def describe_render_options(options)
|
41
|
+
return unless options.is_a?(Hash)
|
42
|
+
|
43
|
+
describe_layout(options[:layout]) ||
|
44
|
+
describe_direct(options)
|
45
|
+
end
|
46
|
+
|
47
|
+
def describe_layout(layout)
|
48
|
+
return unless layout
|
49
|
+
|
50
|
+
case layout
|
51
|
+
when FalseClass
|
52
|
+
'Without layout'
|
53
|
+
when String
|
54
|
+
layout
|
55
|
+
when Proc
|
56
|
+
'Proc'
|
57
|
+
else
|
58
|
+
'Default'
|
59
|
+
end
|
60
|
+
end
|
61
|
+
|
62
|
+
def describe_direct(options)
|
63
|
+
case options
|
64
|
+
when ->(o) { o.key?(:nothing) }
|
65
|
+
'Nothing'
|
66
|
+
when ->(o) { o.key?(:plain) }
|
67
|
+
'Plaintext'
|
68
|
+
when ->(o) { o.key?(:json) }
|
69
|
+
'JSON'
|
70
|
+
when ->(o) { o.key?(:xml) }
|
71
|
+
'XML'
|
72
|
+
when ->(o) { o.key?(:body) }
|
73
|
+
'Raw'
|
74
|
+
when ->(o) { o.key?(:js) }
|
75
|
+
'Javascript'
|
76
|
+
when ->(o) { o.key?(:template) }
|
77
|
+
options[:template]
|
78
|
+
when ->(o) { o.key?(:file) }
|
79
|
+
options[:file]
|
80
|
+
end
|
81
|
+
end
|
82
|
+
end
|
83
|
+
end
|
84
|
+
end
|