instana 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ed5be149509491e2aca498aad54181889c7cfc2cf8e0e51a6efcc34536e8379
-  data.tar.gz: 9d03560bb1a9524d95ab63f93073e08dcfccb41fe5f3dede35a857aa7e2b4ed9
+  metadata.gz: f8cd4b0e98fe6e6e7314e25e8632fd6cf148727a9fc5b411006cab2b990b037f
+  data.tar.gz: d13279637479775cc232484244f7925185e6dc9b4d52e7f0958e5a28fb463917
 SHA512:
-  metadata.gz: 449410b9cbacaa8e6e622cc2e0db673155f656095d6927fad27c8ed14b14f783821ecdd31579f4beeefd32c0fe5e7061644e2d709f67614f915b66f666518945
-  data.tar.gz: 27e52307782096e8e8fc90ff67adfbc11a146f40f0a2fcf3b11d7ba695e9cd5b0201ffc4edcac8de34ec090c48867aa1cd9ac00c0d1e4ada978b9c7fe285d645
+  metadata.gz: 5610b490b1f2b4499eb78b94dbf02e2bae0247ae7efeb17207a97f68f82352d320d016e8753df3ea8f3a09c70e8eac6725c9b981eab658877f1ddee6d666a550
+  data.tar.gz: 9d5f1f0511c4ee11fe3e32c35f70caa51b0c29aefa8dd5f0149ea305dc0d5df15d57e60db80a3f90f7951a38cdae292dbebf9e16225c408c87841274197a6b27

data/lib/instana/instrumentation/aws_sdk_sqs.rb

@@ -26,7 +26,7 @@ module Instana
             response = @handler.call(context)
 
             span_tags[:queue] = response.queue_url if response.respond_to?(:queue_url)
-            span.set_tags(sqs: span_tags)
+            span.add_attributes(sqs: span_tags)
 
             response
           end

data/lib/instana/instrumentation/grpc.rb

@@ -35,11 +35,11 @@ module Instana
             super(method, *others, **options)
           rescue => e
             kvs[:rpc][:error] = true
-            current_span.set_tags(kvs)
+            current_span.add_attributes(kvs)
             current_span.record_exception(e)
             raise
           ensure
-            current_span.finish
+            current_span&.finish
           end
         end
       end
@@ -79,11 +79,11 @@ module Instana
             super(active_call, mth, *others)
           rescue => e
             kvs[:rpc][:error] = true
-            current_span.set_tags(kvs)
+            current_span.add_attributes(kvs)
             current_span.record_exception(e)
             raise
           ensure
-            current_span.finish if ::Instana.tracer.tracing?
+            current_span&.finish
           end
         end
       end

data/lib/instana/instrumentation/mongo.rb

@@ -25,7 +25,7 @@ module Instana
 
     def failed(event)
       span = @requests.delete(event.request_id)
-      span.add_error(Exception.new(event.message))
+      span.record_exception(Exception.new(event.message))
 
       span.finish
     end

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

@@ -63,7 +63,7 @@ module Instana
         current_span&.record_exception(e)
         raise
       ensure
-        current_span&.set_tags(kv_payload)
+        current_span&.add_attributes(kv_payload)
         current_span&.finish unless do_skip
       end
 

data/lib/instana/instrumentation/rack.rb

@@ -122,7 +122,7 @@ module Instana
 
     def finalize_trace(current_span, kvs, headers, trace_context)
       set_response_headers(headers, trace_context) if headers
-      current_span.set_tags(kvs)
+      current_span.add_attributes(kvs)
       OpenTelemetry::Context.detach(@trace_token) if @trace_token
       current_span.finish
     end

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

@@ -36,7 +36,7 @@ module Instana
           result = yield
 
           if result && result['jid']
-            span.set_tag(:'sidekiq-client', { job_id: result['jid'] })
+            span.set_attribute(:'sidekiq-client', { job_id: result['jid'] })
           end
 
           result

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

@@ -43,7 +43,7 @@ module Instana
             yield
           rescue => e
             kvs[:'sidekiq-worker'][:error] = true
-            span.set_tags(kvs)
+            span.add_attributes(kvs)
             span.record_exception(e)
             raise
           end

data/lib/instana/trace/span.rb

@@ -67,7 +67,7 @@ module Instana
       else
         configure_custom(name)
       end
-      set_tags(attributes)
+      add_attributes(attributes)
       ::Instana.processor.on_start(self)
       # Attach a backtrace to all exit spans
       add_stack if should_collect_stack_trace?
@@ -450,8 +450,7 @@ module Instana
     #
     # @return [self] returns itself
     def set_attribute(key, value)
-      @attributes ||= {}
-      @attributes[key] = value
+      set_tag(key, value)
       self
     end
     # alias []= set_attribute
@@ -470,8 +469,11 @@ module Instana
     #
     # @return [self] returns itself
     def add_attributes(attributes)
-      @attributes ||= {}
-      @attributes.merge!(attributes)
+      return unless attributes.is_a?(Hash)
+
+      attributes.each do |k, v|
+        set_tag(k, v)
+      end
       self
     end
 

data/lib/instana/trace/tracer.rb

@@ -124,7 +124,7 @@ module Instana
                             Span.new(name)
                           end
 
-      current_span.set_tags(kvs) unless kvs.empty?
+      current_span.add_attributes(kvs) unless kvs.empty?
       current_span
     end
 
@@ -142,7 +142,7 @@ module Instana
                  else
                    Span.new(name, child_of)
                  end
-      new_span.set_tags(kvs) if kvs
+      new_span.add_attributes(kvs) if kvs
       self.current_span = new_span
     end
 
@@ -153,7 +153,7 @@ module Instana
     def log_info(kvs)
       return unless current_span
 
-      current_span.set_tags(kvs)
+      current_span.add_attributes(kvs)
     end
 
     # Add an error to the current span
@@ -181,7 +181,7 @@ module Instana
         @logger.warn "Span mismatch: Attempt to end #{name} span but #{current_span.name} is active."
       end
 
-      current_span.set_tags(kvs)
+      current_span.add_attributes(kvs)
       current_span.close
 
       self.current_span = current_span.parent || nil
@@ -203,7 +203,7 @@ module Instana
         @logger.warn "Span mismatch: Attempt to end #{name} span but #{current_span.name} is active."
       end
 
-      current_span.set_tags(kvs)
+      current_span.add_attributes(kvs)
       current_span.close(end_time)
       self.current_span = nil
     end
@@ -225,7 +225,7 @@ module Instana
       return unless tracing?
 
       new_span = Span.new(name, current_span)
-      new_span.set_tags(kvs) unless kvs.empty?
+      new_span.add_attributes(kvs) unless kvs.empty?
       new_span
     end
 
@@ -235,7 +235,7 @@ module Instana
     # @param span [Span] the span for this Async op (previously returned from `log_async_entry`)
     #
     def log_async_info(kvs, span)
-      span.set_tags(kvs)
+      span.add_attributes(kvs)
     end
 
     # Add an error to an asynchronous span
@@ -254,7 +254,7 @@ module Instana
     # @param span [Span] the span for this Async op (previously returned from `log_async_entry`)
     #
     def log_async_exit(_name, kvs, span)
-      span.set_tags(kvs) unless kvs.empty?
+      span.add_attributes(kvs) unless kvs.empty?
       span.close
     end
 
@@ -323,7 +323,7 @@ module Instana
     #   with_parent=current context, start_timestamp=current time.
     #
     def start_span(name, with_parent: nil, attributes: nil, links: nil, start_timestamp: ::Instana::Util.now_in_ms, kind: nil) # rubocop:disable Metrics/ParameterLists
-      return if !::Instana.agent.ready? || !::Instana.config[:tracing][:enabled]
+      return Instana::Trace.non_recording_span(with_parent) if !::Instana.agent.ready? || !::Instana.config[:tracing][:enabled]
 
       with_parent ||= OpenTelemetry::Context.current
       name ||= 'empty'

data/lib/instana/trace.rb

@@ -63,7 +63,7 @@ module Instana
     #
     # @return [Span]
     def non_recording_span(span_context)
-      Span.new(span_context: span_context)
+      OpenTelemetry::Trace::Span.new(span_context: span_context)
     end
   end
 end

data/lib/instana/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -362,7 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files: []