instana 1.213.0 → 1.213.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05836c47722da3d9ac443f6f04dffb36ba2e61d89101292a53190956214069ed'
-  data.tar.gz: b609e6a9824dacc3ead219e81af2d5edbcb76ddc497fbecaa54aaef835794305
+  metadata.gz: e1509ebcf4f8afa64594e49f0fc133fda38e6a7170ef86de6510fcb44ed0021e
+  data.tar.gz: b21a8ecac7c698a973171f77d126718e925e0323f500a76a1596248db85615eb
 SHA512:
-  metadata.gz: a52403d7b5e9fec5e7a5b5aee7c8aa67771f939cd4934e4d0279bc1439b4e6bf6b2fa04a609b1f468e21e92f94d731acf33d66b978a681a246c5f87915b96493
-  data.tar.gz: 2c9ebd03347c9fd62daa8582a8d56266c905dc6d8f5c27d5d02711bf2318ac8f70878084f77937fa3cc59c89a3668e6b000400e8c5daddb78e91a460b011b976
+  metadata.gz: 841b715e429f54599356feaf5e623f4b6084d888968409cbc493ad2d56b2bfba0a43fb9c17a4e1fd303ac863821fc70b42091652d52ded2df94f22e473a03a72
+  data.tar.gz: a57470a6b55b7cbf553c6eb094fa462a1bc9f26ac2349c5be37bec5a26a8bf61f99f365a1e6735783c3344b9ac586461a2fb5ca9dd2cc5b9db86d9db4cabc157

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.1"
   VERSION_FULL = "instana-#{VERSION}"
 end

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.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler