instana 1.209.0.pre2 → 1.209.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 579fd0682a5f684184c9a916d2bbb03cd080ff4cdedf566518ae62b4485f9dc5
-  data.tar.gz: 6530042c84f14c495ad31b2bc55d6840935b58bcafb211e4fde30b6bc72c241e
+  metadata.gz: e62881ca493d4515cd39055d633464d33c1cd3e1b8921fcd63861bdfa4ebc258
+  data.tar.gz: fe6c75eef3bb9905c576fd50b47e7b67141b3d8c13ef9b225a801a353c87908a
 SHA512:
-  metadata.gz: 7a4e3cf400528959af43933f0a3c0c6f19d8e856bf01b77c0031640bd552b4e00165b6a3c49628fe1bf1877d633b7abcde42bc010032ee1e32e4eb42b31cf29e
-  data.tar.gz: 98b0616dcb9e649d6563120e640e6ece098d4d8a918c5df97abeda3ac58122b50559bf57fed13b42d9e5e3e7ba79ebf4be225ef7b996fec4516adb865d7363d0
+  metadata.gz: 355994cc5dd31bf028a775dde54d49dcb62c6e83818747ace59fe8038d5b51438cb03b09973845e40ba53b8ca6a73c1a1c281a99cf3c22afab1209d1cb58db00
+  data.tar.gz: aa834ff80928730a5b267ebe840d6bc98a2ef41b240064f69301ef45def873a2271057e1a3d4d280b57a760294acb84ddc9b1f83177fac59bb1b711b4135fcd6

data/lib/instana/activators/sinatra.rb

@@ -5,7 +5,7 @@ module Instana
   module Activators
     class Sinatra < Activator
       def can_instrument?
-        defined?(::Instana::Rack) && defined?(::Sinatra)
+        defined?(::Instana::Rack) && defined?(::Sinatra) && defined?(::Sinatra::Base) && !::Sinatra::Base.middleware.nil?
       end
 
       def instrument

data/lib/instana/tracing/span.rb

@@ -82,6 +82,9 @@ module Instana
     # @param limit [Integer] Limit the backtrace to the top <limit> frames
     #
     def add_stack(limit: 30, stack: Kernel.caller)
+      cleaner = ::Instana.config[:backtrace_cleaner]
+      stack = cleaner.call(stack) if cleaner
+
       @data[:stack] = stack
                       .map do |call|
         file, line, *method = call.split(':')

data/lib/instana/version.rb

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

data/test/tracing/span_test.rb

@@ -63,6 +63,18 @@ class SpanTest < Minitest::Test
     Instana.config[:collect_backtraces] = false
   end
 
+  def test_span_backtrace_cleaner
+    Instana.config[:collect_backtraces] = true
+    Instana.config[:backtrace_cleaner] =
+      ->(trace) { trace.filter { |line| line.include?("lib/instana") } }
+    span = Instana::Span.new(:excon)
+
+    assert_equal 1, span[:stack].size
+  ensure
+    Instana.config[:backtrace_cleaner] = nil
+    Instana.config[:collect_backtraces] = false
+  end
+
   def test_span_stack_over_limit
     def inner(depth = 50, &blk) # rubocop:disable Lint/NestedMethodDefinition
       return blk.call if depth.zero?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.209.0.pre2
+  version: 1.209.2
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2022-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -375,9 +375,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.6
 signing_key: