instana 1.214.0 → 1.214.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (70) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +10 -2
  3. data/.tekton/github-interceptor-secret.yaml +8 -0
  4. data/.tekton/github-pr-eventlistener.yaml +102 -0
  5. data/.tekton/github-pr-pipeline.yaml.part +38 -0
  6. data/.tekton/github-set-status-task.yaml +43 -0
  7. data/.tekton/github-webhook-ingress.yaml +20 -0
  8. data/.tekton/pipeline.yaml +381 -0
  9. data/.tekton/pipelinerun.yaml +19 -0
  10. data/.tekton/run_unittests.sh +66 -0
  11. data/.tekton/scheduled-eventlistener.yaml +108 -0
  12. data/.tekton/task.yaml +316 -0
  13. data/.tekton/tekton-triggers-eventlistener-serviceaccount.yaml +29 -0
  14. data/Gemfile +0 -2
  15. data/gemfiles/aws_30.gemfile +1 -1
  16. data/gemfiles/aws_60.gemfile +0 -1
  17. data/gemfiles/cuba_30.gemfile +0 -1
  18. data/gemfiles/cuba_40.gemfile +0 -1
  19. data/gemfiles/dalli_20.gemfile +0 -1
  20. data/gemfiles/dalli_30.gemfile +0 -1
  21. data/gemfiles/dalli_32.gemfile +0 -1
  22. data/gemfiles/excon_02.gemfile +0 -1
  23. data/gemfiles/excon_021.gemfile +0 -1
  24. data/gemfiles/excon_079.gemfile +0 -1
  25. data/gemfiles/excon_100.gemfile +0 -1
  26. data/gemfiles/graphql_10.gemfile +1 -1
  27. data/gemfiles/graphql_20.gemfile +0 -1
  28. data/gemfiles/grpc_10.gemfile +0 -1
  29. data/gemfiles/mongo_216.gemfile +0 -1
  30. data/gemfiles/mongo_219.gemfile +0 -1
  31. data/gemfiles/net_http_01.gemfile +0 -1
  32. data/gemfiles/rack_16.gemfile +15 -0
  33. data/gemfiles/rack_20.gemfile +0 -1
  34. data/gemfiles/rack_30.gemfile +0 -1
  35. data/gemfiles/rails_42.gemfile +0 -1
  36. data/gemfiles/rails_50.gemfile +0 -1
  37. data/gemfiles/rails_52.gemfile +0 -1
  38. data/gemfiles/rails_60.gemfile +0 -1
  39. data/gemfiles/rails_61.gemfile +0 -1
  40. data/gemfiles/rails_70.gemfile +1 -2
  41. data/gemfiles/rails_71.gemfile +0 -1
  42. data/gemfiles/redis_40.gemfile +0 -1
  43. data/gemfiles/redis_50.gemfile +1 -2
  44. data/gemfiles/redis_51.gemfile +13 -0
  45. data/gemfiles/resque_122.gemfile +0 -1
  46. data/gemfiles/resque_1274_3scale.gemfile +17 -0
  47. data/gemfiles/resque_20.gemfile +0 -1
  48. data/gemfiles/rest_client_16.gemfile +17 -0
  49. data/gemfiles/rest_client_20.gemfile +0 -1
  50. data/gemfiles/roda_20.gemfile +0 -1
  51. data/gemfiles/roda_30.gemfile +0 -1
  52. data/gemfiles/rubocop_162.gemfile +6 -0
  53. data/gemfiles/shoryuken_50.gemfile +0 -1
  54. data/gemfiles/shoryuken_60.gemfile +0 -1
  55. data/gemfiles/sidekiq_42.gemfile +15 -0
  56. data/gemfiles/sidekiq_50.gemfile +15 -0
  57. data/gemfiles/sidekiq_60.gemfile +0 -1
  58. data/gemfiles/sidekiq_65.gemfile +0 -1
  59. data/gemfiles/sidekiq_70.gemfile +0 -1
  60. data/gemfiles/sinatra_14.gemfile +15 -0
  61. data/gemfiles/sinatra_22.gemfile +0 -1
  62. data/gemfiles/sinatra_30.gemfile +0 -1
  63. data/gemfiles/sinatra_40.gemfile +0 -1
  64. data/lib/instana/frameworks/rails.rb +22 -0
  65. data/lib/instana/instrumentation/redis.rb +17 -21
  66. data/lib/instana/version.rb +1 -1
  67. data/test/instrumentation/dalli_test.rb +7 -7
  68. data/test/support/apps/resque/jobs/resque_error_job.rb +1 -1
  69. data/test/test_helper.rb +12 -10
  70. metadata +21 -2
@@ -0,0 +1,15 @@
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 "minitest-reporters"
9
+ gem "webmock"
10
+ gem "puma"
11
+ gem "rack-test"
12
+ gem "simplecov", "~> 0.21.2"
13
+ gem "rack", "~> 1.6"
14
+
15
+ gemspec path: "../"
@@ -8,7 +8,6 @@ source "https://rubygems.org"
8
8
  gem "minitest-reporters"
9
9
  gem "webmock"
10
10
  gem "puma"
11
- gem "rubocop", "~> 1.9"
12
11
  gem "rack-test"
13
12
  gem "simplecov", "~> 0.21.2"
14
13
  gem "rack", ">= 2.0", "< 3.0"
@@ -5,7 +5,6 @@ source "https://rubygems.org"
5
5
  gem "minitest-reporters"
6
6
  gem "webmock"
7
7
  gem "puma"
8
- gem "rubocop", "~> 1.9"
9
8
  gem "rack-test"
10
9
  gem "simplecov", "~> 0.21.2"
11
10
  gem "rack", ">= 3.0.8"
@@ -8,7 +8,6 @@ source "https://rubygems.org"
8
8
  gem "minitest-reporters"
9
9
  gem "webmock"
10
10
  gem "puma"
11
- gem "rubocop", "~> 1.9"
12
11
  gem "rack-test"
13
12
  gem "simplecov", "~> 0.21.2"
14
13
  gem "rails", ">= 4.2", "< 5.0"
@@ -8,7 +8,6 @@ source "https://rubygems.org"
8
8
  gem "minitest-reporters"
9
9
  gem "webmock"
10
10
  gem "puma"
11
- gem "rubocop", "~> 1.9"
12
11
  gem "rack-test"
13
12
  gem "simplecov", "~> 0.21.2"
14
13
  gem "mail", "< 2.8.0"
@@ -8,7 +8,6 @@ source "https://rubygems.org"
8
8
  gem "minitest-reporters"
9
9
  gem "webmock"
10
10
  gem "puma"
11
- gem "rubocop", "~> 1.9"
12
11
  gem "rack-test"
13
12
  gem "simplecov", "~> 0.21.2"
14
13
  gem "mail", "< 2.8.0"
@@ -8,7 +8,6 @@ source "https://rubygems.org"
8
8
  gem "minitest-reporters"
9
9
  gem "webmock"
10
10
  gem "puma"
11
- gem "rubocop", "~> 1.9"
12
11
  gem "rack-test"
13
12
  gem "simplecov", "~> 0.21.2"
14
13
  gem "mail", "< 2.8.0"
@@ -8,7 +8,6 @@ source "https://rubygems.org"
8
8
  gem "minitest-reporters"
9
9
  gem "webmock"
10
10
  gem "puma"
11
- gem "rubocop", "~> 1.9"
12
11
  gem "rack-test"
13
12
  gem "simplecov", "~> 0.21.2"
14
13
  gem "mail", ">= 2.8.1"
@@ -5,11 +5,10 @@ source "https://rubygems.org"
5
5
  gem "minitest-reporters"
6
6
  gem "webmock"
7
7
  gem "puma"
8
- gem "rubocop", "~> 1.9"
9
8
  gem "rack-test"
10
9
  gem "simplecov", "~> 0.21.2"
11
10
  gem "mail", ">= 2.8.1"
12
- gem "rails", "7.0.8"
11
+ gem "rails", "7.0.3"
13
12
  gem "mysql2", "0.5.5"
14
13
  gem "pg"
15
14
  gem "sqlite3", "~> 1.4"
@@ -5,7 +5,6 @@ source "https://rubygems.org"
5
5
  gem "minitest-reporters"
6
6
  gem "webmock"
7
7
  gem "puma"
8
- gem "rubocop", "~> 1.9"
9
8
  gem "rack-test"
10
9
  gem "simplecov", "~> 0.21.2"
11
10
  gem "mail", ">= 2.8.1"
@@ -8,7 +8,6 @@ source "https://rubygems.org"
8
8
  gem "minitest-reporters"
9
9
  gem "webmock"
10
10
  gem "puma"
11
- gem "rubocop", "~> 1.9"
12
11
  gem "rack-test"
13
12
  gem "simplecov", "~> 0.21.2"
14
13
  gem "redis", ">= 4.0.0", "< 5.0"
@@ -5,10 +5,9 @@ source "https://rubygems.org"
5
5
  gem "minitest-reporters"
6
6
  gem "webmock"
7
7
  gem "puma"
8
- gem "rubocop", "~> 1.9"
9
8
  gem "rack-test"
10
9
  gem "simplecov", "~> 0.21.2"
11
- gem "redis", ">= 5.0.0"
10
+ gem "redis", ">= 5.0.0", "< 5.1.0"
12
11
  gem "debug"
13
12
 
14
13
  gemspec path: "../"
@@ -0,0 +1,13 @@
1
+ # (c) Copyright IBM Corp. 2024
2
+
3
+ source "https://rubygems.org"
4
+
5
+ gem "minitest-reporters"
6
+ gem "webmock"
7
+ gem "puma"
8
+ gem "rack-test"
9
+ gem "simplecov", "~> 0.21.2"
10
+ gem "redis", ">= 5.1.0"
11
+ gem "debug"
12
+
13
+ gemspec path: "../"
@@ -8,7 +8,6 @@ source "https://rubygems.org"
8
8
  gem "minitest-reporters"
9
9
  gem "webmock"
10
10
  gem "puma"
11
- gem "rubocop", "~> 1.9"
12
11
  gem "rack-test"
13
12
  gem "simplecov", "~> 0.21.2"
14
13
  gem "resque", ">= 1.22", "< 2.0"
@@ -0,0 +1,17 @@
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 "debug"
9
+ gem "minitest-reporters"
10
+ gem "webmock"
11
+ gem "puma"
12
+ gem "rack-test"
13
+ gem "simplecov", "~> 0.21.2"
14
+ gem "resque", :git => "https://github.com/3scale/resque.git", :ref => "db327e389cf2fc572a503c47b19871ed899356d1"
15
+ gem "redis", "~> 3.3", ">= 3.3.5"
16
+
17
+ gemspec path: "../"
@@ -9,7 +9,6 @@ gem "redis", "< 5.0.0"
9
9
  gem "minitest-reporters"
10
10
  gem "webmock"
11
11
  gem "puma"
12
- gem "rubocop", "~> 1.9"
13
12
  gem "rack-test"
14
13
  gem "simplecov", "~> 0.21.2"
15
14
  gem "resque", ">= 2.5.0"
@@ -0,0 +1,17 @@
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 "rack"
9
+ gem "rackup"
10
+ gem "minitest-reporters"
11
+ gem "webmock"
12
+ gem "puma"
13
+ gem "rack-test"
14
+ gem "simplecov", "~> 0.21.2"
15
+ gem "rest-client", ">= 1.6", "< 2.0"
16
+
17
+ gemspec path: "../"
@@ -10,7 +10,6 @@ gem "rackup"
10
10
  gem "minitest-reporters"
11
11
  gem "webmock"
12
12
  gem "puma"
13
- gem "rubocop", "~> 1.9"
14
13
  gem "rack-test"
15
14
  gem "simplecov", "~> 0.21.2"
16
15
  gem "rest-client", ">= 2.1.0", "< 3.0"
@@ -9,7 +9,6 @@ gem "rack", "<3.0.0"
9
9
  gem "minitest-reporters"
10
10
  gem "webmock"
11
11
  gem "puma"
12
- gem "rubocop", "~> 1.9"
13
12
  gem "rack-test"
14
13
  gem "simplecov", "~> 0.21.2"
15
14
  gem "roda", ">= 2.0", "< 3.0"
@@ -9,7 +9,6 @@ gem "rack", "<3.0.0"
9
9
  gem "minitest-reporters"
10
10
  gem "webmock"
11
11
  gem "puma"
12
- gem "rubocop", "~> 1.9"
13
12
  gem "rack-test"
14
13
  gem "simplecov", "~> 0.21.2"
15
14
  gem "roda", ">= 3.69.0"
@@ -0,0 +1,6 @@
1
+ # (c) Copyright IBM Corp. 2021
2
+ # (c) Copyright Instana Inc. 2016
3
+
4
+ source 'https://rubygems.org'
5
+
6
+ gem 'rubocop', ">= 1.62.1"
@@ -8,7 +8,6 @@ source "https://rubygems.org"
8
8
  gem "minitest-reporters"
9
9
  gem "webmock"
10
10
  gem "puma"
11
- gem "rubocop", "~> 1.9"
12
11
  gem "rack-test"
13
12
  gem "simplecov", "~> 0.21.2"
14
13
  gem "shoryuken", ">= 5.2", "< 6.0"
@@ -5,7 +5,6 @@ source "https://rubygems.org"
5
5
  gem "minitest-reporters"
6
6
  gem "webmock"
7
7
  gem "puma"
8
- gem "rubocop", "~> 1.9"
9
8
  gem "rack-test"
10
9
  gem "simplecov", "~> 0.21.2"
11
10
  gem "shoryuken", ">= 6.0"
@@ -0,0 +1,15 @@
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 "minitest-reporters"
9
+ gem "webmock"
10
+ gem "puma"
11
+ gem "rack-test"
12
+ gem "simplecov", "~> 0.21.2"
13
+ gem "sidekiq", "~> 4.2.10"
14
+
15
+ gemspec path: "../"
@@ -0,0 +1,15 @@
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 "minitest-reporters"
9
+ gem "webmock"
10
+ gem "puma"
11
+ gem "rack-test"
12
+ gem "simplecov", "~> 0.21.2"
13
+ gem "sidekiq", "< 6.0"
14
+
15
+ gemspec path: "../"
@@ -5,7 +5,6 @@ source "https://rubygems.org"
5
5
  gem "minitest-reporters"
6
6
  gem "webmock"
7
7
  gem "puma"
8
- gem "rubocop", "~> 1.9"
9
8
  gem "rack-test"
10
9
  gem "simplecov", "~> 0.21.2"
11
10
  gem "sidekiq", ">= 6.0.0", "< 6.5.0"
@@ -5,7 +5,6 @@ source "https://rubygems.org"
5
5
  gem "minitest-reporters"
6
6
  gem "webmock"
7
7
  gem "puma"
8
- gem "rubocop", "~> 1.9"
9
8
  gem "rack-test"
10
9
  gem "simplecov", "~> 0.21.2"
11
10
  gem "sidekiq", ">= 6.5.12", "< 7.0.0"
@@ -5,7 +5,6 @@ source "https://rubygems.org"
5
5
  gem "minitest-reporters"
6
6
  gem "webmock"
7
7
  gem "puma"
8
- gem "rubocop", "~> 1.9"
9
8
  gem "rack-test"
10
9
  gem "simplecov", "~> 0.21.2"
11
10
  gem "sidekiq", ">= 7.2.0"
@@ -0,0 +1,15 @@
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 "minitest-reporters"
9
+ gem "webmock"
10
+ gem "puma"
11
+ gem "rack-test"
12
+ gem "simplecov", "~> 0.21.2"
13
+ gem "sinatra", ">= 1.4.8", "< 2.0"
14
+
15
+ gemspec path: "../"
@@ -5,7 +5,6 @@ source "https://rubygems.org"
5
5
  gem "minitest-reporters"
6
6
  gem "webmock"
7
7
  gem "puma"
8
- gem "rubocop", "~> 1.9"
9
8
  gem "rack-test"
10
9
  gem "simplecov", "~> 0.21.2"
11
10
  gem "sinatra", ">= 2.2.4", "< 3.0"
@@ -5,7 +5,6 @@ source "https://rubygems.org"
5
5
  gem "minitest-reporters"
6
6
  gem "webmock"
7
7
  gem "puma"
8
- gem "rubocop", "~> 1.9"
9
8
  gem "rack-test"
10
9
  gem "simplecov", "~> 0.21.2"
11
10
  gem "sinatra", ">= 3.0.6", "< 4.0"
@@ -5,7 +5,6 @@ source "https://rubygems.org"
5
5
  gem "minitest-reporters"
6
6
  gem "webmock"
7
7
  gem "puma"
8
- gem "rubocop", "~> 1.9"
9
8
  gem "rack-test"
10
9
  gem "simplecov", "~> 0.21.2"
11
10
  gem "sinatra", ">= 4.0.0"
@@ -18,6 +18,28 @@ else
18
18
  if ::Instana.config[:logging][:enabled] && !ENV.key?('INSTANA_TEST')
19
19
  logger = ::Instana::InstrumentedLogger.new('/dev/null')
20
20
  if ::Rails::VERSION::STRING < "7.1"
21
+ # Rails 7.0.3 `tagged_logging.rb` has a number of bugs.
22
+ # What pertains to our instrumentation here is that in
23
+ # https://github.com/rails/rails/blob/v7.0.3/activesupport/lib/active_support/tagged_logging.rb#L100
24
+ # sets the `other_logger.formatter` to `formatter` if `other_logger.formatter` is `nil`
25
+ # but then
26
+ # https://github.com/rails/rails/blob/v7.0.3/activesupport/lib/active_support/tagged_logging.rb#L102
27
+ # redefines `formatter.current_tags` method to a proc calling `formatter.current_tags`, itself.
28
+ # which is an infinite recursion.
29
+ #
30
+ # This bug starts with 7.0.3:
31
+ # https://github.com/rails/rails/compare/v7.0.2...v7.0.3#diff-68f90ba4998610be2f7da027e006e8ddeeb06dece66f41579c94070e12f23011
32
+ # And is already reverted/fixed in 7.0.4
33
+ # https://github.com/rails/rails/compare/v7.0.3...v7.0.4#diff-68f90ba4998610be2f7da027e006e8ddeeb06dece66f41579c94070e12f23011
34
+ # The commit which fixes it is:
35
+ # https://github.com/rails/rails/commit/ff277583e22ddfbcfbd2131789a7cb7c2f868d68
36
+ #
37
+ # Since instana does trigger this bug here we workaround it, by defining the `formatter`,
38
+ # to break the infinite loop. The `formatter` used here is the same as the default used in
39
+ # https://github.com/rails/rails/blob/v7.0.3/activesupport/lib/active_support/tagged_logging.rb#L89C9-L89C70
40
+ if ::Rails::VERSION::STRING == "7.0.3"
41
+ logger.formatter = ActiveSupport::Logger::SimpleFormatter.new
42
+ end
21
43
  Rails.logger.extend(ActiveSupport::Logger.broadcast(logger))
22
44
  else
23
45
  Rails.logger.broadcast_to(logger)
@@ -10,30 +10,27 @@ module Instana
10
10
  :multi => ::RedisClient.instance_method(:multi)
11
11
  }.freeze
12
12
 
13
- def call_v(*args, &block)
13
+ def call_v(*args, **kwargs, &block)
14
14
  if skip_instrumentation?
15
- super(*args, &block)
15
+ super(*args, **kwargs, &block)
16
16
  else
17
- call_with_instana(args[0][0].to_s.upcase, ORIGINAL_METHODS[:call_v], *args, &block)
17
+ call_with_instana(args[0][0].to_s.upcase, ORIGINAL_METHODS[:call_v], args, kwargs, &block)
18
18
  end
19
19
  end
20
20
 
21
- def pipelined(*args, &block)
21
+ def pipelined(*args, **kwargs, &block)
22
22
  if skip_instrumentation?
23
- super(*args, &block)
23
+ super(*args, **kwargs, &block)
24
24
  else
25
- call_with_instana('PIPELINE', ORIGINAL_METHODS[:pipelined], *args, &block)
25
+ call_with_instana('PIPELINE', ORIGINAL_METHODS[:pipelined], args, kwargs, &block)
26
26
  end
27
27
  end
28
28
 
29
- # Since, starting with 5.1 redis/client.rb:114:multi takes an unused default argument `watch: nil`
30
- # but calls redis_client.rb:442:multi, which doesn't take any argument,
31
- # here we have to take arguments but we should not use it.
32
- def multi(*_, &block)
29
+ def multi(*args, **kwargs, &block)
33
30
  if skip_instrumentation?
34
- super(&block)
31
+ super(*args, **kwargs, &block)
35
32
  else
36
- call_with_instana('MULTI', ORIGINAL_METHODS[:multi], &block)
33
+ call_with_instana('MULTI', ORIGINAL_METHODS[:multi], args, kwargs, &block)
37
34
  end
38
35
  end
39
36
 
@@ -43,19 +40,19 @@ module Instana
43
40
  :call_pipeline => ::Redis::Client.instance_method(:call_pipeline)
44
41
  }.freeze
45
42
 
46
- def call(*args, &block)
43
+ def call(*args, **kwargs, &block)
47
44
  if skip_instrumentation?
48
- super(*args, &block)
45
+ super(*args, **kwargs, &block)
49
46
  else
50
- call_with_instana(args[0][0].to_s.upcase, ORIGINAL_METHODS[:call], *args, &block)
47
+ call_with_instana(args[0][0].to_s.upcase, ORIGINAL_METHODS[:call], args, kwargs, &block)
51
48
  end
52
49
  end
53
50
 
54
- def call_pipeline(*args, &block)
51
+ def call_pipeline(*args, **kwargs, &block)
55
52
  if skip_instrumentation?
56
- super(*args, &block)
53
+ super(*args, **kwargs, &block)
57
54
  else
58
- call_with_instana(args.first.is_a?(::Redis::Pipeline::Multi) ? 'MULTI' : 'PIPELINE', ORIGINAL_METHODS[:call_pipeline], *args, &block)
55
+ call_with_instana(args.first.is_a?(::Redis::Pipeline::Multi) ? 'MULTI' : 'PIPELINE', ORIGINAL_METHODS[:call_pipeline], args, kwargs, &block)
59
56
  end
60
57
  end
61
58
  end
@@ -65,8 +62,7 @@ module Instana
65
62
  !Instana.tracer.tracing? || dnt_spans.include?(::Instana.tracer.current_span.name) || !Instana.config[:redis][:enabled]
66
63
  end
67
64
 
68
- def call_with_instana(*args, &block)
69
- command, original_super, *original_args = *args
65
+ def call_with_instana(command, original_super, args, kwargs, &block)
70
66
  kv_payload = { redis: {} }
71
67
 
72
68
  begin
@@ -79,7 +75,7 @@ module Instana
79
75
  rescue
80
76
  nil
81
77
  end
82
- original_super.bind(self).call(*original_args, &block)
78
+ original_super.bind(self).call(*args, **kwargs, &block)
83
79
  rescue => e
84
80
  ::Instana.tracer.log_info({ redis: {error: true} })
85
81
  ::Instana.tracer.log_error(e)
@@ -2,6 +2,6 @@
2
2
  # (c) Copyright Instana Inc. 2016
3
3
 
4
4
  module Instana
5
- VERSION = "1.214.0"
5
+ VERSION = "1.214.2"
6
6
  VERSION_FULL = "instana-#{VERSION}"
7
7
  end
@@ -47,7 +47,7 @@ class DalliTest < Minitest::Test
47
47
  assert second_span[:data][:memcache].key?(:namespace)
48
48
  assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
49
49
  assert second_span[:data][:memcache].key?(:server)
50
- assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
50
+ assert_equal @memcached_host, second_span[:data][:memcache][:server]
51
51
  end
52
52
 
53
53
  def test_basic_set
@@ -80,7 +80,7 @@ class DalliTest < Minitest::Test
80
80
  assert second_span[:data][:memcache].key?(:namespace)
81
81
  assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
82
82
  assert second_span[:data][:memcache].key?(:server)
83
- assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
83
+ assert_equal @memcached_host, second_span[:data][:memcache][:server]
84
84
  end
85
85
 
86
86
  def test_replace
@@ -114,7 +114,7 @@ class DalliTest < Minitest::Test
114
114
  assert second_span[:data][:memcache].key?(:namespace)
115
115
  assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
116
116
  assert second_span[:data][:memcache].key?(:server)
117
- assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
117
+ assert_equal @memcached_host, second_span[:data][:memcache][:server]
118
118
  end
119
119
 
120
120
  def test_delete
@@ -148,7 +148,7 @@ class DalliTest < Minitest::Test
148
148
  assert second_span[:data][:memcache].key?(:namespace)
149
149
  assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
150
150
  assert second_span[:data][:memcache].key?(:server)
151
- assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
151
+ assert_equal @memcached_host, second_span[:data][:memcache][:server]
152
152
  end
153
153
 
154
154
  def test_incr
@@ -182,7 +182,7 @@ class DalliTest < Minitest::Test
182
182
  assert second_span[:data][:memcache].key?(:namespace)
183
183
  assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
184
184
  assert second_span[:data][:memcache].key?(:server)
185
- assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
185
+ assert_equal @memcached_host, second_span[:data][:memcache][:server]
186
186
  end
187
187
 
188
188
  def test_decr
@@ -216,7 +216,7 @@ class DalliTest < Minitest::Test
216
216
  assert second_span[:data][:memcache].key?(:namespace)
217
217
  assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
218
218
  assert second_span[:data][:memcache].key?(:server)
219
- assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
219
+ assert_equal @memcached_host, second_span[:data][:memcache][:server]
220
220
  end
221
221
 
222
222
  def test_get_multi
@@ -249,7 +249,7 @@ class DalliTest < Minitest::Test
249
249
  assert second_span[:data][:memcache].key?(:namespace)
250
250
  assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
251
251
  assert second_span[:data][:memcache].key?(:server)
252
- assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
252
+ assert_equal @memcached_host, second_span[:data][:memcache][:server]
253
253
  assert second_span[:data][:memcache].key?(:hits)
254
254
  assert_equal 2, second_span[:data][:memcache][:hits]
255
255
  end
@@ -11,7 +11,7 @@ class ErrorJob
11
11
  if ENV.key?('REDIS_URL')
12
12
  redis = Redis.new(:url => ENV['REDIS_URL'])
13
13
  else
14
- redis = Redis.new(:url => 'localhost:6379')
14
+ redis = Redis.new(:url => 'redis://localhost:6379')
15
15
  end
16
16
 
17
17
  dt = Time.now
data/test/test_helper.rb CHANGED
@@ -12,7 +12,11 @@ begin
12
12
 
13
13
  add_filter %r{^/test/}
14
14
 
15
- command_name "Job #{ENV['CIRCLE_BUILD_NUM']}" if ENV['CIRCLE_BUILD_NUM']
15
+ if ENV['CIRCLE_BUILD_NUM']
16
+ command_name "Job #{ENV['CIRCLE_BUILD_NUM']}"
17
+ elsif ENV['COVERAGE_PATH']
18
+ coverage_dir ENV['COVERAGE_PATH']
19
+ end
16
20
  add_group(
17
21
  'In Process Collector',
18
22
  [%r{lib/instana/(agent|backend|tracing|collectors|open_tracing|snapshot)}, %r{lib/instana/[^/]+\.rb}]
@@ -54,14 +58,12 @@ WebMock.disable_net_connect!(
54
58
 
55
59
  Dir['test/support/*.rb'].each { |f| load(f) }
56
60
 
57
- if ENV['CI']
58
- Minitest::Reporters.use!([
59
- Minitest::Reporters::JUnitReporter.new('_junit', false),
60
- Minitest::Reporters::SpecReporter.new
61
- ])
62
- else
63
- Minitest::Reporters.use!([
64
- Minitest::Reporters::SpecReporter.new
65
- ])
61
+ minitest_reporters_to_use = []
62
+ if ENV['CIRCLE_BUILD_NUM']
63
+ minitest_reporters_to_use.append(Minitest::Reporters::JUnitReporter.new('_junit', false))
64
+ elsif ENV['COVERAGE_PATH']
65
+ minitest_reporters_to_use.append(Minitest::Reporters::JUnitReporter.new("#{ENV['COVERAGE_PATH']}/_junit", false))
66
66
  end
67
+ minitest_reporters_to_use.append(Minitest::Reporters::SpecReporter.new)
68
+ Minitest::Reporters.use!(minitest_reporters_to_use)
67
69
  Minitest::Test.include(Instana::TestHelpers)
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.214.0
4
+ version: 1.214.2
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: 2024-03-28 00:00:00.000000000 Z
11
+ date: 2024-04-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -142,6 +142,17 @@ files:
142
142
  - ".gitignore"
143
143
  - ".rubocop.yml"
144
144
  - ".rubocop_todo.yml"
145
+ - ".tekton/github-interceptor-secret.yaml"
146
+ - ".tekton/github-pr-eventlistener.yaml"
147
+ - ".tekton/github-pr-pipeline.yaml.part"
148
+ - ".tekton/github-set-status-task.yaml"
149
+ - ".tekton/github-webhook-ingress.yaml"
150
+ - ".tekton/pipeline.yaml"
151
+ - ".tekton/pipelinerun.yaml"
152
+ - ".tekton/run_unittests.sh"
153
+ - ".tekton/scheduled-eventlistener.yaml"
154
+ - ".tekton/task.yaml"
155
+ - ".tekton/tekton-triggers-eventlistener-serviceaccount.yaml"
145
156
  - Appraisals
146
157
  - CONTRIBUTING.md
147
158
  - Gemfile
@@ -175,6 +186,7 @@ files:
175
186
  - gemfiles/mongo_216.gemfile
176
187
  - gemfiles/mongo_219.gemfile
177
188
  - gemfiles/net_http_01.gemfile
189
+ - gemfiles/rack_16.gemfile
178
190
  - gemfiles/rack_20.gemfile
179
191
  - gemfiles/rack_30.gemfile
180
192
  - gemfiles/rails_42.gemfile
@@ -186,16 +198,23 @@ files:
186
198
  - gemfiles/rails_71.gemfile
187
199
  - gemfiles/redis_40.gemfile
188
200
  - gemfiles/redis_50.gemfile
201
+ - gemfiles/redis_51.gemfile
189
202
  - gemfiles/resque_122.gemfile
203
+ - gemfiles/resque_1274_3scale.gemfile
190
204
  - gemfiles/resque_20.gemfile
205
+ - gemfiles/rest_client_16.gemfile
191
206
  - gemfiles/rest_client_20.gemfile
192
207
  - gemfiles/roda_20.gemfile
193
208
  - gemfiles/roda_30.gemfile
209
+ - gemfiles/rubocop_162.gemfile
194
210
  - gemfiles/shoryuken_50.gemfile
195
211
  - gemfiles/shoryuken_60.gemfile
212
+ - gemfiles/sidekiq_42.gemfile
213
+ - gemfiles/sidekiq_50.gemfile
196
214
  - gemfiles/sidekiq_60.gemfile
197
215
  - gemfiles/sidekiq_65.gemfile
198
216
  - gemfiles/sidekiq_70.gemfile
217
+ - gemfiles/sinatra_14.gemfile
199
218
  - gemfiles/sinatra_22.gemfile
200
219
  - gemfiles/sinatra_30.gemfile
201
220
  - gemfiles/sinatra_40.gemfile