instana 1.214.0 → 1.214.1

data/gemfiles/rest_client_20.gemfile

@@ -10,7 +10,6 @@ gem "rackup"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
-gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 gem "rest-client", ">= 2.1.0", "< 3.0"

data/gemfiles/roda_20.gemfile

@@ -9,7 +9,6 @@ gem "rack", "<3.0.0"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
-gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 gem "roda", ">= 2.0", "< 3.0"

data/gemfiles/roda_30.gemfile

@@ -9,7 +9,6 @@ gem "rack", "<3.0.0"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
-gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 gem "roda", ">= 3.69.0"

data/gemfiles/rubocop_162.gemfile

@@ -0,0 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
+source 'https://rubygems.org'
+
+gem 'rubocop', ">= 1.62.1"

data/gemfiles/shoryuken_50.gemfile

@@ -8,7 +8,6 @@ source "https://rubygems.org"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
-gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 gem "shoryuken", ">= 5.2", "< 6.0"

data/gemfiles/shoryuken_60.gemfile

@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
-gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 gem "shoryuken", ">= 6.0"

data/gemfiles/sidekiq_42.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+source "https://rubygems.org"
+
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "sidekiq", "~> 4.2.10"
+
+gemspec path: "../"

data/gemfiles/sidekiq_50.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+source "https://rubygems.org"
+
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "sidekiq", "< 6.0"
+
+gemspec path: "../"

data/gemfiles/sidekiq_60.gemfile

@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
-gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 gem "sidekiq", ">= 6.0.0", "< 6.5.0"

data/gemfiles/sidekiq_65.gemfile

@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
-gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 gem "sidekiq", ">= 6.5.12", "< 7.0.0"

data/gemfiles/sidekiq_70.gemfile

@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
-gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 gem "sidekiq", ">= 7.2.0"

data/gemfiles/sinatra_14.gemfile

@@ -0,0 +1,15 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+source "https://rubygems.org"
+
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "sinatra", ">= 1.4.8", "< 2.0"
+
+gemspec path: "../"

data/gemfiles/sinatra_22.gemfile

@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
-gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 gem "sinatra", ">= 2.2.4", "< 3.0"

data/gemfiles/sinatra_30.gemfile

@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
-gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 gem "sinatra", ">= 3.0.6", "< 4.0"

data/gemfiles/sinatra_40.gemfile

@@ -5,7 +5,6 @@ source "https://rubygems.org"
 gem "minitest-reporters"
 gem "webmock"
 gem "puma"
-gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
 gem "sinatra", ">= 4.0.0"

data/lib/instana/frameworks/rails.rb

@@ -18,6 +18,28 @@ else
         if ::Instana.config[:logging][:enabled] && !ENV.key?('INSTANA_TEST')
           logger = ::Instana::InstrumentedLogger.new('/dev/null')
           if ::Rails::VERSION::STRING < "7.1"
+            # Rails 7.0.3 `tagged_logging.rb` has a number of bugs.
+            # What pertains to our instrumentation here is that in
+            # https://github.com/rails/rails/blob/v7.0.3/activesupport/lib/active_support/tagged_logging.rb#L100
+            # sets the `other_logger.formatter` to `formatter` if `other_logger.formatter` is `nil`
+            # but then
+            # https://github.com/rails/rails/blob/v7.0.3/activesupport/lib/active_support/tagged_logging.rb#L102
+            # redefines `formatter.current_tags` method to a proc calling `formatter.current_tags`, itself.
+            # which is an infinite recursion.
+            #
+            # This bug starts with 7.0.3:
+            # https://github.com/rails/rails/compare/v7.0.2...v7.0.3#diff-68f90ba4998610be2f7da027e006e8ddeeb06dece66f41579c94070e12f23011
+            # And is already reverted/fixed in 7.0.4
+            # https://github.com/rails/rails/compare/v7.0.3...v7.0.4#diff-68f90ba4998610be2f7da027e006e8ddeeb06dece66f41579c94070e12f23011
+            # The commit which fixes it is:
+            # https://github.com/rails/rails/commit/ff277583e22ddfbcfbd2131789a7cb7c2f868d68
+            #
+            # Since instana does trigger this bug here we workaround it, by defining the `formatter`,
+            # to break the infinite loop. The `formatter` used here is the same as the default used in
+            # https://github.com/rails/rails/blob/v7.0.3/activesupport/lib/active_support/tagged_logging.rb#L89C9-L89C70
+            if ::Rails::VERSION::STRING == "7.0.3"
+              logger.formatter = ActiveSupport::Logger::SimpleFormatter.new
+            end
             Rails.logger.extend(ActiveSupport::Logger.broadcast(logger))
           else
             Rails.logger.broadcast_to(logger)

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.214.0"
+  VERSION = "1.214.1"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/instrumentation/dalli_test.rb

@@ -47,7 +47,7 @@ class DalliTest < Minitest::Test
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
   end
 
   def test_basic_set
@@ -80,7 +80,7 @@ class DalliTest < Minitest::Test
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
   end
 
   def test_replace
@@ -114,7 +114,7 @@ class DalliTest < Minitest::Test
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
   end
 
   def test_delete
@@ -148,7 +148,7 @@ class DalliTest < Minitest::Test
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
   end
 
   def test_incr
@@ -182,7 +182,7 @@ class DalliTest < Minitest::Test
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
   end
 
   def test_decr
@@ -216,7 +216,7 @@ class DalliTest < Minitest::Test
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
   end
 
   def test_get_multi
@@ -249,7 +249,7 @@ class DalliTest < Minitest::Test
     assert second_span[:data][:memcache].key?(:namespace)
     assert_equal 'instana_test', second_span[:data][:memcache][:namespace]
     assert second_span[:data][:memcache].key?(:server)
-    assert_equal ENV['MEMCACHED_HOST'], second_span[:data][:memcache][:server]
+    assert_equal @memcached_host, second_span[:data][:memcache][:server]
     assert second_span[:data][:memcache].key?(:hits)
     assert_equal 2, second_span[:data][:memcache][:hits]
   end

data/test/support/apps/resque/jobs/resque_error_job.rb

@@ -11,7 +11,7 @@ class ErrorJob
     if ENV.key?('REDIS_URL')
       redis = Redis.new(:url => ENV['REDIS_URL'])
     else
-      redis = Redis.new(:url => 'localhost:6379')
+      redis = Redis.new(:url => 'redis://localhost:6379')
     end
 
     dt = Time.now

data/test/test_helper.rb

@@ -12,7 +12,11 @@ begin
 
     add_filter %r{^/test/}
 
-    command_name "Job #{ENV['CIRCLE_BUILD_NUM']}" if ENV['CIRCLE_BUILD_NUM']
+    if ENV['CIRCLE_BUILD_NUM']
+      command_name "Job #{ENV['CIRCLE_BUILD_NUM']}"
+    elsif ENV['COVERAGE_PATH']
+      coverage_dir ENV['COVERAGE_PATH']
+    end
     add_group(
       'In Process Collector',
       [%r{lib/instana/(agent|backend|tracing|collectors|open_tracing|snapshot)}, %r{lib/instana/[^/]+\.rb}]
@@ -54,14 +58,12 @@ WebMock.disable_net_connect!(
 
 Dir['test/support/*.rb'].each { |f| load(f) }
 
-if ENV['CI']
-  Minitest::Reporters.use!([
-                             Minitest::Reporters::JUnitReporter.new('_junit', false),
-                             Minitest::Reporters::SpecReporter.new
-                           ])
-else
-  Minitest::Reporters.use!([
-                             Minitest::Reporters::SpecReporter.new
-                           ])
+minitest_reporters_to_use = []
+if ENV['CIRCLE_BUILD_NUM']
+  minitest_reporters_to_use.append(Minitest::Reporters::JUnitReporter.new('_junit', false))
+elsif ENV['COVERAGE_PATH']
+  minitest_reporters_to_use.append(Minitest::Reporters::JUnitReporter.new("#{ENV['COVERAGE_PATH']}/_junit", false))
 end
+minitest_reporters_to_use.append(Minitest::Reporters::SpecReporter.new)
+Minitest::Reporters.use!(minitest_reporters_to_use)
 Minitest::Test.include(Instana::TestHelpers)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.214.0
+  version: 1.214.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-28 00:00:00.000000000 Z
+date: 2024-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +142,10 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".tekton/pipeline.yaml"
+- ".tekton/pipelinerun.yaml"
+- ".tekton/run_unittests.sh"
+- ".tekton/task.yaml"
 - Appraisals
 - CONTRIBUTING.md
 - Gemfile
@@ -175,6 +179,7 @@ files:
 - gemfiles/mongo_216.gemfile
 - gemfiles/mongo_219.gemfile
 - gemfiles/net_http_01.gemfile
+- gemfiles/rack_16.gemfile
 - gemfiles/rack_20.gemfile
 - gemfiles/rack_30.gemfile
 - gemfiles/rails_42.gemfile
@@ -186,16 +191,23 @@ files:
 - gemfiles/rails_71.gemfile
 - gemfiles/redis_40.gemfile
 - gemfiles/redis_50.gemfile
+- gemfiles/redis_51.gemfile
 - gemfiles/resque_122.gemfile
+- gemfiles/resque_1274_3scale.gemfile
 - gemfiles/resque_20.gemfile
+- gemfiles/rest_client_16.gemfile
 - gemfiles/rest_client_20.gemfile
 - gemfiles/roda_20.gemfile
 - gemfiles/roda_30.gemfile
+- gemfiles/rubocop_162.gemfile
 - gemfiles/shoryuken_50.gemfile
 - gemfiles/shoryuken_60.gemfile
+- gemfiles/sidekiq_42.gemfile
+- gemfiles/sidekiq_50.gemfile
 - gemfiles/sidekiq_60.gemfile
 - gemfiles/sidekiq_65.gemfile
 - gemfiles/sidekiq_70.gemfile
+- gemfiles/sinatra_14.gemfile
 - gemfiles/sinatra_22.gemfile
 - gemfiles/sinatra_30.gemfile
 - gemfiles/sinatra_40.gemfile