instana 1.213.0 → 1.213.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05836c47722da3d9ac443f6f04dffb36ba2e61d89101292a53190956214069ed'
-  data.tar.gz: b609e6a9824dacc3ead219e81af2d5edbcb76ddc497fbecaa54aaef835794305
+  metadata.gz: a6c1eb25bd9b00e353e9c403d217357931bcc714b5aab7080b598c81c0aa51cf
+  data.tar.gz: 8bb75b9d28e1562cb2b010589fa0667d451bd9a4389e332832fb2e6225cd7882
 SHA512:
-  metadata.gz: a52403d7b5e9fec5e7a5b5aee7c8aa67771f939cd4934e4d0279bc1439b4e6bf6b2fa04a609b1f468e21e92f94d731acf33d66b978a681a246c5f87915b96493
-  data.tar.gz: 2c9ebd03347c9fd62daa8582a8d56266c905dc6d8f5c27d5d02711bf2318ac8f70878084f77937fa3cc59c89a3668e6b000400e8c5daddb78e91a460b011b976
+  metadata.gz: 5976d705537afdb13d900a45831bc9a0947c8bfa9a126f67badad41917d828dc63e4f5546bb3041626822d4636d978047613c1f77d6a82b5922a6c8436ff087a
+  data.tar.gz: c00f53d5ebc10e92fdc3c096092ececc87727b281d5476ac345d7fcf6f273b902b93eca60a423139a6310ad8b9e6188319488608c9006c48dfc89c8913d3dca9

data/.circleci/config.yml

@@ -34,6 +34,7 @@ library_gemfile: &library_gemfile
     - "./gemfiles/sinatra_14.gemfile"
     - "./gemfiles/sinatra_22.gemfile"
     - "./gemfiles/sinatra_30.gemfile"
+    - "./gemfiles/sinatra_40.gemfile"
     - "./gemfiles/shoryuken_50.gemfile"
     - "./gemfiles/shoryuken_60.gemfile"
     - "./gemfiles/mongo_216.gemfile"

data/gemfiles/sinatra_30.gemfile

@@ -8,6 +8,6 @@ gem "puma"
 gem "rubocop", "~> 1.9"
 gem "rack-test"
 gem "simplecov", "~> 0.21.2"
-gem "sinatra", ">= 3.0.6"
+gem "sinatra", ">= 3.0.6", "< 4.0"
 
 gemspec path: "../"

data/gemfiles/sinatra_40.gemfile

@@ -0,0 +1,13 @@
+# (c) Copyright IBM Corp. 2023
+
+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"
+
+gemspec path: "../"

data/lib/instana/activators/sinatra.rb

@@ -12,6 +12,9 @@ module Instana
         require 'instana/frameworks/sinatra'
 
         ::Sinatra::Base.use ::Instana::Rack
+        unless ::Sinatra::Base.respond_to?(:mustermann_opts)
+          ::Sinatra::Base.set :mustermann_opts, {}
+        end
         ::Sinatra::Base.register ::Instana::SinatraPathTemplateExtractor
 
         true

data/lib/instana/frameworks/rails.rb

@@ -17,7 +17,11 @@ else
         # Configure the Instrumented Logger
         if ::Instana.config[:logging][:enabled] && !ENV.key?('INSTANA_TEST')
           logger = ::Instana::InstrumentedLogger.new('/dev/null')
-          Rails.logger.extend(ActiveSupport::Logger.broadcast(logger))
+          if ::Rails::VERSION::STRING < "7.1"
+            Rails.logger.extend(ActiveSupport::Logger.broadcast(logger))
+          else
+            Rails.logger.broadcast_to(logger)
+          end
         end
 
         if ::Instana.config[:tracing][:enabled]

data/lib/instana/version.rb

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

data/test/frameworks/sinatra_test.rb

@@ -6,7 +6,11 @@ require 'rack/test'
 
 class SinatraTest < Minitest::Test
   include Rack::Test::Methods
-  APP = Rack::Builder.parse_file('test/support/apps/sinatra/config.ru').first
+  APP = Rack::Builder.parse_file('test/support/apps/sinatra/config.ru')
+  sinatra_version = Gem::Specification.find_by_name('sinatra').version
+  if sinatra_version < Gem::Version.new('4.0.0')
+    APP = APP.first
+  end
 
   def app
     APP

data/test/instrumentation/rails_action_controller_test.rb

@@ -5,7 +5,12 @@ require 'test_helper'
 
 class RailsActionControllerTest < Minitest::Test
   include Rack::Test::Methods
-  APP = Rack::Builder.parse_file('test/support/apps/action_controller/config.ru')
+  begin
+    ENV['INSTANA_TEST'] = nil
+    APP = Rack::Builder.parse_file('test/support/apps/action_controller/config.ru')
+  ensure
+    ENV['INSTANA_TEST'] = 'true'
+  end
   railties_version = Gem::Specification.find_by_name('railties').version
   if railties_version < Gem::Version.new('7.1.0')
     APP = APP.first
@@ -43,7 +48,8 @@ class RailsActionControllerTest < Minitest::Test
     refute last_response.ok?
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 2, spans.length
+    # 2 + 1 or more error log depending on Rails version
+    assert spans.length >= 3
 
     ac_span = find_first_span_by_name(spans, :actioncontroller)
 
@@ -65,7 +71,8 @@ class RailsActionControllerTest < Minitest::Test
     assert last_response.ok?
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 3, spans.length
+    # 2 + 1 or more error log depending on Rails version
+    assert spans.length >= 3
 
     ac_span = find_first_span_by_name(spans, :actioncontroller)
 
@@ -84,7 +91,8 @@ class RailsActionControllerTest < Minitest::Test
     refute last_response.ok?
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 2, spans.length
+    # 2 + 1 or more error log depending on Rails version
+    assert spans.length >= 3
 
     ac_span = find_first_span_by_name(spans, :actioncontroller)
 
@@ -106,7 +114,8 @@ class RailsActionControllerTest < Minitest::Test
     refute last_response.ok?
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 1, spans.length
+    # 1 + 1 or more error log depending on Rails version
+    assert spans.length >= 2
 
     rack_span = find_first_span_by_name(spans, :rack)
 
@@ -126,7 +135,9 @@ class RailsActionControllerTest < Minitest::Test
     refute last_response.ok?
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 2, spans.length
+
+    # 2 + 1 or more error log depending on Rails version
+    assert spans.length >= 3
 
     rack_span = find_first_span_by_name(spans, :rack)
     ac_span = find_first_span_by_name(spans, :actioncontroller)
@@ -148,7 +159,8 @@ class RailsActionControllerTest < Minitest::Test
     refute last_response.ok?
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 1, spans.length
+    # 1 + 1 or more error log depending on Rails version
+    assert spans.length >= 2
 
     rack_span = find_first_span_by_name(spans, :rack)
 
@@ -163,7 +175,8 @@ class RailsActionControllerTest < Minitest::Test
     refute last_response.ok?
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 2, spans.length
+    # 2 + 1 or more error log depending on Rails version
+    assert spans.length >= 3
 
     rack_span = find_first_span_by_name(spans, :rack)
     ac_span = find_first_span_by_name(spans, :actioncontroller)
@@ -188,4 +201,18 @@ class RailsActionControllerTest < Minitest::Test
     assert_equal false, rack_span.key?(:error)
     assert_equal '/base/world(.:format)', rack_span[:data][:http][:path_tpl]
   end
+
+  def test_log
+    clear_all!
+
+    get '/base/log_warning'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    assert spans[0][:data][:log]
+    log_span = spans[0][:data][:log]
+
+    assert_equal "Warn", log_span[:level]
+    assert_equal "This is a test warning", log_span[:message]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.213.0
+  version: 1.213.2
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -202,6 +202,7 @@ files:
 - gemfiles/sinatra_14.gemfile
 - gemfiles/sinatra_22.gemfile
 - gemfiles/sinatra_30.gemfile
+- gemfiles/sinatra_40.gemfile
 - instana.gemspec
 - lib/instana.rb
 - lib/instana/activator.rb