instana 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ed5be149509491e2aca498aad54181889c7cfc2cf8e0e51a6efcc34536e8379
-  data.tar.gz: 9d03560bb1a9524d95ab63f93073e08dcfccb41fe5f3dede35a857aa7e2b4ed9
+  metadata.gz: f74b1ab7c25266cacf29645d4c956432ded64f2eb127a0bf712d1d5e7a659ad3
+  data.tar.gz: 0d1747acb3f742d8e8a103a154f14a0470d908837d2c286dbbc5a096afe3e59b
 SHA512:
-  metadata.gz: 449410b9cbacaa8e6e622cc2e0db673155f656095d6927fad27c8ed14b14f783821ecdd31579f4beeefd32c0fe5e7061644e2d709f67614f915b66f666518945
-  data.tar.gz: 27e52307782096e8e8fc90ff67adfbc11a146f40f0a2fcf3b11d7ba695e9cd5b0201ffc4edcac8de34ec090c48867aa1cd9ac00c0d1e4ada978b9c7fe285d645
+  metadata.gz: 507b17514d60c8363a510c7867fbbc4b7fd7e21ebb13310e64f6fb73af21068b11de601974240ede3e489e5165bc38def5558b0218b10cc8b9c6f10b20849c23
+  data.tar.gz: bc50d01dfbd66fb31a6b2958d7185047869ccb03e2f70e246254f054cf56d9f093eff00ac3db3ccf8c785e0fd701d404f261e1d2a3447ecbf28c0b340995af17

data/lib/instana/backend/host_agent_reporting_observer.rb

@@ -11,7 +11,7 @@ module Instana
       TRACES_DATA_URL = "/com.instana.plugin.ruby/traces.%i".freeze
       TRACE_METRICS_URL = "/tracermetrics".freeze
 
-      attr_reader :report_timer
+      attr_reader :metrics_timer, :traces_timer
 
       # @param [RequestClient] client used to make requests to the backend
       # @param [Concurrent::Atom] discovery object used to store discovery response in
@@ -19,22 +19,51 @@ module Instana
         @client = client
         @discovery = discovery
         @logger = logger
-        @report_timer = timer_class.new(execution_interval: 1, run_now: true) { report_to_backend }
+        @timer_class = timer_class
         @nonce = Time.now
         @processor = processor
+
+        # Initialize timers with default 1 second interval
+        @metrics_timer = @timer_class.new(execution_interval: 1, run_now: true) { report_metrics_to_backend }
+        @traces_timer = @timer_class.new(execution_interval: 1, run_now: true) { report_traces_to_backend }
       end
 
       def update(time, _old_version, new_version)
         return unless time > @nonce
 
         @nonce = time
-        new_version.nil? ? @report_timer.shutdown : @report_timer.execute
+
+        if new_version.nil?
+          @metrics_timer&.shutdown
+          @traces_timer&.shutdown
+        else
+          # Read poll_rate from discovery payload - it's nested under plugin.ruby.poll_rate
+          discovery = @discovery.value
+          poll_rate = discovery&.dig('plugin', 'ruby', 'poll_rate') || 1
+
+          # Only recreate metrics_timer if poll_rate is different from current interval
+          if @metrics_timer.nil? || @metrics_timer.execution_interval != poll_rate
+            @metrics_timer&.shutdown
+            @metrics_timer = @timer_class.new(execution_interval: poll_rate, run_now: true) { report_metrics_to_backend }
+          end
+          @metrics_timer.execute
+
+          # Traces timer always uses 1 second interval
+          @traces_timer&.shutdown
+          @traces_timer = @timer_class.new(execution_interval: 1, run_now: true) { report_traces_to_backend }
+          @traces_timer.execute
+        end
       end
 
       private
 
-      def report_to_backend
+      def report_metrics_to_backend
         report_metrics if ::Instana.config[:metrics][:enabled]
+      rescue StandardError => e
+        @logger.error(%(#{e}\n#{e.backtrace.join("\n")}))
+      end
+
+      def report_traces_to_backend
         report_traces if ::Instana.config[:tracing][:enabled]
         report_trace_stats if ::Instana.config[:tracing][:enabled]
       rescue StandardError => e

data/lib/instana/backend/request_client.rb

@@ -38,7 +38,10 @@ module Instana
         timeout = Integer(ENV.fetch('INSTANA_TIMEOUT', 500))
         @host = host
         @port = port
-        @client = Net::HTTP.start(host, port, use_ssl: use_ssl, read_timeout: timeout)
+        @use_ssl = use_ssl
+        @timeout = timeout
+        @client_mutex = Mutex.new
+        @client = nil
       end
 
       # Send a request to the backend. If data is a {Hash},
@@ -60,7 +63,10 @@ module Instana
                  data
                end
         begin
-          response = @client.send_request(method, path, body, headers)
+          response = @client_mutex.synchronize do
+            ensure_connection
+            @client.send_request(method, path, body, headers)
+          end
           Response.new(response)
         rescue Errno::ECONNREFUSED => e
           Instana.logger.debug("Connection refused to #{@host}:#{@port} - #{e.message}")
@@ -74,6 +80,11 @@ module Instana
         rescue SocketError => e
           Instana.logger.debug("Socket error connecting to #{@host}:#{@port} - #{e.message}")
           create_error_response('502', 'Socket Error', 'Socket error', e.message)
+        rescue IOError => e
+          Instana.logger.debug("IO error sending request to #{@host}:#{@port} - #{e.message}")
+          # Reset connection on IO errors and retry once
+          @client_mutex.synchronize { reset_connection }
+          create_error_response('500', 'IO Error', 'IOError', e.message)
         rescue StandardError => e
           Instana.logger.debug("Error sending request to #{@host}:#{@port} - #{e.class}: #{e.message}")
           create_error_response('500', 'Internal Error', e.class.to_s, e.message)
@@ -82,6 +93,22 @@ module Instana
 
       private
 
+      def ensure_connection
+        return if @client && !@client.instance_variable_get(:@socket).nil?
+
+        reset_connection
+        @client = Net::HTTP.start(@host, @port, use_ssl: @use_ssl, read_timeout: @timeout)
+      end
+
+      def reset_connection
+        begin
+          @client&.finish
+        rescue
+          nil
+        end
+        @client = nil
+      end
+
       def encode_body(data)
         # :nocov:
         INSTANA_USE_OJ ? Oj.dump(data, mode: :strict) : JSON.dump(data)

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/util.rb

@@ -27,25 +27,25 @@ module Instana
       def take_snapshot
         data = {}
 
-        data[:sensorVersion] = ::Instana::VERSION
-        data[:ruby_version] = RUBY_VERSION
+        data[:sensorVersion] = ::Instana::VERSION.dup
+        data[:ruby_version] = RUBY_VERSION.dup
         data[:rpl] = RUBY_PATCHLEVEL if defined?(RUBY_PATCHLEVEL)
 
         # Framework Detection
         if defined?(::RailsLts::VERSION)
-          data[:framework] = "Rails on Rails LTS-#{::RailsLts::VERSION}"
+          data[:framework] = "Rails on Rails LTS-#{::RailsLts::VERSION}".dup
 
         elsif defined?(::Rails.version)
-          data[:framework] = "Ruby on Rails #{::Rails.version}"
+          data[:framework] = "Ruby on Rails #{::Rails.version}".dup
 
         elsif defined?(::Grape::VERSION)
-          data[:framework] = "Grape #{::Grape::VERSION}"
+          data[:framework] = "Grape #{::Grape::VERSION}".dup
 
         elsif defined?(::Padrino::VERSION)
-          data[:framework] = "Padrino #{::Padrino::VERSION}"
+          data[:framework] = "Padrino #{::Padrino::VERSION}".dup
 
         elsif defined?(::Sinatra::VERSION)
-          data[:framework] = "Sinatra #{::Sinatra::VERSION}"
+          data[:framework] = "Sinatra #{::Sinatra::VERSION}".dup
         end
 
         # Report Bundle
@@ -53,7 +53,7 @@ module Instana
           data[:versions] = {}
 
           Gem.loaded_specs.each do |k, v|
-            data[:versions][k] = v.version.to_s
+            data[:versions][k.dup] = v.version.to_s.dup
           end
         end
 

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "2.6.0"
+  VERSION = "2.7.0"
   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.7.0
 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.11
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files: []