instana 1.193.4 → 1.195.2
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 +20 -2
- data/.rubocop.yml +7 -0
- data/Appraisals +20 -1
- 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/docker-compose.yml +20 -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 +21 -0
- data/gemfiles/cuba_30.gemfile +3 -0
- data/gemfiles/dalli_20.gemfile +3 -0
- data/gemfiles/excon_02.gemfile +3 -0
- data/gemfiles/excon_021.gemfile +18 -0
- data/gemfiles/excon_079.gemfile +18 -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/shoryuken_50.gemfile +19 -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/aws_sdk_s3.rb +20 -0
- data/lib/instana/activators/aws_sdk_sns.rb +20 -0
- data/lib/instana/activators/aws_sdk_sqs.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/shoryuken.rb +24 -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 +3 -0
- 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 +48 -0
- data/lib/instana/instrumentation/aws_sdk_s3.rb +55 -0
- data/lib/instana/instrumentation/aws_sdk_sns.rb +29 -0
- data/lib/instana/instrumentation/aws_sdk_sqs.rb +98 -0
- data/lib/instana/instrumentation/dalli.rb +3 -0
- data/lib/instana/instrumentation/excon.rb +13 -4
- data/lib/instana/instrumentation/graphql.rb +3 -0
- data/lib/instana/instrumentation/grpc.rb +3 -0
- data/lib/instana/instrumentation/instrumented_request.rb +68 -7
- data/lib/instana/instrumentation/net-http.rb +13 -3
- 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/shoryuken.rb +44 -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 +5 -2
- data/lib/instana/setup.rb +3 -0
- data/lib/instana/thread_local.rb +3 -0
- data/lib/instana/tracer.rb +17 -11
- data/lib/instana/tracing/processor.rb +3 -0
- data/lib/instana/tracing/span.rb +12 -3
- data/lib/instana/tracing/span_context.rb +28 -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 +161 -0
- data/test/instrumentation/dalli_test.rb +3 -0
- data/test/instrumentation/excon_test.rb +4 -0
- data/test/instrumentation/graphql_test.rb +3 -0
- data/test/instrumentation/grpc_test.rb +3 -0
- data/test/instrumentation/net_http_test.rb +21 -0
- data/test/instrumentation/rack_instrumented_request_test.rb +53 -3
- 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 +3 -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/shoryuken_test.rb +47 -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 +26 -3
- data/Dockerfile +0 -16
@@ -0,0 +1,24 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2021
|
3
|
+
|
4
|
+
module Instana
|
5
|
+
module Activators
|
6
|
+
class Shoryuken < Activator
|
7
|
+
def can_instrument?
|
8
|
+
defined?(::Shoryuken) && ::Shoryuken.respond_to?(:configure_server)
|
9
|
+
end
|
10
|
+
|
11
|
+
def instrument
|
12
|
+
require 'instana/instrumentation/shoryuken'
|
13
|
+
|
14
|
+
::Shoryuken.configure_server do |config|
|
15
|
+
config.server_middleware do |chain|
|
16
|
+
chain.add ::Instana::Instrumentation::Shoryuken
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
20
|
+
true
|
21
|
+
end
|
22
|
+
end
|
23
|
+
end
|
24
|
+
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 }
|
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,48 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2021
|
3
|
+
|
4
|
+
module Instana
|
5
|
+
module Instrumentation
|
6
|
+
class DynamoDB < Seahorse::Client::Plugin
|
7
|
+
class Handler < Seahorse::Client::Handler
|
8
|
+
def call(context)
|
9
|
+
dynamo_tags = {
|
10
|
+
op: format_operation(context.operation_name),
|
11
|
+
table: table_name_from(context)
|
12
|
+
}
|
13
|
+
|
14
|
+
::Instana.tracer.trace(:dynamodb, {dynamodb: dynamo_tags}) { @handler.call(context) }
|
15
|
+
end
|
16
|
+
|
17
|
+
private
|
18
|
+
|
19
|
+
def table_name_from(context)
|
20
|
+
context.params[:table_name] || context.params[:global_table_name] || 'Unknown'
|
21
|
+
end
|
22
|
+
|
23
|
+
def format_operation(name)
|
24
|
+
case name
|
25
|
+
when :create_table
|
26
|
+
'create'
|
27
|
+
when :list_tables
|
28
|
+
'list'
|
29
|
+
when :get_item
|
30
|
+
'get'
|
31
|
+
when :put_item
|
32
|
+
'put'
|
33
|
+
when :update_item
|
34
|
+
'update'
|
35
|
+
when :delete_item
|
36
|
+
'delete'
|
37
|
+
else
|
38
|
+
name.to_s
|
39
|
+
end
|
40
|
+
end
|
41
|
+
end
|
42
|
+
|
43
|
+
def add_handlers(handlers, _config)
|
44
|
+
handlers.add(Handler, step: :initialize)
|
45
|
+
end
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
@@ -0,0 +1,55 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2021
|
3
|
+
|
4
|
+
module Instana
|
5
|
+
module Instrumentation
|
6
|
+
class S3 < Seahorse::Client::Plugin
|
7
|
+
class Handler < Seahorse::Client::Handler
|
8
|
+
def call(context)
|
9
|
+
s3_tags = {
|
10
|
+
op: format_operation(context.operation_name),
|
11
|
+
bucket: bucket_name_from(context),
|
12
|
+
key: key_from_context(context)
|
13
|
+
}.compact
|
14
|
+
|
15
|
+
::Instana.tracer.trace(:s3, {s3: s3_tags}) { @handler.call(context) }
|
16
|
+
end
|
17
|
+
|
18
|
+
private
|
19
|
+
|
20
|
+
def bucket_name_from(context)
|
21
|
+
context.params[:bucket] || 'Unknown'
|
22
|
+
end
|
23
|
+
|
24
|
+
def key_from_context(context)
|
25
|
+
context.params[:key]
|
26
|
+
end
|
27
|
+
|
28
|
+
def format_operation(name)
|
29
|
+
case name
|
30
|
+
when :create_bucket
|
31
|
+
'createBucket'
|
32
|
+
when :delete_bucket
|
33
|
+
'deleteBucket'
|
34
|
+
when :delete_object
|
35
|
+
'delete'
|
36
|
+
when :get_object
|
37
|
+
'get'
|
38
|
+
when :head_object
|
39
|
+
'metadata'
|
40
|
+
when :list_objects
|
41
|
+
'list'
|
42
|
+
when :put_object
|
43
|
+
'list'
|
44
|
+
else
|
45
|
+
name.to_s
|
46
|
+
end
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
def add_handlers(handlers, _config)
|
51
|
+
handlers.add(Handler, step: :initialize)
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
@@ -0,0 +1,29 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2021
|
3
|
+
|
4
|
+
module Instana
|
5
|
+
module Instrumentation
|
6
|
+
class SNS < Seahorse::Client::Plugin
|
7
|
+
class Handler < Seahorse::Client::Handler
|
8
|
+
def call(context)
|
9
|
+
sns_tags = {
|
10
|
+
topic: context.params[:topic_arn],
|
11
|
+
target: context.params[:target_arn],
|
12
|
+
phone: context.params[:phone_number],
|
13
|
+
subject: context.params[:subject]
|
14
|
+
}.compact
|
15
|
+
|
16
|
+
if context.operation_name == :publish
|
17
|
+
::Instana.tracer.trace(:sns, {sns: sns_tags}) { @handler.call(context) }
|
18
|
+
else
|
19
|
+
@handler.call(context)
|
20
|
+
end
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
24
|
+
def add_handlers(handlers, _config)
|
25
|
+
handlers.add(Handler, step: :initialize)
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
29
|
+
end
|
@@ -0,0 +1,98 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2021
|
3
|
+
|
4
|
+
module Instana
|
5
|
+
module Instrumentation
|
6
|
+
class SQS < Seahorse::Client::Plugin
|
7
|
+
class Handler < Seahorse::Client::Handler
|
8
|
+
SPAN_FORMING_OPERATIONS = [:send_message, :send_message_batch, :get_queue_url, :create_queue, :delete_message, :delete_message_batch].freeze
|
9
|
+
|
10
|
+
def call(context)
|
11
|
+
is_tracing = ::Instana.tracer.tracing?
|
12
|
+
unless is_tracing && SPAN_FORMING_OPERATIONS.include?(context.operation_name)
|
13
|
+
return @handler.call(context)
|
14
|
+
end
|
15
|
+
|
16
|
+
span_tags = tags_for(context.operation_name, context.params).compact
|
17
|
+
|
18
|
+
::Instana.tracer.trace(:sqs, {sqs: span_tags}) do |span|
|
19
|
+
case context.operation_name
|
20
|
+
when :send_message
|
21
|
+
inject_instana_headers(span, context.params)
|
22
|
+
when :send_message_batch
|
23
|
+
context.params[:entries].each { |e| inject_instana_headers(span, e) }
|
24
|
+
end
|
25
|
+
|
26
|
+
response = @handler.call(context)
|
27
|
+
|
28
|
+
span_tags[:queue] = response.queue_url if response.respond_to?(:queue_url)
|
29
|
+
span.set_tags(sqs: span_tags)
|
30
|
+
|
31
|
+
response
|
32
|
+
end
|
33
|
+
end
|
34
|
+
|
35
|
+
private
|
36
|
+
|
37
|
+
def inject_instana_headers(span, params)
|
38
|
+
params[:message_attributes] ||= {}
|
39
|
+
params[:message_attributes].merge!({
|
40
|
+
"X_INSTANA_T" => {data_type: 'String', string_value: span.context.trace_id},
|
41
|
+
"X_INSTANA_S" => {data_type: 'String', string_value: span.context.span_id},
|
42
|
+
"X_INSTANA_L" => {data_type: 'String', string_value: span.context.level.to_s}
|
43
|
+
})
|
44
|
+
end
|
45
|
+
|
46
|
+
def tags_for(operation_name, params)
|
47
|
+
case operation_name
|
48
|
+
when :create_queue
|
49
|
+
{
|
50
|
+
sort: 'exit',
|
51
|
+
type: 'create.queue',
|
52
|
+
queue: params[:queue_name]
|
53
|
+
}
|
54
|
+
when :get_queue_url
|
55
|
+
{
|
56
|
+
sort: 'exit',
|
57
|
+
type: 'get.queue',
|
58
|
+
queue: params[:queue_name]
|
59
|
+
}
|
60
|
+
when :send_message
|
61
|
+
{
|
62
|
+
sort: 'exit',
|
63
|
+
type: 'single.sync',
|
64
|
+
queue: params[:queue_url],
|
65
|
+
group: params[:message_group_id]
|
66
|
+
}
|
67
|
+
when :send_message_batch
|
68
|
+
{
|
69
|
+
sort: 'exit',
|
70
|
+
type: 'single.sync',
|
71
|
+
queue: params[:queue_url],
|
72
|
+
size: params[:entries].count
|
73
|
+
}
|
74
|
+
when :delete_message
|
75
|
+
{
|
76
|
+
sort: 'exit',
|
77
|
+
type: 'delete.single.sync',
|
78
|
+
queue: params[:queue_url]
|
79
|
+
}
|
80
|
+
when :delete_message_batch
|
81
|
+
{
|
82
|
+
sort: 'exit',
|
83
|
+
type: 'delete.batch.sync',
|
84
|
+
queue: params[:queue_url],
|
85
|
+
size: params[:entries].count
|
86
|
+
}
|
87
|
+
else
|
88
|
+
{}
|
89
|
+
end
|
90
|
+
end
|
91
|
+
end
|
92
|
+
|
93
|
+
def add_handlers(handlers, _config)
|
94
|
+
handlers.add(Handler, step: :initialize)
|
95
|
+
end
|
96
|
+
end
|
97
|
+
end
|
98
|
+
end
|