instana 1.195.0 → 1.197.0.pre1
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 +16 -2
- data/.rubocop.yml +6 -2
- data/Appraisals +13 -1
- data/Rakefile +1 -1
- data/docker-compose.yml +20 -0
- data/gemfiles/aws_30.gemfile +3 -0
- data/gemfiles/excon_021.gemfile +18 -0
- data/gemfiles/excon_079.gemfile +18 -0
- data/gemfiles/shoryuken_50.gemfile +19 -0
- data/instana.gemspec +3 -7
- data/lib/instana.rb +3 -0
- data/lib/instana/activator.rb +2 -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/excon.rb +1 -1
- data/lib/instana/activators/shoryuken.rb +24 -0
- data/lib/instana/backend/agent.rb +60 -0
- data/lib/instana/backend/gc_snapshot.rb +41 -0
- data/lib/instana/backend/host_agent.rb +57 -0
- data/lib/instana/backend/host_agent_activation_observer.rb +87 -0
- data/lib/instana/backend/host_agent_lookup.rb +57 -0
- data/lib/instana/backend/host_agent_reporting_observer.rb +106 -0
- data/lib/instana/backend/process_info.rb +64 -0
- data/lib/instana/backend/request_client.rb +84 -0
- data/lib/instana/backend/serverless_agent.rb +118 -0
- data/lib/instana/base.rb +8 -27
- data/lib/instana/config.rb +7 -21
- data/lib/instana/instrumentation/aws_sdk_dynamodb.rb +21 -2
- 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/excon.rb +12 -4
- data/lib/instana/instrumentation/instrumented_request.rb +7 -2
- data/lib/instana/instrumentation/net-http.rb +4 -2
- data/lib/instana/instrumentation/shoryuken.rb +44 -0
- data/lib/instana/logger_delegator.rb +31 -0
- data/lib/instana/{opentracing → open_tracing}/carrier.rb +0 -0
- data/lib/instana/open_tracing/instana_tracer.rb +99 -0
- data/lib/instana/secrets.rb +8 -4
- data/lib/instana/setup.rb +20 -11
- data/lib/instana/snapshot/deltable.rb +25 -0
- data/lib/instana/snapshot/docker_container.rb +151 -0
- data/lib/instana/snapshot/fargate_container.rb +88 -0
- data/lib/instana/snapshot/fargate_process.rb +67 -0
- data/lib/instana/snapshot/fargate_task.rb +72 -0
- data/lib/instana/snapshot/ruby_process.rb +48 -0
- data/lib/instana/tracer.rb +29 -147
- data/lib/instana/tracing/processor.rb +4 -22
- data/lib/instana/tracing/span.rb +29 -38
- data/lib/instana/tracing/span_context.rb +3 -2
- data/lib/instana/util.rb +4 -67
- data/lib/instana/version.rb +1 -1
- data/lib/opentracing.rb +26 -3
- data/test/backend/agent_test.rb +54 -0
- data/test/backend/gc_snapshot_test.rb +11 -0
- data/test/backend/host_agent_activation_observer_test.rb +65 -0
- data/test/backend/host_agent_lookup_test.rb +78 -0
- data/test/backend/host_agent_reporting_observer_test.rb +192 -0
- data/test/backend/host_agent_test.rb +32 -0
- data/test/backend/process_info_test.rb +63 -0
- data/test/backend/request_client_test.rb +61 -0
- data/test/backend/serverless_agent_test.rb +73 -0
- data/test/config_test.rb +10 -0
- data/test/instana_test.rb +11 -4
- data/test/instrumentation/aws_test.rb +130 -2
- data/test/instrumentation/excon_test.rb +16 -1
- data/test/instrumentation/net_http_test.rb +18 -0
- data/test/instrumentation/rack_instrumented_request_test.rb +7 -4
- data/test/instrumentation/rack_test.rb +2 -14
- data/test/instrumentation/shoryuken_test.rb +47 -0
- data/test/secrets_test.rb +41 -22
- data/test/snapshot/deltable_test.rb +17 -0
- data/test/snapshot/docker_container_test.rb +82 -0
- data/test/snapshot/fargate_container_test.rb +82 -0
- data/test/snapshot/fargate_process_test.rb +35 -0
- data/test/snapshot/fargate_task_test.rb +49 -0
- data/test/snapshot/ruby_process_test.rb +14 -0
- data/test/support/mock_timer.rb +20 -0
- data/test/test_helper.rb +15 -3
- data/test/tracing/custom_test.rb +1 -3
- data/test/tracing/id_management_test.rb +4 -0
- data/test/tracing/opentracing_test.rb +15 -2
- data/test/tracing/processor_test.rb +58 -0
- data/test/tracing/span_context_test.rb +22 -0
- data/test/tracing/span_test.rb +127 -0
- data/test/tracing/tracer_async_test.rb +29 -0
- data/test/tracing/tracer_test.rb +82 -16
- data/test/util_test.rb +10 -0
- metadata +86 -46
- data/Dockerfile +0 -16
- data/lib/instana/agent.rb +0 -508
- data/lib/instana/agent/helpers.rb +0 -87
- data/lib/instana/agent/hooks.rb +0 -44
- data/lib/instana/agent/tasks.rb +0 -51
- data/lib/instana/collector.rb +0 -119
- data/lib/instana/collectors/gc.rb +0 -60
- data/lib/instana/collectors/memory.rb +0 -37
- data/lib/instana/collectors/thread.rb +0 -33
- data/lib/instana/eum/eum-test.js.erb +0 -17
- data/lib/instana/eum/eum.js.erb +0 -17
- data/lib/instana/helpers.rb +0 -47
- data/lib/instana/opentracing/tracer.rb +0 -21
- data/lib/instana/thread_local.rb +0 -18
- data/lib/oj_check.rb +0 -19
- data/test/agent/agent_test.rb +0 -151
data/test/config_test.rb
CHANGED
@@ -21,4 +21,14 @@ class ConfigTest < Minitest::Test
|
|
21
21
|
assert_equal true, ::Instana.config[:metrics][k].key?(:enabled)
|
22
22
|
end
|
23
23
|
end
|
24
|
+
|
25
|
+
def test_custom_agent_host
|
26
|
+
subject = Instana::Config.new(logger: Logger.new('/dev/null'), agent_host: 'abc')
|
27
|
+
assert_equal 'abc', subject[:agent_host]
|
28
|
+
end
|
29
|
+
|
30
|
+
def test_custom_agent_port
|
31
|
+
subject = Instana::Config.new(logger: Logger.new('/dev/null'), agent_port: 'abc')
|
32
|
+
assert_equal 'abc', subject[:agent_port]
|
33
|
+
end
|
24
34
|
end
|
data/test/instana_test.rb
CHANGED
@@ -16,10 +16,6 @@ class InstanaTest < Minitest::Test
|
|
16
16
|
refute_nil ::Instana.agent
|
17
17
|
end
|
18
18
|
|
19
|
-
def test_that_it_has_a_collector
|
20
|
-
refute_nil ::Instana.collector
|
21
|
-
end
|
22
|
-
|
23
19
|
def test_that_it_has_a_tracer
|
24
20
|
refute_nil ::Instana.tracer
|
25
21
|
end
|
@@ -27,4 +23,15 @@ class InstanaTest < Minitest::Test
|
|
27
23
|
def test_that_it_has_a_config
|
28
24
|
refute_nil ::Instana.config
|
29
25
|
end
|
26
|
+
|
27
|
+
def test_assign_logger
|
28
|
+
mock = Minitest::Mock.new
|
29
|
+
mock.expect(:info, true, [String])
|
30
|
+
|
31
|
+
::Instana.logger = mock
|
32
|
+
::Instana.logger.info('test')
|
33
|
+
::Instana.logger = Logger.new('/dev/null')
|
34
|
+
|
35
|
+
mock.verify
|
36
|
+
end
|
30
37
|
end
|
@@ -4,6 +4,10 @@
|
|
4
4
|
require 'test_helper'
|
5
5
|
|
6
6
|
class AwsTest < Minitest::Test
|
7
|
+
def setup
|
8
|
+
clear_all!
|
9
|
+
end
|
10
|
+
|
7
11
|
def test_dynamo_db
|
8
12
|
dynamo = Aws::DynamoDB::Client.new(
|
9
13
|
region: "local",
|
@@ -27,7 +31,131 @@ class AwsTest < Minitest::Test
|
|
27
31
|
assert rest.empty?
|
28
32
|
assert_equal entry_span[:s], dynamo_span[:p]
|
29
33
|
assert_equal :dynamodb, dynamo_span[:n]
|
30
|
-
assert_equal
|
31
|
-
assert_equal 'sample_table', dynamo_span[:data][:table]
|
34
|
+
assert_equal 'get', dynamo_span[:data][:dynamodb][:op]
|
35
|
+
assert_equal 'sample_table', dynamo_span[:data][:dynamodb][:table]
|
36
|
+
end
|
37
|
+
|
38
|
+
def test_s3
|
39
|
+
dynamo = Aws::S3::Client.new(
|
40
|
+
region: "local",
|
41
|
+
access_key_id: "minioadmin",
|
42
|
+
secret_access_key: "minioadmin",
|
43
|
+
endpoint: "http://localhost:9000"
|
44
|
+
)
|
45
|
+
|
46
|
+
assert_raises Aws::S3::Errors::NoSuchBucket do
|
47
|
+
Instana::Tracer.start_or_continue_trace(:s3_test, {}) do
|
48
|
+
dynamo.get_object(
|
49
|
+
bucket: 'sample_bucket',
|
50
|
+
key: 'sample_key'
|
51
|
+
)
|
52
|
+
end
|
53
|
+
end
|
54
|
+
|
55
|
+
spans = ::Instana.processor.queued_spans
|
56
|
+
s3_span, entry_span, *rest = spans
|
57
|
+
|
58
|
+
assert rest.empty?
|
59
|
+
assert_equal entry_span[:s], s3_span[:p]
|
60
|
+
assert_equal :s3, s3_span[:n]
|
61
|
+
assert_equal 'get', s3_span[:data][:s3][:op]
|
62
|
+
assert_equal 'sample_bucket', s3_span[:data][:s3][:bucket]
|
63
|
+
assert_equal 'sample_key', s3_span[:data][:s3][:key]
|
64
|
+
end
|
65
|
+
|
66
|
+
def test_sns_publish
|
67
|
+
sns = Aws::SNS::Client.new(
|
68
|
+
region: "local",
|
69
|
+
access_key_id: "test",
|
70
|
+
secret_access_key: "test",
|
71
|
+
endpoint: "http://localhost:9911"
|
72
|
+
)
|
73
|
+
|
74
|
+
assert_raises Aws::SNS::Errors::NotFound do
|
75
|
+
Instana::Tracer.start_or_continue_trace(:sns_test, {}) do
|
76
|
+
sns.publish(
|
77
|
+
topic_arn: 'topic:arn',
|
78
|
+
target_arn: 'target:arn',
|
79
|
+
phone_number: '555-0100',
|
80
|
+
subject: 'Test Subject',
|
81
|
+
message: 'Test Message'
|
82
|
+
)
|
83
|
+
end
|
84
|
+
end
|
85
|
+
|
86
|
+
spans = ::Instana.processor.queued_spans
|
87
|
+
aws_span, entry_span, *rest = spans
|
88
|
+
|
89
|
+
assert rest.empty?
|
90
|
+
assert_equal entry_span[:s], aws_span[:p]
|
91
|
+
assert_equal :sns, aws_span[:n]
|
92
|
+
assert_equal 'topic:arn', aws_span[:data][:sns][:topic]
|
93
|
+
assert_equal 'target:arn', aws_span[:data][:sns][:target]
|
94
|
+
assert_equal '555-0100', aws_span[:data][:sns][:phone]
|
95
|
+
assert_equal 'Test Subject', aws_span[:data][:sns][:subject]
|
96
|
+
end
|
97
|
+
|
98
|
+
def test_sns_other
|
99
|
+
sns = Aws::SNS::Client.new(
|
100
|
+
region: "local",
|
101
|
+
access_key_id: "test",
|
102
|
+
secret_access_key: "test",
|
103
|
+
endpoint: "http://localhost:9911"
|
104
|
+
)
|
105
|
+
|
106
|
+
Instana::Tracer.start_or_continue_trace(:sns_test, {}) do
|
107
|
+
sns.list_subscriptions
|
108
|
+
end
|
109
|
+
|
110
|
+
spans = ::Instana.processor.queued_spans
|
111
|
+
aws_span, entry_span, *rest = spans
|
112
|
+
|
113
|
+
assert rest.empty?
|
114
|
+
assert_equal entry_span[:s], aws_span[:p]
|
115
|
+
assert_equal :"net-http", aws_span[:n]
|
116
|
+
end
|
117
|
+
|
118
|
+
def test_sqs
|
119
|
+
sqs = Aws::SQS::Client.new(
|
120
|
+
region: "local",
|
121
|
+
access_key_id: "test",
|
122
|
+
secret_access_key: "test",
|
123
|
+
endpoint: "http://localhost:9324"
|
124
|
+
)
|
125
|
+
|
126
|
+
create_response = nil
|
127
|
+
get_url_response = nil
|
128
|
+
|
129
|
+
Instana::Tracer.start_or_continue_trace(:sqs_test, {}) do
|
130
|
+
create_response = sqs.create_queue(queue_name: 'test')
|
131
|
+
get_url_response = sqs.get_queue_url(queue_name: 'test')
|
132
|
+
sqs.send_message(queue_url: create_response.queue_url, message_body: 'Sample')
|
133
|
+
end
|
134
|
+
|
135
|
+
received = sqs.receive_message(
|
136
|
+
queue_url: create_response.queue_url,
|
137
|
+
message_attribute_names: ['All']
|
138
|
+
)
|
139
|
+
sqs.delete_queue(queue_url: create_response.queue_url)
|
140
|
+
message = received.messages.first
|
141
|
+
create_span, get_span, send_span, _root = ::Instana.processor.queued_spans
|
142
|
+
|
143
|
+
assert_equal :sqs, create_span[:n]
|
144
|
+
assert_equal create_response.queue_url, create_span[:data][:sqs][:queue]
|
145
|
+
assert_equal 'exit', create_span[:data][:sqs][:sort]
|
146
|
+
assert_equal 'create.queue', create_span[:data][:sqs][:type]
|
147
|
+
|
148
|
+
assert_equal :sqs, get_span[:n]
|
149
|
+
assert_equal get_url_response.queue_url, get_span[:data][:sqs][:queue]
|
150
|
+
assert_equal 'exit', get_span[:data][:sqs][:sort]
|
151
|
+
assert_equal 'get.queue', get_span[:data][:sqs][:type]
|
152
|
+
|
153
|
+
assert_equal :sqs, send_span[:n]
|
154
|
+
assert_equal get_url_response.queue_url, send_span[:data][:sqs][:queue]
|
155
|
+
assert_equal 'exit', send_span[:data][:sqs][:sort]
|
156
|
+
assert_equal 'single.sync', send_span[:data][:sqs][:type]
|
157
|
+
assert_equal send_span[:t], message.message_attributes['X_INSTANA_T'].string_value
|
158
|
+
assert_equal send_span[:s], message.message_attributes['X_INSTANA_S'].string_value
|
159
|
+
assert_equal 'Sample', message.body
|
32
160
|
end
|
33
161
|
end
|
@@ -22,7 +22,7 @@ class ExconTest < Minitest::Test
|
|
22
22
|
url = "http://127.0.0.1:6511"
|
23
23
|
|
24
24
|
connection = Excon.new(url)
|
25
|
-
Instana.tracer.start_or_continue_trace('excon-test') do
|
25
|
+
Instana.tracer.start_or_continue_trace(:'excon-test') do
|
26
26
|
connection.get(:path => '/?basic_get')
|
27
27
|
end
|
28
28
|
|
@@ -40,6 +40,7 @@ class ExconTest < Minitest::Test
|
|
40
40
|
refute_nil excon_span[:data].key?(:http)
|
41
41
|
assert_equal "http://127.0.0.1:6511/", excon_span[:data][:http][:url]
|
42
42
|
assert_equal 200, excon_span[:data][:http][:status]
|
43
|
+
assert_equal 'basic_get', excon_span[:data][:http][:params]
|
43
44
|
|
44
45
|
# excon backtrace not included by default check
|
45
46
|
assert !excon_span.key?(:stack)
|
@@ -146,4 +147,18 @@ class ExconTest < Minitest::Test
|
|
146
147
|
assert_equal :sdk, grandparent_span[:n]
|
147
148
|
end
|
148
149
|
end
|
150
|
+
|
151
|
+
def test_basic_get_no_tracing
|
152
|
+
clear_all!
|
153
|
+
|
154
|
+
# A slight hack but webmock chokes with pipelined requests.
|
155
|
+
# Delete their excon middleware
|
156
|
+
Excon.defaults[:middlewares].delete ::WebMock::HttpLibAdapters::ExconAdapter
|
157
|
+
Excon.defaults[:middlewares].delete ::Excon::Middleware::Mock
|
158
|
+
|
159
|
+
url = "http://127.0.0.1:6511"
|
160
|
+
|
161
|
+
connection = Excon.new(url)
|
162
|
+
connection.get(:path => '/?basic_get')
|
163
|
+
end
|
149
164
|
end
|
@@ -11,6 +11,24 @@ class NetHTTPTest < Minitest::Test
|
|
11
11
|
assert_equal true, ::Instana.config[:nethttp][:enabled]
|
12
12
|
end
|
13
13
|
|
14
|
+
def test_get_with_query
|
15
|
+
clear_all!
|
16
|
+
WebMock.allow_net_connect!
|
17
|
+
|
18
|
+
Instana.tracer.start_or_continue_trace(:"net-http-test") do
|
19
|
+
Net::HTTP.get(URI('http://127.0.0.1:6511/?query_value=true'))
|
20
|
+
end
|
21
|
+
|
22
|
+
spans = ::Instana.processor.queued_spans
|
23
|
+
assert_equal 3, spans.length
|
24
|
+
|
25
|
+
http_span = find_first_span_by_name(spans, :'net-http')
|
26
|
+
assert_equal "http://127.0.0.1:6511/", http_span[:data][:http][:url]
|
27
|
+
assert_equal "query_value=true", http_span[:data][:http][:params]
|
28
|
+
|
29
|
+
WebMock.disable_net_connect!
|
30
|
+
end
|
31
|
+
|
14
32
|
def test_block_request
|
15
33
|
clear_all!
|
16
34
|
WebMock.allow_net_connect!
|
@@ -81,12 +81,14 @@ class RackInstrumentedRequestTest < Minitest::Test
|
|
81
81
|
end
|
82
82
|
|
83
83
|
def test_request_tags
|
84
|
-
::Instana.agent.extra_headers
|
84
|
+
::Instana.agent.define_singleton_method(:extra_headers) { %w[X-Capture-This] }
|
85
|
+
|
85
86
|
req = Instana::InstrumentedRequest.new(
|
86
87
|
'HTTP_HOST' => 'example.com',
|
87
88
|
'REQUEST_METHOD' => 'GET',
|
88
89
|
'HTTP_X_CAPTURE_THIS' => 'that',
|
89
|
-
'PATH_INFO' => '/'
|
90
|
+
'PATH_INFO' => '/',
|
91
|
+
'QUERY_STRING' => 'test=true'
|
90
92
|
)
|
91
93
|
|
92
94
|
expected = {
|
@@ -95,11 +97,12 @@ class RackInstrumentedRequestTest < Minitest::Test
|
|
95
97
|
host: 'example.com',
|
96
98
|
header: {
|
97
99
|
"X-Capture-This": 'that'
|
98
|
-
}
|
100
|
+
},
|
101
|
+
params: 'test=true'
|
99
102
|
}
|
100
103
|
|
101
104
|
assert_equal expected, req.request_tags
|
102
|
-
::Instana.agent.extra_headers
|
105
|
+
::Instana.agent.singleton_class.send(:remove_method, :extra_headers)
|
103
106
|
end
|
104
107
|
|
105
108
|
def test_correlation_data_valid
|
@@ -80,9 +80,6 @@ class RackTest < Minitest::Test
|
|
80
80
|
assert_equal 200, rack_span[:data][:http][:status]
|
81
81
|
assert_equal 'example.org', rack_span[:data][:http][:host]
|
82
82
|
assert rack_span.key?(:f)
|
83
|
-
assert rack_span[:f].key?(:e)
|
84
|
-
assert rack_span[:f].key?(:h)
|
85
|
-
assert_equal ::Instana.agent.agent_uuid, rack_span[:f][:h]
|
86
83
|
assert !rack_span.key?(:stack)
|
87
84
|
|
88
85
|
# Restore to default
|
@@ -134,9 +131,6 @@ class RackTest < Minitest::Test
|
|
134
131
|
assert_equal "/mrlobster", rack_span[:data][:http][:url]
|
135
132
|
assert_equal 200, rack_span[:data][:http][:status]
|
136
133
|
assert rack_span.key?(:f)
|
137
|
-
assert rack_span[:f].key?(:e)
|
138
|
-
assert rack_span[:f].key?(:h)
|
139
|
-
assert_equal ::Instana.agent.agent_uuid, rack_span[:f][:h]
|
140
134
|
end
|
141
135
|
|
142
136
|
def test_basic_put
|
@@ -166,9 +160,6 @@ class RackTest < Minitest::Test
|
|
166
160
|
assert_equal "/mrlobster", rack_span[:data][:http][:url]
|
167
161
|
assert_equal 200, rack_span[:data][:http][:status]
|
168
162
|
assert rack_span.key?(:f)
|
169
|
-
assert rack_span[:f].key?(:e)
|
170
|
-
assert rack_span[:f].key?(:h)
|
171
|
-
assert_equal ::Instana.agent.agent_uuid, rack_span[:f][:h]
|
172
163
|
end
|
173
164
|
|
174
165
|
def test_context_continuation
|
@@ -202,9 +193,6 @@ class RackTest < Minitest::Test
|
|
202
193
|
assert_equal "/mrlobster", rack_span[:data][:http][:url]
|
203
194
|
assert_equal 200, rack_span[:data][:http][:status]
|
204
195
|
assert rack_span.key?(:f)
|
205
|
-
assert rack_span[:f].key?(:e)
|
206
|
-
assert rack_span[:f].key?(:h)
|
207
|
-
assert_equal ::Instana.agent.agent_uuid, rack_span[:f][:h]
|
208
196
|
|
209
197
|
# Context validation
|
210
198
|
# The first span should have the passed in trace ID
|
@@ -260,7 +248,7 @@ class RackTest < Minitest::Test
|
|
260
248
|
def test_custom_headers_capture
|
261
249
|
clear_all!
|
262
250
|
::Instana.config[:collect_backtraces] = true
|
263
|
-
::Instana.agent.extra_headers
|
251
|
+
::Instana.agent.define_singleton_method(:extra_headers) { %w(X-Capture-This X-Capture-That) }
|
264
252
|
|
265
253
|
get '/mrlobster', {}, { "HTTP_X_CAPTURE_THIS" => "ThereYouGo" }
|
266
254
|
assert last_response.ok?
|
@@ -280,7 +268,7 @@ class RackTest < Minitest::Test
|
|
280
268
|
|
281
269
|
# Restore to default
|
282
270
|
::Instana.config[:collect_backtraces] = false
|
283
|
-
::Instana.agent.extra_headers
|
271
|
+
::Instana.agent.singleton_class.send(:remove_method, :extra_headers)
|
284
272
|
end
|
285
273
|
|
286
274
|
def test_capture_http_path_template
|
@@ -0,0 +1,47 @@
|
|
1
|
+
# (c) Copyright IBM Corp. 2021
|
2
|
+
# (c) Copyright Instana Inc. 2021
|
3
|
+
|
4
|
+
require 'test_helper'
|
5
|
+
require 'ostruct'
|
6
|
+
|
7
|
+
class ShoryukenTest < Minitest::Test
|
8
|
+
def setup
|
9
|
+
clear_all!
|
10
|
+
@middleware = Instana::Instrumentation::Shoryuken.new
|
11
|
+
end
|
12
|
+
|
13
|
+
def test_start_trace_with_context
|
14
|
+
id = Instana::Util.generate_id
|
15
|
+
message = OpenStruct.new(
|
16
|
+
queue_url: 'http://example.com',
|
17
|
+
message_attributes: {
|
18
|
+
"X_INSTANA_T" => OpenStruct.new(string_value: id),
|
19
|
+
"X_INSTANA_S" => OpenStruct.new(string_value: id),
|
20
|
+
"X_INSTANA_L" => OpenStruct.new(string_value: '1')
|
21
|
+
}
|
22
|
+
)
|
23
|
+
|
24
|
+
@middleware.call(nil, nil, message, nil) {}
|
25
|
+
|
26
|
+
span = ::Instana.processor.queued_spans.first
|
27
|
+
|
28
|
+
assert_equal id, span[:t]
|
29
|
+
assert_equal id, span[:p]
|
30
|
+
assert_equal 'entry', span[:data][:sqs][:sort]
|
31
|
+
assert_equal 'http://example.com', span[:data][:sqs][:queue]
|
32
|
+
end
|
33
|
+
|
34
|
+
def test_start_trace
|
35
|
+
message = OpenStruct.new(
|
36
|
+
queue_url: 'http://example.com'
|
37
|
+
)
|
38
|
+
|
39
|
+
@middleware.call(nil, nil, message, nil) {}
|
40
|
+
|
41
|
+
span = ::Instana.processor.queued_spans.first
|
42
|
+
|
43
|
+
assert_nil span[:p]
|
44
|
+
assert_equal 'entry', span[:data][:sqs][:sort]
|
45
|
+
assert_equal 'http://example.com', span[:data][:sqs][:queue]
|
46
|
+
end
|
47
|
+
end
|
data/test/secrets_test.rb
CHANGED
@@ -5,72 +5,91 @@ require 'test_helper'
|
|
5
5
|
|
6
6
|
class SecretsTest < Minitest::Test
|
7
7
|
def setup
|
8
|
-
@subject = Instana::Secrets.new
|
8
|
+
@subject = Instana::Secrets.new(logger: Logger.new('/dev/null'))
|
9
9
|
end
|
10
|
-
|
10
|
+
|
11
11
|
def test_equals_ignore_case
|
12
12
|
sample_config = {
|
13
|
-
"matcher"=>"equals-ignore-case",
|
13
|
+
"matcher"=>"equals-ignore-case",
|
14
14
|
"list"=>["key"]
|
15
15
|
}
|
16
|
-
|
16
|
+
|
17
17
|
url = url_for(%w(key Str kEy KEY))
|
18
18
|
assert_redacted @subject.remove_from_query(url, sample_config), %w(key kEy KEY)
|
19
19
|
end
|
20
|
-
|
20
|
+
|
21
21
|
def test_equals
|
22
22
|
sample_config = {
|
23
|
-
"matcher"=>"equals",
|
23
|
+
"matcher"=>"equals",
|
24
24
|
"list"=>["key", "kEy"]
|
25
25
|
}
|
26
|
-
|
26
|
+
|
27
27
|
url = url_for(%w(key Str kEy KEY))
|
28
28
|
assert_redacted @subject.remove_from_query(url, sample_config), %w(key kEy)
|
29
29
|
end
|
30
|
-
|
30
|
+
|
31
31
|
def test_contains_ignore_case
|
32
32
|
sample_config = {
|
33
|
-
"matcher"=>"contains-ignore-case",
|
33
|
+
"matcher"=>"contains-ignore-case",
|
34
34
|
"list"=>["stan"]
|
35
35
|
}
|
36
|
-
|
36
|
+
|
37
37
|
url = url_for(%w(instantiate conTESTant sample))
|
38
38
|
assert_redacted @subject.remove_from_query(url, sample_config), %w(instantiate conTESTant)
|
39
39
|
end
|
40
|
-
|
40
|
+
|
41
41
|
def test_contains
|
42
42
|
sample_config = {
|
43
|
-
"matcher"=>"contains",
|
43
|
+
"matcher"=>"contains",
|
44
44
|
"list"=>["stan"]
|
45
45
|
}
|
46
|
-
|
46
|
+
|
47
47
|
url = url_for(%w(instantiate conTESTant sample))
|
48
48
|
assert_redacted @subject.remove_from_query(url, sample_config), %w(instantiate)
|
49
|
-
|
50
49
|
end
|
51
|
-
|
50
|
+
|
52
51
|
def test_regexp
|
53
52
|
sample_config = {
|
54
|
-
"matcher"=>"regex",
|
53
|
+
"matcher"=>"regex",
|
55
54
|
"list"=>["l{2}"]
|
56
55
|
}
|
57
|
-
|
56
|
+
|
58
57
|
url = url_for(%w(ball foot move))
|
59
|
-
assert_redacted @subject.remove_from_query(url, sample_config), %w(ball)
|
58
|
+
assert_redacted @subject.remove_from_query(url, sample_config), %w(ball)
|
59
|
+
end
|
60
|
+
|
61
|
+
def test_invalid
|
62
|
+
sample_config = {
|
63
|
+
"matcher"=>"test_invalid",
|
64
|
+
"list"=>["key"]
|
65
|
+
}
|
66
|
+
|
67
|
+
url = url_for(%w(key Str kEy KEY))
|
68
|
+
assert_redacted @subject.remove_from_query(url, sample_config), []
|
69
|
+
end
|
70
|
+
|
71
|
+
def test_without_scheme
|
72
|
+
sample_config = {
|
73
|
+
"matcher"=>"contains",
|
74
|
+
"list"=>["stan"]
|
75
|
+
}
|
76
|
+
|
77
|
+
url = 'example.com?instantiate=true'
|
78
|
+
assert_redacted @subject.remove_from_query(url, sample_config), %w(instantiate)
|
60
79
|
end
|
61
|
-
|
80
|
+
|
62
81
|
private
|
63
|
-
|
82
|
+
|
64
83
|
def url_for(keys)
|
65
84
|
url = URI('http://example.com')
|
66
85
|
url.query = URI.encode_www_form(keys.map { |k| [k, rand(1..100)]})
|
67
86
|
url.to_s
|
68
87
|
end
|
69
|
-
|
88
|
+
|
70
89
|
def assert_redacted(str, keys)
|
71
90
|
url = URI(str)
|
72
91
|
params = CGI.parse(url.query)
|
73
|
-
|
92
|
+
|
74
93
|
assert_equal keys, params.select { |_, v| v == %w(<redacted>) }.keys, 'to be redacted'
|
75
94
|
end
|
76
95
|
end
|