instana 1.212.0 → 1.213.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 +2 -2
- data/Gemfile +0 -2
- data/gemfiles/aws_30.gemfile +0 -2
- data/gemfiles/aws_60.gemfile +0 -2
- data/gemfiles/cuba_30.gemfile +0 -2
- data/gemfiles/cuba_40.gemfile +0 -2
- data/gemfiles/dalli_20.gemfile +0 -2
- data/gemfiles/dalli_30.gemfile +0 -2
- data/gemfiles/dalli_32.gemfile +0 -2
- data/gemfiles/excon_02.gemfile +0 -2
- data/gemfiles/excon_021.gemfile +0 -2
- data/gemfiles/excon_079.gemfile +0 -2
- data/gemfiles/excon_100.gemfile +0 -2
- data/gemfiles/graphql_10.gemfile +0 -2
- data/gemfiles/graphql_20.gemfile +0 -2
- data/gemfiles/grpc_10.gemfile +0 -2
- data/gemfiles/mongo_216.gemfile +0 -2
- data/gemfiles/mongo_219.gemfile +0 -2
- data/gemfiles/net_http_01.gemfile +0 -2
- data/gemfiles/rack_16.gemfile +0 -2
- data/gemfiles/rack_20.gemfile +0 -2
- data/gemfiles/rack_30.gemfile +0 -2
- data/gemfiles/rails_42.gemfile +0 -2
- data/gemfiles/rails_50.gemfile +0 -2
- data/gemfiles/rails_52.gemfile +0 -2
- data/gemfiles/rails_60.gemfile +0 -2
- data/gemfiles/rails_61.gemfile +0 -2
- data/gemfiles/rails_70.gemfile +0 -2
- data/gemfiles/rails_71.gemfile +0 -2
- data/gemfiles/redis_40.gemfile +0 -2
- data/gemfiles/resque_122.gemfile +0 -2
- data/gemfiles/resque_20.gemfile +0 -2
- data/gemfiles/rest_client_16.gemfile +0 -2
- data/gemfiles/rest_client_20.gemfile +0 -2
- data/gemfiles/roda_20.gemfile +0 -2
- data/gemfiles/roda_30.gemfile +0 -2
- data/gemfiles/shoryuken_50.gemfile +0 -2
- data/gemfiles/shoryuken_60.gemfile +0 -2
- data/gemfiles/sidekiq_42.gemfile +0 -2
- data/gemfiles/sidekiq_50.gemfile +0 -2
- data/gemfiles/sidekiq_60.gemfile +0 -2
- data/gemfiles/sidekiq_65.gemfile +0 -2
- data/gemfiles/sidekiq_70.gemfile +0 -2
- data/gemfiles/sinatra_14.gemfile +0 -2
- data/gemfiles/sinatra_22.gemfile +0 -2
- data/gemfiles/sinatra_30.gemfile +0 -2
- data/instana.gemspec +2 -2
- data/lib/instana/instrumentation/aws_sdk_lambda.rb +8 -2
- data/lib/instana/instrumentation/excon.rb +1 -1
- data/lib/instana/instrumentation/net-http.rb +1 -1
- data/lib/instana/instrumentation/rack.rb +1 -1
- data/lib/instana/serverless.rb +3 -1
- data/lib/instana/version.rb +1 -1
- data/test/instrumentation/aws_test.rb +44 -0
- metadata +6 -7
- data/gemfiles/coverage_merge.gemfile +0 -9
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: '05836c47722da3d9ac443f6f04dffb36ba2e61d89101292a53190956214069ed'
|
|
4
|
+
data.tar.gz: b609e6a9824dacc3ead219e81af2d5edbcb76ddc497fbecaa54aaef835794305
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a52403d7b5e9fec5e7a5b5aee7c8aa67771f939cd4934e4d0279bc1439b4e6bf6b2fa04a609b1f468e21e92f94d731acf33d66b978a681a246c5f87915b96493
|
|
7
|
+
data.tar.gz: 2c9ebd03347c9fd62daa8582a8d56266c905dc6d8f5c27d5d02711bf2318ac8f70878084f77937fa3cc59c89a3668e6b000400e8c5daddb78e91a460b011b976
|
data/.circleci/config.yml
CHANGED
|
@@ -229,7 +229,7 @@ commands:
|
|
|
229
229
|
bundle config set path './vendor/bundle'
|
|
230
230
|
bundle check || bundle install
|
|
231
231
|
environment:
|
|
232
|
-
BUNDLE_GEMFILE: './
|
|
232
|
+
BUNDLE_GEMFILE: './Gemfile'
|
|
233
233
|
- run:
|
|
234
234
|
name: Fetching partial coverage reports from workflow jobs
|
|
235
235
|
command: |
|
|
@@ -239,7 +239,7 @@ commands:
|
|
|
239
239
|
command: |
|
|
240
240
|
bundle exec rake coverage:merge_reports --trace
|
|
241
241
|
environment:
|
|
242
|
-
BUNDLE_GEMFILE: './
|
|
242
|
+
BUNDLE_GEMFILE: './Gemfile'
|
|
243
243
|
- run:
|
|
244
244
|
name: Run SonarQube to capture coverage
|
|
245
245
|
command: |
|
data/Gemfile
CHANGED
data/gemfiles/aws_30.gemfile
CHANGED
data/gemfiles/aws_60.gemfile
CHANGED
data/gemfiles/cuba_30.gemfile
CHANGED
data/gemfiles/cuba_40.gemfile
CHANGED
data/gemfiles/dalli_20.gemfile
CHANGED
data/gemfiles/dalli_30.gemfile
CHANGED
data/gemfiles/dalli_32.gemfile
CHANGED
data/gemfiles/excon_02.gemfile
CHANGED
data/gemfiles/excon_021.gemfile
CHANGED
data/gemfiles/excon_079.gemfile
CHANGED
data/gemfiles/excon_100.gemfile
CHANGED
data/gemfiles/graphql_10.gemfile
CHANGED
data/gemfiles/graphql_20.gemfile
CHANGED
data/gemfiles/grpc_10.gemfile
CHANGED
data/gemfiles/mongo_216.gemfile
CHANGED
data/gemfiles/mongo_219.gemfile
CHANGED
data/gemfiles/rack_16.gemfile
CHANGED
data/gemfiles/rack_20.gemfile
CHANGED
data/gemfiles/rack_30.gemfile
CHANGED
data/gemfiles/rails_42.gemfile
CHANGED
data/gemfiles/rails_50.gemfile
CHANGED
data/gemfiles/rails_52.gemfile
CHANGED
data/gemfiles/rails_60.gemfile
CHANGED
data/gemfiles/rails_61.gemfile
CHANGED
data/gemfiles/rails_70.gemfile
CHANGED
data/gemfiles/rails_71.gemfile
CHANGED
data/gemfiles/redis_40.gemfile
CHANGED
data/gemfiles/resque_122.gemfile
CHANGED
data/gemfiles/resque_20.gemfile
CHANGED
data/gemfiles/roda_20.gemfile
CHANGED
data/gemfiles/roda_30.gemfile
CHANGED
data/gemfiles/sidekiq_42.gemfile
CHANGED
data/gemfiles/sidekiq_50.gemfile
CHANGED
data/gemfiles/sidekiq_60.gemfile
CHANGED
data/gemfiles/sidekiq_65.gemfile
CHANGED
data/gemfiles/sidekiq_70.gemfile
CHANGED
data/gemfiles/sinatra_14.gemfile
CHANGED
data/gemfiles/sinatra_22.gemfile
CHANGED
data/gemfiles/sinatra_30.gemfile
CHANGED
data/instana.gemspec
CHANGED
|
@@ -35,8 +35,8 @@ Gem::Specification.new do |spec|
|
|
|
35
35
|
spec.platform = defined?(JRUBY_VERSION) ? 'java' : Gem::Platform::RUBY
|
|
36
36
|
|
|
37
37
|
spec.add_development_dependency "bundler", "~> 2.0"
|
|
38
|
-
spec.add_development_dependency "rake", "~>
|
|
39
|
-
spec.add_development_dependency "minitest", "~> 5.
|
|
38
|
+
spec.add_development_dependency "rake", "~> 12.0"
|
|
39
|
+
spec.add_development_dependency "minitest", "~> 5.20"
|
|
40
40
|
spec.add_development_dependency "appraisal"
|
|
41
41
|
spec.add_development_dependency "fakefs"
|
|
42
42
|
|
|
@@ -17,7 +17,7 @@ module Instana
|
|
|
17
17
|
'X-INSTANA-L' => span_context.level.to_s
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
context.params[:client_context] = JSON.dump(payload)
|
|
20
|
+
context.params[:client_context] = Base64.strict_encode64(JSON.dump(payload))
|
|
21
21
|
end
|
|
22
22
|
|
|
23
23
|
tags = {
|
|
@@ -25,7 +25,13 @@ module Instana
|
|
|
25
25
|
type: context.params[:invocation_type]
|
|
26
26
|
}.reject { |_, v| v.nil? }
|
|
27
27
|
|
|
28
|
-
::Instana.tracer.
|
|
28
|
+
::Instana.tracer.start_or_continue_trace(:"aws.lambda.invoke", {aws: {lambda: {invoke: tags}}}) do
|
|
29
|
+
response = @handler.call(context)
|
|
30
|
+
if response.respond_to? :status_code
|
|
31
|
+
::Instana.tracer.log_info(:http => {:status => response.status_code })
|
|
32
|
+
end
|
|
33
|
+
response
|
|
34
|
+
end
|
|
29
35
|
end
|
|
30
36
|
end
|
|
31
37
|
|
|
@@ -51,7 +51,7 @@ module Instana
|
|
|
51
51
|
response = super(*args, &block)
|
|
52
52
|
|
|
53
53
|
kv_payload[:http][:status] = response.code
|
|
54
|
-
if response.code.to_i
|
|
54
|
+
if response.code.to_i >= 500
|
|
55
55
|
# Because of the 5xx response, we flag this span as errored but
|
|
56
56
|
# without a backtrace (no exception)
|
|
57
57
|
::Instana.tracer.log_error(nil)
|
|
@@ -48,7 +48,7 @@ module Instana
|
|
|
48
48
|
# See Rack Spec: https://www.rubydoc.info/github/rack/rack/file/SPEC#label-The+Status
|
|
49
49
|
kvs[:http][:status] = status.to_i
|
|
50
50
|
|
|
51
|
-
if status.to_i
|
|
51
|
+
if status.to_i >= 500
|
|
52
52
|
# Because of the 5xx response, we flag this span as errored but
|
|
53
53
|
# without a backtrace (no exception)
|
|
54
54
|
::Instana.tracer.log_error(nil)
|
data/lib/instana/serverless.rb
CHANGED
|
@@ -8,7 +8,9 @@ require 'zlib'
|
|
|
8
8
|
begin
|
|
9
9
|
require 'instana/instrumentation/instrumented_request'
|
|
10
10
|
rescue LoadError => _e
|
|
11
|
-
Instana.logger.warn("Unable to Instana::InstrumentedRequest.
|
|
11
|
+
Instana.logger.warn("Unable to load Instana::InstrumentedRequest. "\
|
|
12
|
+
"This is normal when the Rack gem is not installed. "\
|
|
13
|
+
"HTTP based triggers won't generate spans.")
|
|
12
14
|
end
|
|
13
15
|
# :nocov:
|
|
14
16
|
|
data/lib/instana/version.rb
CHANGED
|
@@ -193,5 +193,49 @@ class AwsTest < Minitest::Test
|
|
|
193
193
|
assert_equal :"aws.lambda.invoke", lambda_span[:n]
|
|
194
194
|
assert_equal 'Test', lambda_span[:data][:aws][:lambda][:invoke][:function]
|
|
195
195
|
assert_equal 'Event', lambda_span[:data][:aws][:lambda][:invoke][:type]
|
|
196
|
+
assert_equal 200, lambda_span[:data][:http][:status]
|
|
197
|
+
assert_nil lambda_span[:ec]
|
|
198
|
+
assert_nil lambda_span[:stack]
|
|
199
|
+
end
|
|
200
|
+
|
|
201
|
+
def test_lambda_with_500_status
|
|
202
|
+
stub_request(:post, "https://lambda.local.amazonaws.com/2015-03-31/functions/Test/invocations")
|
|
203
|
+
.with(
|
|
204
|
+
body: "data",
|
|
205
|
+
headers: {
|
|
206
|
+
'X-Amz-Client-Context' => /.+/
|
|
207
|
+
}
|
|
208
|
+
)
|
|
209
|
+
.to_return(status: 500, body: '{"message": "Internal Server Error" }', headers: {})
|
|
210
|
+
|
|
211
|
+
lambda = Aws::Lambda::Client.new(
|
|
212
|
+
endpoint: 'https://lambda.local.amazonaws.com',
|
|
213
|
+
region: 'local',
|
|
214
|
+
access_key_id: "test",
|
|
215
|
+
secret_access_key: "test"
|
|
216
|
+
)
|
|
217
|
+
|
|
218
|
+
assert_raises(RuntimeError) do
|
|
219
|
+
Instana::Tracer.start_or_continue_trace(:lambda_test, {}) do
|
|
220
|
+
lambda.invoke(
|
|
221
|
+
function_name: 'Test',
|
|
222
|
+
invocation_type: 'Event',
|
|
223
|
+
payload: 'data'
|
|
224
|
+
)
|
|
225
|
+
end
|
|
226
|
+
end
|
|
227
|
+
|
|
228
|
+
spans = ::Instana.processor.queued_spans
|
|
229
|
+
lambda_span, _entry_span, *rest = spans
|
|
230
|
+
|
|
231
|
+
assert rest.empty?
|
|
232
|
+
|
|
233
|
+
assert_equal :"aws.lambda.invoke", lambda_span[:n]
|
|
234
|
+
assert_equal 'Test', lambda_span[:data][:aws][:lambda][:invoke][:function]
|
|
235
|
+
assert_equal 'Event', lambda_span[:data][:aws][:lambda][:invoke][:type]
|
|
236
|
+
refute_nil lambda_span[:ec]
|
|
237
|
+
assert_equal 1, lambda_span[:ec]
|
|
238
|
+
refute_nil lambda_span[:stack]
|
|
239
|
+
assert_equal 30, lambda_span[:stack].length # default limit is 30 in span.add_stack
|
|
196
240
|
end
|
|
197
241
|
end
|
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.213.0
|
|
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:
|
|
11
|
+
date: 2024-01-12 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|
|
@@ -30,28 +30,28 @@ dependencies:
|
|
|
30
30
|
requirements:
|
|
31
31
|
- - "~>"
|
|
32
32
|
- !ruby/object:Gem::Version
|
|
33
|
-
version: '
|
|
33
|
+
version: '12.0'
|
|
34
34
|
type: :development
|
|
35
35
|
prerelease: false
|
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
|
37
37
|
requirements:
|
|
38
38
|
- - "~>"
|
|
39
39
|
- !ruby/object:Gem::Version
|
|
40
|
-
version: '
|
|
40
|
+
version: '12.0'
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: minitest
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
44
44
|
requirements:
|
|
45
45
|
- - "~>"
|
|
46
46
|
- !ruby/object:Gem::Version
|
|
47
|
-
version: '5.
|
|
47
|
+
version: '5.20'
|
|
48
48
|
type: :development
|
|
49
49
|
prerelease: false
|
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
|
51
51
|
requirements:
|
|
52
52
|
- - "~>"
|
|
53
53
|
- !ruby/object:Gem::Version
|
|
54
|
-
version: '5.
|
|
54
|
+
version: '5.20'
|
|
55
55
|
- !ruby/object:Gem::Dependency
|
|
56
56
|
name: appraisal
|
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -160,7 +160,6 @@ files:
|
|
|
160
160
|
- gemfiles/.bundle/config
|
|
161
161
|
- gemfiles/aws_30.gemfile
|
|
162
162
|
- gemfiles/aws_60.gemfile
|
|
163
|
-
- gemfiles/coverage_merge.gemfile
|
|
164
163
|
- gemfiles/cuba_30.gemfile
|
|
165
164
|
- gemfiles/cuba_40.gemfile
|
|
166
165
|
- gemfiles/dalli_20.gemfile
|