instana 1.195.3 → 1.195.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3c25ac47f1cf483842987544cbabbb789f6b970ac6eacf6e98aa775dcd17a30
-  data.tar.gz: 2f5dd56ca03c8a676ab9748e261502667e6f76e01074aff5e5fc63543f12a076
+  metadata.gz: '0068c5ce2a6bf7c75d517562cec424a612a31d8d938fabb7651151f52b3cc5ea'
+  data.tar.gz: cffa225ebc37b1a19a6a20d2418af57cd6e559a3635df17b5244bc2d603eaa20
 SHA512:
-  metadata.gz: 9d03380277adfd468ed0ed73ae646c552cdcc4675eb6e6ffc6e83beff9e17b2d18d5c08a5815115d170503b50bf86a876366ddb793e9e7fa1914e1c0559d089e
-  data.tar.gz: 5cca053e9833421b31264fa4d9d46f5a8dea6150e47d260f711712390bb51d6bb8ada2a0abad4144f2159919b15b34b318204c44cc90870ebba32f3bb76bfdaf
+  metadata.gz: '0991b7a36fe13c5e4b8ebf93647f3a933087c0f92b8e94e2a3b4a8f7c8bcc24712560f4caf550328bc5390a51f59c334483e48b8be4b78236164b2d557608625'
+  data.tar.gz: bd5ab3d0ba9f0d80a5b7c86068afb04f3889321fa5a154e43e97f89f577e244e481e0b2208a3fb76ae04452b26bcd32657ca2ea9cd6133230a7e53a8904fc52f

data/lib/instana/instrumentation/excon.rb

@@ -5,7 +5,7 @@ module Instana
   module Instrumentation
     class Excon < ::Excon::Middleware::Base
       def request_call(datum)
-        return @stack.request_call(datum) unless ::Instana.tracer.tracing? && !Instana.tracer.current_span.exit_span?
+        return @stack.request_call(datum) unless traceable?
 
         payload = { :http => {} }
         path, query = datum[:path].split('?', 2)
@@ -36,7 +36,7 @@ module Instana
       end
 
       def error_call(datum)
-        return @stack.error_call(datum) unless ::Instana.tracer.tracing? || !Instana.tracer.current_span.exit_span?
+        return @stack.error_call(datum) unless traceable?
 
         if datum[:pipeline] == true
           ::Instana.tracer.log_async_error(datum[:error], datum[:instana_span])
@@ -49,7 +49,7 @@ module Instana
       def response_call(datum)
         # FIXME: Will connect exceptions call a response?
         #
-        return @stack.response_call(datum) unless ::Instana.tracer.tracing? || !Instana.tracer.current_span.exit_span?
+        return @stack.response_call(datum) unless traceable?
 
         result =  @stack.response_call(datum)
 
@@ -72,6 +72,13 @@ module Instana
         end
         result
       end
+
+      private
+
+      def traceable?
+        ::Instana.tracer.tracing? &&
+          (!Instana.tracer.current_span.exit_span? || Instana.tracer.current_span.name == :excon)
+      end
     end
   end
 end

data/lib/instana/version.rb

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

data/test/instrumentation/excon_test.rb

@@ -22,7 +22,7 @@ class ExconTest < Minitest::Test
     url = "http://127.0.0.1:6511"
 
     connection = Excon.new(url)
-    Instana.tracer.start_or_continue_trace('excon-test') do
+    Instana.tracer.start_or_continue_trace(:'excon-test') do
       connection.get(:path => '/?basic_get')
     end
 
@@ -147,4 +147,18 @@ class ExconTest < Minitest::Test
       assert_equal :sdk, grandparent_span[:n]
     end
   end
+
+  def test_basic_get_no_tracing
+    clear_all!
+
+    # A slight hack but webmock chokes with pipelined requests.
+    # Delete their excon middleware
+    Excon.defaults[:middlewares].delete ::WebMock::HttpLibAdapters::ExconAdapter
+    Excon.defaults[:middlewares].delete ::Excon::Middleware::Mock
+
+    url = "http://127.0.0.1:6511"
+
+    connection = Excon.new(url)
+    connection.get(:path => '/?basic_get')
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.195.3
+  version: 1.195.4
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-23 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler