instana 1.205.0 → 1.209.0.pre1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1c3c7c5fc1b71dc144d09c38b3bc7d581aafda4cb2eb8e2cd6ee4e49da8d57e8
4
- data.tar.gz: da8350cc78acff8b7d01856eb1e2e9cf91654fc9fa74622db909fa566ac3de33
3
+ metadata.gz: f5349214699526028c1dcda4a7ff88ee28e65632346bd76334907eb866a5eb28
4
+ data.tar.gz: f8ac6535197f7b4c0a89cc2884e1969b870edc296eeef64d4f0374d6c16b5e75
5
5
  SHA512:
6
- metadata.gz: 2c2a0b858a3d838892d58980dd7b95909e7b7606ea23d64862f771adc3b097a2096787d4173ac1c4f12062dc8029de65247a27081f28d8ece7b70dc5fb360c8a
7
- data.tar.gz: 89d697026a6d1f34192caa240ff2f058b370595e40feb0e00e428ac343c5fb0af6a81a7c9766f67f4bef1cd9b3c3e9f7c18842fdbbfa66adb65aafa9a3fe810e
6
+ metadata.gz: 5a834f90983c2940cb92c89416f413b328c33c3725c5f246b9a517b549c72e25e7b3369120a953750322e9d046246be61deff61ae5475f15351d82395a60853d
7
+ data.tar.gz: a88302d0c05921f95f1f221ca6a23e437d0a4055a194a362eee77f21c2d68ba6d2b750695740f20c2508283786b6ba0fc6d686165fcce7c7eb1060b47fbca34f
data/.circleci/config.yml CHANGED
@@ -15,6 +15,7 @@ executors:
15
15
  command: ["server", "/data"]
16
16
  - image: s12v/sns
17
17
  - image: softwaremill/elasticmq-native
18
+ - image: circleci/mongo:5-focal-ram
18
19
  ruby_26:
19
20
  docker:
20
21
  - image: circleci/ruby:2.6-node
@@ -29,6 +30,7 @@ executors:
29
30
  command: ["server", "/data"]
30
31
  - image: s12v/sns
31
32
  - image: softwaremill/elasticmq-native
33
+ - image: circleci/mongo:5-focal-ram
32
34
  ruby_27:
33
35
  docker:
34
36
  - image: circleci/ruby:2.7-node
@@ -43,6 +45,7 @@ executors:
43
45
  command: ["server", "/data"]
44
46
  - image: s12v/sns
45
47
  - image: softwaremill/elasticmq-native
48
+ - image: circleci/mongo:5-focal-ram
46
49
  ruby_25_mysql2:
47
50
  docker:
48
51
  - image: circleci/ruby:2.5-node
@@ -113,6 +116,11 @@ executors:
113
116
  commands:
114
117
  setup:
115
118
  steps:
119
+ - run:
120
+ name: Install iproute2
121
+ command: |
122
+ sudo apt-get update
123
+ sudo apt-get install iproute2
116
124
  - run:
117
125
  name: Install Java
118
126
  command: |
@@ -137,17 +145,25 @@ commands:
137
145
  - run:
138
146
  name: Install Java
139
147
  command: |
148
+ sudo apt-get update
140
149
  sudo apt-get install openjdk-11-jdk
141
150
  - run:
142
151
  name: Run SonarQube to capture coverage
143
152
  command: |
144
- wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.5.0.2216.zip
153
+ wget -O /tmp/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.6.2.2472.zip
145
154
  unzip -d /tmp /tmp/sonar-scanner-cli.zip
146
- /tmp/sonar-scanner-4.5.0.2216/bin/sonar-scanner \
147
- -Dsonar.projectKey=ruby-sensor \
148
- -Dsonar.sources=. \
149
- -Dsonar.host.url="${SONARQUBE_URL}" \
150
- -Dsonar.login="${SONARQUBE_LOGIN}"
155
+ if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
156
+ /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \
157
+ -Dsonar.host.url="${SONARQUBE_URL}" \
158
+ -Dsonar.login="${SONARQUBE_LOGIN}" \
159
+ -Dsonar.pullrequest.key="${CIRCLE_PR_NUMBER}" \
160
+ -Dsonar.pullrequest.branch="${CIRCLE_BRANCH}"
161
+ else
162
+ /tmp/sonar-scanner-4.6.2.2472/bin/sonar-scanner \
163
+ -Dsonar.host.url="${SONARQUBE_URL}" \
164
+ -Dsonar.login="${SONARQUBE_LOGIN}" \
165
+ -Dsonar.branch.name="${CIRCLE_BRANCH}"
166
+ fi
151
167
  run_tests:
152
168
  steps:
153
169
  - run:
@@ -156,7 +172,7 @@ commands:
156
172
  mkdir _junit
157
173
  bundle exec rake
158
174
  - store_test_results:
159
- path: ~/_junit
175
+ path: ~/project/_junit
160
176
  run_rubocop:
161
177
  steps:
162
178
  - run:
@@ -171,11 +187,11 @@ commands:
171
187
  mkdir -p ~/.gem
172
188
  echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials
173
189
  chmod 0600 /home/circleci/.gem/credentials
174
- - run:
190
+ - run:
175
191
  name: Publish Gem
176
192
  command: |
177
193
  bundle exec rake release[origin]
178
-
194
+
179
195
  jobs:
180
196
  test_core:
181
197
  parameters:
@@ -267,6 +283,7 @@ workflows:
267
283
  - "./gemfiles/sidekiq_50.gemfile"
268
284
  - "./gemfiles/sinatra_14.gemfile"
269
285
  - "./gemfiles/shoryuken_50.gemfile"
286
+ - "./gemfiles/mongo_216.gemfile"
270
287
  rails:
271
288
  jobs:
272
289
  - test_apprisal:
data/Appraisals CHANGED
@@ -13,7 +13,7 @@ appraise 'cuba-30' do
13
13
  gem 'cuba', '>= 3.0', '< 4.0'
14
14
  end
15
15
 
16
- appraise 'dalli-20' do
16
+ appraise 'dalli-20' do
17
17
  gem 'dalli', '>= 2.0', '< 3.0'
18
18
  end
19
19
 
@@ -69,7 +69,7 @@ appraise 'rails-60' do
69
69
  gem 'sqlite3', '~> 1.4'
70
70
  end
71
71
 
72
- appraise 'redis-40' do
72
+ appraise 'redis-40' do
73
73
  gem 'redis', '>= 4.0.0', '< 5.0'
74
74
  end
75
75
 
@@ -87,7 +87,7 @@ appraise 'resque-122' do
87
87
  end
88
88
 
89
89
  appraise 'resque-20' do
90
- gem 'resque', '>= 2.0', '< 3.0'
90
+ gem 'resque', '>= 2.0', '< 3.0'
91
91
  end
92
92
 
93
93
  appraise 'roda-20' do
@@ -118,3 +118,7 @@ end
118
118
  appraise 'sidekiq-50' do
119
119
  gem 'sidekiq', '>= 5.0', '< 6.0'
120
120
  end
121
+
122
+ appraise 'mongo-216' do
123
+ gem 'mongo', '>= 2.16', '< 3'
124
+ end
data/README.md CHANGED
@@ -6,11 +6,8 @@
6
6
 
7
7
  The Instana gem provides Ruby metrics and traces (request, queue & cross-host) for [Instana](https://www.instana.com/).
8
8
 
9
- [![Build Status](https://travis-ci.org/instana/ruby-sensor.svg?branch=master)](https://travis-ci.org/instana/ruby-sensor)
10
- [![Code
11
- Climate](https://codeclimate.com/github/instana/ruby-sensor/badges/gpa.svg)](https://codeclimate.com/github/instana/ruby-sensor)
9
+ [![CircleCI](https://circleci.com/gh/instana/ruby-sensor.svg?style=svg)](https://circleci.com/gh/instana/ruby-sensor)
12
10
  [![Gem Version](https://badge.fury.io/rb/instana.svg)](https://badge.fury.io/rb/instana)
13
- [![OpenTracing Badge](https://img.shields.io/badge/OpenTracing-enabled-blue.svg)](http://opentracing.io)
14
11
 
15
12
  ## Note
16
13
 
@@ -78,4 +75,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/instan
78
75
  ## More
79
76
 
80
77
  Want to instrument other languages? See our [Node.js](https://github.com/instana/nodejs), [Go](https://github.com/instana/golang-sensor), [Python](https://github.com/instana/python-sensor) repositories or [many other supported technologies](https://www.instana.com/supported-technologies/).
81
-
@@ -0,0 +1,18 @@
1
+ # This file was generated by Appraisal
2
+
3
+ # (c) Copyright IBM Corp. 2021
4
+ # (c) Copyright Instana Inc. 2021
5
+
6
+ source "https://rubygems.org"
7
+
8
+ gem "rake"
9
+ gem "minitest", "5.9.1"
10
+ gem "minitest-reporters"
11
+ gem "webmock"
12
+ gem "puma"
13
+ gem "rubocop", "~> 1.9"
14
+ gem "rack-test"
15
+ gem "simplecov", "~> 0.21.2"
16
+ gem "mongo", ">= 2.16", "< 3"
17
+
18
+ gemspec path: "../"
@@ -0,0 +1,23 @@
1
+ # (c) Copyright IBM Corp. 2021
2
+ # (c) Copyright Instana Inc. 2021
3
+
4
+ module Instana
5
+ module Activators
6
+ class Mongo < Activator
7
+ def can_instrument?
8
+ defined?(::Mongo::Client) && defined?(::Mongo::Monitoring::Global)
9
+ end
10
+
11
+ def instrument
12
+ require 'instana/instrumentation/mongo'
13
+
14
+ ::Mongo::Monitoring::Global.subscribe(
15
+ ::Mongo::Monitoring::COMMAND,
16
+ ::Instana::Mongo.new
17
+ )
18
+
19
+ true
20
+ end
21
+ end
22
+ end
23
+ end
@@ -102,17 +102,27 @@ module Instana
102
102
  end
103
103
 
104
104
  def metrics_payload(discovery)
105
- proc_table = Sys::ProcTable.ps(pid: Process.pid)
106
- process = ProcessInfo.new(proc_table)
107
-
108
- {
105
+ payload = {
109
106
  pid: discovery['pid'],
110
- name: Util.get_app_name,
111
- exec_args: process.arguments,
112
- gc: GCSnapshot.instance.report,
113
- thread: {count: ::Thread.list.count},
114
- memory: {rss_size: proc_table.rss / 1024} # Bytes to Kilobytes
107
+ name: Util.get_app_name
115
108
  }
109
+
110
+ if ::Instana.config[:metrics][:memory][:enabled]
111
+ proc_table = Sys::ProcTable.ps(pid: Process.pid)
112
+ process = ProcessInfo.new(proc_table)
113
+ payload[:exec_args] = process.arguments
114
+ payload[:memory] = {rss_size: process.memory_used}
115
+ end
116
+
117
+ if ::Instana.config[:metrics][:gc][:enabled]
118
+ payload[:gc] = GCSnapshot.instance.report
119
+ end
120
+
121
+ if ::Instana.config[:metrics][:thread][:enabled]
122
+ payload[:thread] = {count: ::Thread.list.count}
123
+ end
124
+
125
+ payload
116
126
  end
117
127
  end
118
128
  end
@@ -47,6 +47,14 @@ module Instana
47
47
  File.read(path).match(/\d+/).to_s.to_i
48
48
  end
49
49
 
50
+ def memory_used
51
+ if RbConfig::CONFIG['host_os'].include?('darwin')
52
+ rss / 1024
53
+ else
54
+ rss * 4096
55
+ end
56
+ end
57
+
50
58
  private
51
59
 
52
60
  def clean_arguments(arguments)
@@ -130,6 +130,7 @@ module Instana
130
130
  return {} unless @env.has_key?('HTTP_TRACEPARENT')
131
131
  matches = @env['HTTP_TRACEPARENT'].match(W3_TRACE_PARENT_FORMAT)
132
132
  return {} unless matches
133
+ return {} if matches_is_invalid(matches)
133
134
 
134
135
  trace_id = ::Instana::Util.header_to_id(matches['trace'][16..-1]) # rubocop:disable Style/SlicingWithRange, Lint/RedundantCopDisableDirective
135
136
  span_id = ::Instana::Util.header_to_id(matches['parent'])
@@ -143,6 +144,10 @@ module Instana
143
144
  }
144
145
  end
145
146
 
147
+ def matches_is_invalid(matches)
148
+ matches['trace'].match(/\A0+\z/) || matches['parent'].match(/\A0+\z/)
149
+ end
150
+
146
151
  def context_from_trace_state
147
152
  state = parse_trace_state
148
153
 
@@ -0,0 +1,46 @@
1
+ # (c) Copyright IBM Corp. 2021
2
+ # (c) Copyright Instana Inc. 2021
3
+
4
+ module Instana
5
+ class Mongo
6
+ REMOVED_COMMAND_ELEMENTS = %w[lsid $db documents].freeze
7
+
8
+ def initialize
9
+ @requests = {}
10
+ end
11
+
12
+ def started(event)
13
+ tags = {
14
+ namespace: event.database_name,
15
+ command: event.command_name,
16
+ peer: {
17
+ hostname: event.address.host,
18
+ port: event.address.port
19
+ },
20
+ json: filter_statement(event.command)
21
+ }
22
+
23
+ @requests[event.request_id] = ::Instana.tracer.log_async_entry(:mongo, {mongo: tags})
24
+ end
25
+
26
+ def failed(event)
27
+ span = @requests.delete(event.request_id)
28
+ span.add_error(Exception.new(event.message))
29
+
30
+ ::Instana.tracer.log_async_exit(:mongo, {}, span)
31
+ end
32
+
33
+ def succeeded(event)
34
+ span = @requests.delete(event.request_id)
35
+ ::Instana.tracer.log_async_exit(:mongo, {}, span)
36
+ end
37
+
38
+ private
39
+
40
+ def filter_statement(command)
41
+ command.delete_if { |k, _| REMOVED_COMMAND_ELEMENTS.include?(k) }
42
+
43
+ JSON.dump(command)
44
+ end
45
+ end
46
+ end
@@ -7,12 +7,12 @@ module Instana
7
7
  :memcache, :'net-http', :rack, :render, :'rpc-client',
8
8
  :'rpc-server', :'sidekiq-client', :'sidekiq-worker',
9
9
  :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb, :s3, :sns, :sqs, :'aws.lambda.entry', :activejob, :log, :"mail.actionmailer",
10
- :"aws.lambda.invoke" ].freeze
10
+ :"aws.lambda.invoke", :mongo ].freeze
11
11
  ENTRY_SPANS = [ :rack, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server', :sqs,
12
12
  :'aws.lambda.entry' ].freeze
13
13
  EXIT_SPANS = [ :activerecord, :excon, :'net-http', :'resque-client',
14
14
  :'rpc-client', :'sidekiq-client', :redis, :dynamodb, :s3, :sns, :sqs, :log, :"mail.actionmailer",
15
- :"aws.lambda.invoke" ].freeze
15
+ :"aws.lambda.invoke", :mongo ].freeze
16
16
  HTTP_SPANS = [ :rack, :excon, :'net-http' ].freeze
17
17
 
18
18
  attr_accessor :parent
@@ -120,7 +120,7 @@ module Instana
120
120
  elsif @data[:n] == :activerecord
121
121
  @data[:data][:activerecord][:error] = e.message
122
122
  else
123
- log(:error, Time.now, { :message => e.message, :parameters => e.class.to_s })
123
+ log(:error, Time.now, message: e.message, parameters: e.class.to_s)
124
124
  end
125
125
  e.instance_variable_set(:@instana_logged, true)
126
126
  end
@@ -47,7 +47,7 @@ module Instana
47
47
  state.unshift("in=#{trace_id_header};#{span_id_header}")
48
48
  end
49
49
 
50
- state.reject { |v| v.nil? }.join(',')
50
+ state.take(32).reject { |v| v.nil? }.join(',')
51
51
  end
52
52
 
53
53
  def to_hash
@@ -2,6 +2,6 @@
2
2
  # (c) Copyright Instana Inc. 2016
3
3
 
4
4
  module Instana
5
- VERSION = "1.205.0"
5
+ VERSION = "1.209.0.pre1"
6
6
  VERSION_FULL = "instana-#{VERSION}"
7
7
  end
data/lib/instana.rb CHANGED
@@ -12,5 +12,9 @@ require 'instana/setup'
12
12
  # the thread of your choice.
13
13
  #
14
14
 
15
- ::Instana::Activator.start
16
- ::Instana.agent.spawn_background_thread
15
+ # :nocov:
16
+ unless ENV.fetch('INSTANA_DISABLE', false)
17
+ ::Instana::Activator.start
18
+ ::Instana.agent.spawn_background_thread
19
+ end
20
+ # :nocov:
@@ -0,0 +1,9 @@
1
+ sonar.projectKey=ruby-sensor
2
+ sonar.sources=lib
3
+ sonar.tests=test
4
+ sonar.exclusions=_junit/*
5
+ sonar.ruby.coverage.reportPaths=coverage/coverage.json
6
+ sonar.links.homepage=https://github.com/instana/ruby-sensor/
7
+ sonar.links.ci=https://circleci.com/gh/instana/ruby-sensor
8
+ sonar.links.issue=https://github.com/instana/ruby-sensor/issues
9
+ sonar.links.scm=https://github.com/instana/ruby-sensor/
@@ -127,6 +127,75 @@ class HostAgentReportingObserverTest < Minitest::Test
127
127
  ::Instana.config[:metrics][:enabled] = true
128
128
  end
129
129
 
130
+ def test_disable_metrics_memory
131
+ ::Instana.config[:metrics][:memory][:enabled] = false
132
+
133
+ stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
134
+ .to_return(status: 200)
135
+
136
+ stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
137
+ .with(body: ->(data) { (JSON.parse(data).keys & ['exec_args', 'memory']).length.eql?(0) })
138
+ .to_return(status: 200)
139
+
140
+ stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby/traces.0")
141
+ .to_return(status: 200)
142
+
143
+ client = Instana::Backend::RequestClient.new('10.10.10.10', 9292)
144
+ discovery = Concurrent::Atom.new({'pid' => 0})
145
+
146
+ subject = Instana::Backend::HostAgentReportingObserver.new(client, discovery, timer_class: MockTimer)
147
+
148
+ subject.report_timer.block.call
149
+ ensure
150
+ ::Instana.config[:metrics][:memory][:enabled] = true
151
+ end
152
+
153
+ def test_disable_gc
154
+ ::Instana.config[:metrics][:gc][:enabled] = false
155
+
156
+ stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
157
+ .to_return(status: 200)
158
+
159
+ stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
160
+ .with(body: ->(data) { (JSON.parse(data).keys & ['gc']).length.eql?(0) })
161
+ .to_return(status: 200)
162
+
163
+ stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby/traces.0")
164
+ .to_return(status: 200)
165
+
166
+ client = Instana::Backend::RequestClient.new('10.10.10.10', 9292)
167
+ discovery = Concurrent::Atom.new({'pid' => 0})
168
+
169
+ subject = Instana::Backend::HostAgentReportingObserver.new(client, discovery, timer_class: MockTimer)
170
+
171
+ subject.report_timer.block.call
172
+ ensure
173
+ ::Instana.config[:metrics][:gc][:enabled] = true
174
+ end
175
+
176
+ def test_disable_thread
177
+ ::Instana.config[:metrics][:thread][:enabled] = false
178
+
179
+ stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
180
+ .to_return(status: 200)
181
+
182
+ stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
183
+ .with(body: ->(data) { (JSON.parse(data).keys & ['thread']).length.eql?(0) })
184
+ .to_return(status: 200)
185
+
186
+ stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby/traces.0")
187
+ .to_return(status: 200)
188
+
189
+ client = Instana::Backend::RequestClient.new('10.10.10.10', 9292)
190
+ discovery = Concurrent::Atom.new({'pid' => 0})
191
+
192
+ subject = Instana::Backend::HostAgentReportingObserver.new(client, discovery, timer_class: MockTimer)
193
+
194
+ subject.report_timer.block.call
195
+ ensure
196
+ ::Instana.config[:metrics][:thread][:enabled] = true
197
+ end
198
+
130
199
  def test_disable_tracing
131
200
  ::Instana.config[:tracing][:enabled] = false
132
201
 
@@ -60,4 +60,24 @@ class ProcessInfoTest < Minitest::Test
60
60
  assert_equal subject.sched_pid, subject.parent_pid
61
61
  end
62
62
  end
63
+
64
+ def test_osx_memory_used
65
+ host_os = RbConfig::CONFIG['host_os']
66
+ RbConfig::CONFIG['host_os'] = 'darwin'
67
+
68
+ subject = Instana::Backend::ProcessInfo.new(OpenStruct.new(rss: 1024))
69
+ assert_equal 1, subject.memory_used
70
+ ensure
71
+ RbConfig::CONFIG['host_os'] = host_os
72
+ end
73
+
74
+ def test_linux_memory_used
75
+ host_os = RbConfig::CONFIG['host_os']
76
+ RbConfig::CONFIG['host_os'] = 'linux'
77
+
78
+ subject = Instana::Backend::ProcessInfo.new(OpenStruct.new(rss: 1))
79
+ assert_equal 4096, subject.memory_used
80
+ ensure
81
+ RbConfig::CONFIG['host_os'] = host_os
82
+ end
63
83
  end
@@ -0,0 +1,37 @@
1
+ # (c) Copyright IBM Corp. 2021
2
+ # (c) Copyright Instana Inc. 2021
3
+
4
+ require 'test_helper'
5
+
6
+ class MongoTest < Minitest::Test
7
+ def setup
8
+ clear_all!
9
+ end
10
+
11
+ def test_mongo
12
+ Instana.tracer.start_or_continue_trace(:'mongo-test') do
13
+ client = Mongo::Client.new('mongodb://127.0.0.1:27017/instana')
14
+ client[:people].delete_many({ name: /$S*/ })
15
+ client[:people].insert_many([{ _id: 1, name: "Stan" }])
16
+ end
17
+
18
+ spans = ::Instana.processor.queued_spans
19
+ delete_span, insert_span, = spans
20
+
21
+ delete_data = delete_span[:data][:mongo]
22
+ insert_data = insert_span[:data][:mongo]
23
+
24
+ assert_equal delete_span[:n], :mongo
25
+ assert_equal insert_span[:n], :mongo
26
+
27
+ assert_equal delete_data[:namespace], "instana"
28
+ assert_equal delete_data[:command], "delete"
29
+ assert_equal delete_data[:peer], {hostname: "127.0.0.1", port: 27017}
30
+ assert delete_data[:json].include?("delete")
31
+
32
+ assert_equal insert_data[:namespace], "instana"
33
+ assert_equal insert_data[:command], "insert"
34
+ assert_equal insert_data[:peer], {hostname: "127.0.0.1", port: 27017}
35
+ assert insert_data[:json].include?("insert")
36
+ end
37
+ end
@@ -56,6 +56,20 @@ class RackInstrumentedRequestTest < Minitest::Test
56
56
  assert req.continuing_from_trace_parent?
57
57
  end
58
58
 
59
+ def test_incoming_w3_content_invalid_id
60
+ req = Instana::InstrumentedRequest.new(
61
+ 'HTTP_X_INSTANA_L' => '1',
62
+ 'HTTP_TRACEPARENT' => '00-00000000000000000000000000000000-0000000000000000-01'
63
+ )
64
+
65
+ expected = {
66
+ level: '1'
67
+ }
68
+
69
+ assert_equal expected, req.incoming_context
70
+ refute req.continuing_from_trace_parent?
71
+ end
72
+
59
73
  def test_incoming_invalid_w3_content
60
74
  req = Instana::InstrumentedRequest.new(
61
75
  'HTTP_X_INSTANA_L' => '1',
@@ -10,8 +10,6 @@ class ErrorJob
10
10
  def self.perform
11
11
  if ENV.key?('REDIS_URL')
12
12
  redis = Redis.new(:url => ENV['REDIS_URL'])
13
- elsif ENV.key?('REDIS_URL')
14
- redis = Redis.new(:url => ENV['REDIS_URL'])
15
13
  else
16
14
  redis = Redis.new(:url => 'localhost:6379')
17
15
  end
@@ -20,6 +18,5 @@ class ErrorJob
20
18
  redis.set('ts', dt)
21
19
 
22
20
  raise Exception.new("Silly Rabbit, Trix are for kids.")
23
- redis.set(:nb_id, 2)
24
21
  end
25
22
  end
@@ -12,8 +12,6 @@ class FastJob
12
12
 
13
13
  if ENV.key?('REDIS_URL')
14
14
  redis = Redis.new(:url => ENV['REDIS_URL'])
15
- elsif ENV.key?('REDIS_URL')
16
- redis = Redis.new(:url => ENV['REDIS_URL'])
17
15
  else
18
16
  redis = Redis.new(:url => 'redis://localhost:6379')
19
17
  end
@@ -111,7 +111,6 @@ class CustomTracingTest < Minitest::Test
111
111
 
112
112
  ::Instana.tracer.log_entry(:custom_span, kvs)
113
113
  raise "custom tracing error. This is only a test"
114
- ::Instana.tracer.log_info({:on_info_kv => 1})
115
114
  rescue => e
116
115
  ::Instana.tracer.log_error(e)
117
116
  ensure
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.205.0
4
+ version: 1.209.0.pre1
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-07-13 00:00:00.000000000 Z
11
+ date: 2021-12-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -160,6 +160,7 @@ files:
160
160
  - gemfiles/excon_079.gemfile
161
161
  - gemfiles/graphql_10.gemfile
162
162
  - gemfiles/grpc_10.gemfile
163
+ - gemfiles/mongo_216.gemfile
163
164
  - gemfiles/net_http_01.gemfile
164
165
  - gemfiles/rack_16.gemfile
165
166
  - gemfiles/rack_20.gemfile
@@ -199,6 +200,7 @@ files:
199
200
  - lib/instana/activators/graphql.rb
200
201
  - lib/instana/activators/grpc_client.rb
201
202
  - lib/instana/activators/grpc_server.rb
203
+ - lib/instana/activators/mongo.rb
202
204
  - lib/instana/activators/net_http.rb
203
205
  - lib/instana/activators/rack.rb
204
206
  - lib/instana/activators/rails.rb
@@ -242,6 +244,7 @@ files:
242
244
  - lib/instana/instrumentation/graphql.rb
243
245
  - lib/instana/instrumentation/grpc.rb
244
246
  - lib/instana/instrumentation/instrumented_request.rb
247
+ - lib/instana/instrumentation/mongo.rb
245
248
  - lib/instana/instrumentation/net-http.rb
246
249
  - lib/instana/instrumentation/rack.rb
247
250
  - lib/instana/instrumentation/redis.rb
@@ -275,6 +278,7 @@ files:
275
278
  - lib/instana/version.rb
276
279
  - lib/opentracing.rb
277
280
  - log/.keep
281
+ - sonar-project.properties
278
282
  - test/activator_test.rb
279
283
  - test/backend/agent_test.rb
280
284
  - test/backend/gc_snapshot_test.rb
@@ -297,6 +301,7 @@ files:
297
301
  - test/instrumentation/excon_test.rb
298
302
  - test/instrumentation/graphql_test.rb
299
303
  - test/instrumentation/grpc_test.rb
304
+ - test/instrumentation/mongo_test.rb
300
305
  - test/instrumentation/net_http_test.rb
301
306
  - test/instrumentation/rack_instrumented_request_test.rb
302
307
  - test/instrumentation/rack_test.rb
@@ -370,9 +375,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
370
375
  version: '2.1'
371
376
  required_rubygems_version: !ruby/object:Gem::Requirement
372
377
  requirements:
373
- - - ">="
378
+ - - ">"
374
379
  - !ruby/object:Gem::Version
375
- version: '0'
380
+ version: 1.3.1
376
381
  requirements: []
377
382
  rubygems_version: 3.1.6
378
383
  signing_key:
@@ -401,6 +406,7 @@ test_files:
401
406
  - test/instrumentation/excon_test.rb
402
407
  - test/instrumentation/graphql_test.rb
403
408
  - test/instrumentation/grpc_test.rb
409
+ - test/instrumentation/mongo_test.rb
404
410
  - test/instrumentation/net_http_test.rb
405
411
  - test/instrumentation/rack_instrumented_request_test.rb
406
412
  - test/instrumentation/rack_test.rb