instana 1.217.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93a8af58226aa905f51dfa17ead848e26e7fab57b3d605849a6255fb74787e79
-  data.tar.gz: 86af2549a8380102a88f383d139678a2e47b349e71947721476e14211e5942c0
+  metadata.gz: ca8072a81b44cce54a3a2db8ef236038fa4814226c714e88f12285ea952eede4
+  data.tar.gz: 6f3b666908eb9442c1a8e6d3d1b9a332576bb818810a2c588df4de2232c1b65a
 SHA512:
-  metadata.gz: d3393c184331fa59069375678300b463fd038cca1c2996f95e416723690f1f119f0d4940af90997161278649d6353ae0e28ae03b2791126bcaa42bd32cf3a06d
-  data.tar.gz: f246ad9e3c63431aab1a244fbb88e7e1146ec91c35749253b7630e9fc5032a91b0db14b86ae091dca9f3a2c462cb8f0a1c0fcc53aaec0e9feb9516dcb5d7657c
+  metadata.gz: 84861f4a775983202c19731ce78302bf5e7cfd677591bf9b42014be4dee8b93efd1e6606910f756bbba495584a932ac860eb76cad5cf6539202d0588c3c01592
+  data.tar.gz: ab26f124f9e087501046f56645649aed9b077ee656120d99ac1c375f44552f92345e338c1d5495c28e4a1959a7c459bf652511e13031912812a1acef003ca3f3

data/README.md

@@ -8,7 +8,8 @@ Any and all feedback is welcome.  Happy Ruby visibility.
 
 [![Gem Version](https://badge.fury.io/rb/instana.svg)](https://badge.fury.io/rb/instana)
 [![CircleCI](https://circleci.com/gh/instana/ruby-sensor.svg?style=svg)](https://circleci.com/gh/instana/ruby-sensor)
-[![OpenTracing Badge](https://img.shields.io/badge/OpenTracing-enabled-blue.svg)](http://opentracing.io)
+[![OpenTracing Badge](https://img.shields.io/badge/OpenTracing-disabled-red.svg)](http://opentracing.io)
+[![OpenTelemetry Badge](https://img.shields.io/badge/OpenTelemetry-enabled-blue.svg)](http://opentelemetry.io)
 
 ## Installation
 

data/lib/instana/base.rb

@@ -14,6 +14,7 @@ module Instana
     attr_accessor :pid
     attr_reader :secrets
     attr_reader :serverless
+    attr_accessor :tracer_provider
 
     ##
     # setup
@@ -22,8 +23,9 @@ module Instana
     # to run" state.
     #
     def setup
-      @agent  = ::Instana::Backend::Agent.new
-      @tracer = ::Instana::Tracer.new
+      @agent = ::Instana::Backend::Agent.new
+      @tracer_provider = ::Instana::Trace::TracerProvider.new
+      @tracer = @tracer_provider.tracer('instana_tracer')
       @processor = ::Instana::Processor.new
       @secrets = ::Instana::Secrets.new
       @serverless = ::Instana::Serverless.new

data/lib/instana/instrumentation/action_cable.rb

@@ -27,8 +27,10 @@ module Instana
         }
 
         context = connection.instana_trace_context
-        ::Instana.tracer.start_or_continue_trace(:'rpc-server', rpc_tags, context) do
-          super(data, via: via)
+        Trace.with_span(OpenTelemetry::Trace.non_recording_span(context)) do
+          ::Instana.tracer.in_span(:'rpc-server', attributes: rpc_tags) do
+            super(data, via: via)
+          end
         end
       end
 
@@ -44,8 +46,10 @@ module Instana
         }
 
         context = connection.instana_trace_context
-        ::Instana.tracer.start_or_continue_trace(:'rpc-server', rpc_tags, context) do
-          super(action, data)
+        Trace.with_span(OpenTelemetry::Trace.non_recording_span(context)) do
+          ::Instana.tracer.in_span(:'rpc-server', attributes: rpc_tags) do
+            super(action, data)
+          end
         end
       end
     end

data/lib/instana/instrumentation/action_controller.rb

@@ -11,9 +11,8 @@ module Instana
             action: action_name
           }
         }
-
         request.env['INSTANA_HTTP_PATH_TEMPLATE'] = matched_path_template
-        ::Instana::Tracer.trace(:actioncontroller, call_payload) { super(*args) }
+        ::Instana.tracer.in_span(:actioncontroller, attributes: call_payload) { super(*args) }
       end
 
       def render(*args, &block)
@@ -22,8 +21,7 @@ module Instana
             name: describe_render_options(args.first) || 'Default'
           }
         }
-
-        ::Instana::Tracer.trace(:actionview, call_payload) { super(*args, &block) }
+        ::Instana.tracer.in_span(:actionview, attributes: call_payload) { super(*args, &block) }
       end
 
       private

data/lib/instana/instrumentation/action_mailer.rb

@@ -12,7 +12,7 @@ module Instana
               method: method_name.to_s
             }
           }
-          Instana::Tracer.trace(:'mail.actionmailer', tags) { super }
+          Instana.tracer.in_span(:'mail.actionmailer', attributes: tags) { super }
         else
           super
         end

data/lib/instana/instrumentation/action_view.rb

@@ -13,7 +13,7 @@ module Instana
             }
           }
 
-          ::Instana::Tracer.trace(:render, call_payload) { super(*args) }
+          ::Instana.tracer.in_span(:render, attributes: call_payload) { super(*args) }
         end
 
         def render_collection(*args)
@@ -24,7 +24,7 @@ module Instana
             }
           }
 
-          ::Instana::Tracer.trace(:render, call_payload) { super(*args) }
+          ::Instana.tracer.in_span(:render, attributes: call_payload) { super(*args) }
         end
 
         def render_partial_template(*args)
@@ -35,7 +35,7 @@ module Instana
             }
           }
 
-          ::Instana::Tracer.trace(:render, call_payload) { super(*args) }
+          ::Instana.tracer.in_span(:render, attributes: call_payload) { super(*args) }
         end
       end
 
@@ -48,7 +48,7 @@ module Instana
             }
           }
 
-          ::Instana::Tracer.trace(:render, call_payload) { super(*args) }
+          ::Instana.tracer.in_span(:render, attributes: call_payload) { super(*args) }
         end
       end
     end

data/lib/instana/instrumentation/active_job.rb

@@ -1,5 +1,19 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2021
+module OpenTelemetry
+  module Trace
+    module Propagation
+      module TraceContext
+        # A TraceParent is an implementation of the W3C trace context specification
+        # https://www.w3.org/TR/trace-context/
+        # {Trace::SpanContext}
+        class TraceParent
+          REGEXP = /^(?<version>[A-Fa-f0-9]{2})-(?<trace_id>[A-Fa-f0-9]{32})-(?<span_id>[A-Fa-f0-9]{32})-(?<flags>[A-Fa-f0-9]{2})(?<ignored>-.*)?$/
+        end
+      end
+    end
+  end
+end
 
 module Instana
   module Instrumentation
@@ -15,7 +29,7 @@ module Instana
             }
           }
 
-          ::Instana::Tracer.trace(:activejob, tags) do
+          ::Instana.tracer.in_span(:activejob, attributes: tags) do
             context = ::Instana.tracer.context
             job.arguments.append({
                                    instana_context: context ? context.to_hash : nil
@@ -37,11 +51,12 @@ module Instana
           incoming_context = if job.arguments.is_a?(Array) && job.arguments.last.is_a?(Hash) && job.arguments.last.key?(:instana_context)
                                instana_context = job.arguments.last[:instana_context]
                                job.arguments.pop
-                               instana_context ? ::Instana::SpanContext.new(instana_context[:trace_id], instana_context[:span_id]) : nil
+                               instana_context ? ::Instana::SpanContext.new(trace_id: instana_context[:trace_id], span_id: instana_context[:span_id]) : nil
                              end
-
-          ::Instana::Tracer.start_or_continue_trace(:activejob, tags, incoming_context) do
-            block.call
+          Trace.with_span(OpenTelemetry::Trace.non_recording_span(incoming_context)) do
+            ::Instana.tracer.in_span(:activejob, attributes: tags) do
+              block.call
+            end
           end
         end
       end

data/lib/instana/instrumentation/active_record.rb

@@ -35,7 +35,7 @@ module Instana
 
       def maybe_trace(call_payload, name, &blk)
         if ::Instana.tracer.tracing? && !ignored?(call_payload, name)
-          ::Instana.tracer.trace(:activerecord, call_payload, &blk)
+          ::Instana.tracer.in_span(:activerecord, attributes: call_payload, &blk)
         else
           yield
         end

data/lib/instana/instrumentation/aws_sdk_dynamodb.rb

@@ -11,7 +11,7 @@ module Instana
             table: table_name_from(context)
           }
 
-          ::Instana.tracer.trace(:dynamodb, {dynamodb: dynamo_tags}) { @handler.call(context) }
+          ::Instana.tracer.in_span(:dynamodb, attributes: {dynamodb: dynamo_tags}) { @handler.call(context) }
         end
 
         private

data/lib/instana/instrumentation/aws_sdk_lambda.rb

@@ -25,7 +25,7 @@ module Instana
             type: context.params[:invocation_type]
           }.reject { |_, v| v.nil? }
 
-          ::Instana.tracer.start_or_continue_trace(:"aws.lambda.invoke", {aws: {lambda: {invoke: tags}}}) do
+          ::Instana.tracer.in_span(:"aws.lambda.invoke", attributes: {aws: {lambda: {invoke: tags}}}) do
             response = @handler.call(context)
             if response.respond_to? :status_code
               ::Instana.tracer.log_info(:http => {:status => response.status_code })

data/lib/instana/instrumentation/aws_sdk_s3.rb

@@ -12,7 +12,7 @@ module Instana
             key: key_from_context(context)
           }.reject { |_, v| v.nil? }
 
-          ::Instana.tracer.trace(:s3, {s3: s3_tags}) { @handler.call(context) }
+          ::Instana.tracer.in_span(:s3, attributes: {s3: s3_tags}) { @handler.call(context) }
         end
 
         private

data/lib/instana/instrumentation/aws_sdk_sns.rb

@@ -14,7 +14,7 @@ module Instana
           }.reject { |_, v| v.nil? }
 
           if context.operation_name == :publish
-            ::Instana.tracer.trace(:sns, {sns: sns_tags}) { @handler.call(context) }
+            ::Instana.tracer.in_span(:sns, attributes: {sns: sns_tags}) { @handler.call(context) }
           else
             @handler.call(context)
           end

data/lib/instana/instrumentation/aws_sdk_sqs.rb

@@ -15,7 +15,7 @@ module Instana
 
           span_tags = tags_for(context.operation_name, context.params).reject { |_, v| v.nil? }
 
-          ::Instana.tracer.trace(:sqs, {sqs: span_tags}) do |span|
+          ::Instana.tracer.in_span(:sqs, attributes: {sqs: span_tags}) do |span|
             case context.operation_name
             when :send_message
               inject_instana_headers(span, context.params)

data/lib/instana/instrumentation/dalli.rb

@@ -17,7 +17,7 @@ module Instana
         entry_payload[:memcache][:command] = op
         entry_payload[:memcache][:key] = key
 
-        ::Instana.tracer.log_entry(:memcache, entry_payload)
+        ::Instana.tracer.start_span(:memcache, attributes: entry_payload)
         exit_payload = { :memcache => {} }
 
         result = super(*args, &blk)

data/lib/instana/instrumentation/excon.rb

@@ -16,10 +16,10 @@ module Instana
         if datum[:pipeline] == true
           # Pass the context along in the datum so we get back on response
           # and can close out the async span
-          datum[:instana_span] = ::Instana.tracer.log_async_entry(:excon, payload)
+          datum[:instana_span] = ::Instana.tracer.start_span(:excon, attributes: payload)
           t_context = datum[:instana_span].context
         else
-          ::Instana.tracer.log_entry(:excon, payload)
+          ::Instana.tracer.start_span(:excon, attributes: payload)
           t_context = ::Instana.tracer.context
         end
 

data/lib/instana/instrumentation/graphql.rb

@@ -35,13 +35,13 @@ module Instana
         }
 
         begin
-          ::Instana.tracer.log_entry(:'graphql.server')
+          span = ::Instana.tracer.start_span(:'graphql.server', attributes: {graphql: payload})
           yield
         rescue Exception => e
-          ::Instana.tracer.log_error(e)
+          span.record_exception(e)
           raise e
         ensure
-          ::Instana.tracer.log_exit(:'graphql.server', {graphql: payload})
+          span.finish
         end
       end
 

data/lib/instana/instrumentation/grpc.rb

@@ -22,7 +22,7 @@ module Instana
             kvs[:rpc][:call] = method
             kvs[:rpc][:call_type] = call_type
 
-            ::Instana.tracer.log_entry(:'rpc-client', kvs)
+            current_span = ::Instana.tracer.start_span(:'rpc-client', attributes: kvs)
 
             context = ::Instana.tracer.context
             if context
@@ -35,11 +35,11 @@ module Instana
             super(method, *others, **options)
           rescue => e
             kvs[:rpc][:error] = true
-            ::Instana.tracer.log_info(kvs)
-            ::Instana.tracer.log_error(e)
+            current_span.set_tags(kvs)
+            current_span.record_exception(e)
             raise
           ensure
-            ::Instana.tracer.log_exit(:'rpc-client', {})
+            current_span.finish
           end
         end
       end
@@ -60,9 +60,9 @@ module Instana
 
             incoming_context = {}
             if metadata.key?('x-instana-t')
-              incoming_context[:trace_id]  = ::Instana::Util.header_to_id(metadata['x-instana-t'])
-              incoming_context[:span_id]   = ::Instana::Util.header_to_id(metadata['x-instana-s']) if metadata.key?('x-instana-s')
-              incoming_context[:level]     = metadata['x-instana-l'] if metadata.key?('x-instana-l')
+              incoming_context = SpanContext.new(trace_id: ::Instana::Util.header_to_id(metadata['x-instana-t']),
+                                                 span_id: metadata.key?('x-instana-s') ? ::Instana::Util.header_to_id(metadata['x-instana-s']) : nil,
+                                                 level: metadata.key?('x-instana-l') ? metadata['x-instana-l'] : nil)
             end
 
             kvs[:rpc][:flavor] = :grpc
@@ -71,18 +71,19 @@ module Instana
             kvs[:rpc][:call_type] = call_type
             kvs[:rpc][:peer] = { address: active_call.peer }
 
-            ::Instana.tracer.log_start_or_continue(
-              :'rpc-server', kvs, incoming_context
-            )
+            span = OpenTelemetry::Trace.non_recording_span(incoming_context) if incoming_context
+            parent_context = Trace.context_with_span(span) if incoming_context
+
+            current_span = ::Instana.tracer.start_span(:'rpc-server', attributes: kvs, with_parent: parent_context)
 
             super(active_call, mth, *others)
           rescue => e
             kvs[:rpc][:error] = true
-            ::Instana.tracer.log_info(kvs)
-            ::Instana.tracer.log_error(e)
+            current_span.set_tags(kvs)
+            current_span.record_exception(e)
             raise
           ensure
-            ::Instana.tracer.log_end(:'rpc-server', {}) if ::Instana.tracer.tracing?
+            current_span.finish if ::Instana.tracer.tracing?
           end
         end
       end

data/lib/instana/instrumentation/mongo.rb

@@ -20,19 +20,19 @@ module Instana
         json: filter_statement(event.command)
       }
 
-      @requests[event.request_id] = ::Instana.tracer.log_async_entry(:mongo, {mongo: tags})
+      @requests[event.request_id] = ::Instana.tracer.start_span(:mongo, attributes: {mongo: tags})
     end
 
     def failed(event)
       span = @requests.delete(event.request_id)
       span.add_error(Exception.new(event.message))
 
-      ::Instana.tracer.log_async_exit(:mongo, {}, span)
+      span.finish
     end
 
     def succeeded(event)
       span = @requests.delete(event.request_id)
-      ::Instana.tracer.log_async_exit(:mongo, {}, span)
+      span.finish
     end
 
     private

data/lib/instana/instrumentation/net-http.rb

@@ -12,7 +12,7 @@ module Instana
           return super(*args, &block)
         end
 
-        ::Instana.tracer.log_entry(:'net-http')
+        current_span = ::Instana.tracer.start_span(:'net-http')
 
         # Send out the tracing context with the request
         request = args[0]
@@ -54,15 +54,16 @@ module Instana
         if response.code.to_i >= 500
           # Because of the 5xx response, we flag this span as errored but
           # without a backtrace (no exception)
-          ::Instana.tracer.log_error(nil)
+          current_span.record_exception(nil)
         end
 
         response
       rescue => e
-        ::Instana.tracer.log_error(e)
+        current_span&.record_exception(e)
         raise
       ensure
-        ::Instana.tracer.log_exit(:'net-http', kv_payload) unless do_skip
+        current_span&.set_tags(kv_payload)
+        current_span&.finish unless do_skip
       end
 
       def skip_instrumentation?

data/lib/instana/instrumentation/rack.rb

@@ -10,14 +10,20 @@ module Instana
       @app = app
     end
 
-    def call(env)
+    def call(env) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength
       req = InstrumentedRequest.new(env)
       kvs = {
         http: req.request_tags
       }.reject { |_, v| v.nil? }
 
-      current_span = ::Instana.tracer.log_start_or_continue(:rack, {}, req.incoming_context)
+      parent_context = extract_trace_context(req.incoming_context)
 
+      span = OpenTelemetry::Trace.non_recording_span(parent_context) if parent_context
+      parent_context = Trace.context_with_span(span) if parent_context
+
+      current_span = ::Instana.tracer.start_span(:rack, attributes: {}, with_parent: parent_context)
+      trace_ctx = OpenTelemetry::Trace.context_with_span(current_span)
+      @trace_token = OpenTelemetry::Context.attach(trace_ctx)
       status, headers, response = @app.call(env)
 
       if ::Instana.tracer.tracing?
@@ -66,7 +72,7 @@ module Instana
 
       [status, headers, response]
     rescue Exception => e
-      ::Instana.tracer.log_error(e) if ::Instana.tracer.tracing?
+      current_span.record_exception(e) if ::Instana.tracer.tracing?
       raise
     ensure
       if ::Instana.tracer.tracing?
@@ -85,9 +91,35 @@ module Instana
           headers['Traceparent'] = trace_context.trace_parent_header
           headers['Server-Timing'] = "intid;desc=#{trace_context.trace_id_header}"
         end
+        current_span.set_tags(kvs)
+        OpenTelemetry::Context.detach(@trace_token) if @trace_token
+        current_span.finish
+      end
+    end
+
+    private
 
-        ::Instana.tracer.log_end(:rack, kvs)
+    def extract_trace_context(incoming_context)
+      return nil unless incoming_context
+
+      parent_context = nil
+
+      if incoming_context.is_a?(Hash)
+        unless incoming_context.empty?
+          parent_context = SpanContext.new(
+            trace_id: incoming_context[:trace_id],
+            span_id: incoming_context[:span_id],
+            level: incoming_context[:level],
+            baggage: {
+              external_trace_id: incoming_context[:external_trace_id],
+              external_state: incoming_context[:external_state]
+            }
+          )
+        end
+      elsif incoming_context.is_a?(SpanContext)
+        parent_context = incoming_context
       end
+      parent_context
     end
   end
 end

data/lib/instana/instrumentation/redis.rb

@@ -66,7 +66,7 @@ module Instana
       kv_payload = { redis: {} }
 
       begin
-        ::Instana.tracer.log_entry(:redis)
+        ::Instana.tracer.start_span(:redis)
 
         begin
           kv_payload[:redis][:connection] = "#{self.host}:#{self.port}"

data/lib/instana/instrumentation/resque.rb

@@ -27,7 +27,7 @@ module Instana
         if Instana.tracer.tracing?
           kvs = collect_kvs(:enqueue, klass, args)
 
-          Instana.tracer.trace(:'resque-client', kvs) do
+          Instana.tracer.in_span(:'resque-client', attributes: kvs) do
             args.push(::Instana.tracer.context.to_hash) if ::Instana.config[:'resque-client'][:propagate]
             super(klass, *args)
           end
@@ -41,7 +41,7 @@ module Instana
           kvs = collect_kvs(:enqueue_to, klass, args)
           kvs[:Queue] = queue.to_s if queue
 
-          Instana.tracer.trace(:'resque-client', kvs) do
+          Instana.tracer.in_span(:'resque-client', attributes: kvs) do
             args.push(::Instana.tracer.context.to_hash) if ::Instana.config[:'resque-client'][:propagate]
             super(queue, klass, *args)
           end
@@ -54,7 +54,7 @@ module Instana
         if Instana.tracer.tracing?
           kvs = collect_kvs(:dequeue, klass, args)
 
-          Instana.tracer.trace(:'resque-client', kvs) do
+          Instana.tracer.in_span(:'resque-client', attributes: kvs) do
             super(klass, *args)
           end
         else
@@ -78,13 +78,15 @@ module Instana
         trace_context = if ::Instana.config[:'resque-client'][:propagate] && job.payload['args'][-1].is_a?(Hash) && job.payload['args'][-1].keys.include?('trace_id')
                           context_from_wire = job.payload['args'].pop
                           ::Instana::SpanContext.new(
-                            context_from_wire['trace_id'],
-                            context_from_wire['span_id']
+                            trace_id: context_from_wire['trace_id'],
+                            span_id: context_from_wire['span_id']
                           )
                         end
-
-        Instana.tracer.start_or_continue_trace(:'resque-worker', kvs, trace_context) do
-          super(job)
+        span = OpenTelemetry::Trace.non_recording_span(trace_context) if trace_context
+        Trace.with_span(span) do
+          Instana.tracer.in_span(:'resque-worker', attributes: kvs) do |span|
+            super(job)
+          end
         end
       end
     end

data/lib/instana/instrumentation/rest-client.rb

@@ -8,14 +8,14 @@ module Instana
         # Since RestClient uses net/http under the covers, we just
         # provide span visibility here.  HTTP related KVs are reported
         # in the Net::HTTP instrumentation
-        ::Instana.tracer.log_entry(:'rest-client')
+        span = ::Instana.tracer.start_span(:'rest-client', with_parent: OpenTelemetry::Context.current)
 
-        super(&block)
+        Trace.with_span(span) { super(&block) }
       rescue => e
-        ::Instana.tracer.log_error(e)
+        span.record_exception(e)
         raise
       ensure
-        ::Instana.tracer.log_exit(:'rest-client')
+        span.finish
       end
     end
   end

data/lib/instana/instrumentation/sequel.rb

@@ -3,7 +3,7 @@
 module Instana
   module Instrumentation
     module Sequel
-      IGNORED_SQL = %w[BEGIN COMMIT SET].freeze
+      IGNORED_SQL = %w[BEGIN COMMIT SET PRAGMA].freeze
       VERSION_SELECT_STATEMENT = "SELECT VERSION()".freeze
       SANITIZE_REGEXP = /('[\s\S][^']*'|\d*\.\d+|\d+|NULL)/i
 
@@ -26,9 +26,9 @@ module Instana
         ::Instana.config[:sanitize_sql] ? sql.gsub(SANITIZE_REGEXP, '?') : sql
       end
 
-      def maybe_trace(call_payload, &blk)
+      def maybe_trace(call_payload, &block)
         if ::Instana.tracer.tracing? && !ignored?(call_payload)
-          ::Instana.tracer.trace(:sequel, call_payload, &blk)
+          ::Instana.tracer.in_span(:sequel, attributes: call_payload, &block)
         else
           yield
         end

data/lib/instana/instrumentation/shoryuken.rb

@@ -15,7 +15,10 @@ module Instana
         }
 
         context = incomming_context_from(sqs_message.message_attributes)
-        ::Instana.tracer.start_or_continue_trace(:sqs, {sqs: sqs_tags}, context, &block)
+        instana_context = Instana::SpanContext.new(trace_id: context[:trace_id], span_id: context[:span_id], level: context[:level])
+        Trace.with_span(OpenTelemetry::Trace.non_recording_span(instana_context)) do
+          ::Instana.tracer.in_span(:sqs, attributes: {sqs: sqs_tags}, &block)
+        end
       end
 
       private

data/lib/instana/instrumentation/sidekiq-client.rb

@@ -5,11 +5,10 @@ module Instana
   module Instrumentation
     class SidekiqClient
       def call(worker_class, msg, queue, _redis_pool)
-        kv_payload = { :'sidekiq-client' => {} }
-        kv_payload[:'sidekiq-client'][:queue] = queue
-        kv_payload[:'sidekiq-client'][:job] = worker_class.to_s
-        kv_payload[:'sidekiq-client'][:retry] = msg['retry'].to_s
-        ::Instana.tracer.log_entry(:'sidekiq-client', kv_payload)
+        kvs = { :'sidekiq-client' => {} }
+        kvs[:'sidekiq-client'][:queue] = queue
+        kvs[:'sidekiq-client'][:job] = worker_class.to_s
+        kvs[:'sidekiq-client'][:retry] = msg['retry'].to_s
 
         # Temporary until we move connection collection to redis
         # instrumentation
@@ -24,24 +23,27 @@ module Instana
                        else # Unexpected version, continue without recording any redis-url
                          break
                        end
-          kv_payload[:'sidekiq-client'][:'redis-url'] = "#{host}:#{port}"
+          kvs[:'sidekiq-client'][:'redis-url'] = "#{host}:#{port}"
         end
 
-        context = ::Instana.tracer.context
-        if context
-          msg['X-Instana-T'] = context.trace_id_header
-          msg['X-Instana-S'] = context.span_id_header
-        end
+        Instana.tracer.in_span(:'sidekiq-client', attributes: kvs) do |span|
+          context = ::Instana.tracer.context
+          if context
+            msg['X-Instana-T'] = context.trace_id_header
+            msg['X-Instana-S'] = context.span_id_header
+          end
+
+          result = yield
 
-        result = yield
+          if result && result['jid']
+            span.set_tag(:'sidekiq-client', { job_id: result['jid'] })
+          end
 
-        kv_payload[:'sidekiq-client'][:job_id] = result['jid']
-        result
-      rescue => e
-        ::Instana.tracer.log_error(e)
-        raise
-      ensure
-        ::Instana.tracer.log_exit(:'sidekiq-client', kv_payload)
+          result
+        rescue => e
+          span.record_exception(e)
+          raise
+        end
       end
     end
   end