instana 2.6.1 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8cd4b0e98fe6e6e7314e25e8632fd6cf148727a9fc5b411006cab2b990b037f
-  data.tar.gz: d13279637479775cc232484244f7925185e6dc9b4d52e7f0958e5a28fb463917
+  metadata.gz: f74b1ab7c25266cacf29645d4c956432ded64f2eb127a0bf712d1d5e7a659ad3
+  data.tar.gz: 0d1747acb3f742d8e8a103a154f14a0470d908837d2c286dbbc5a096afe3e59b
 SHA512:
-  metadata.gz: 5610b490b1f2b4499eb78b94dbf02e2bae0247ae7efeb17207a97f68f82352d320d016e8753df3ea8f3a09c70e8eac6725c9b981eab658877f1ddee6d666a550
-  data.tar.gz: 9d5f1f0511c4ee11fe3e32c35f70caa51b0c29aefa8dd5f0149ea305dc0d5df15d57e60db80a3f90f7951a38cdae292dbebf9e16225c408c87841274197a6b27
+  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/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.1"
+  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.1
+  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.10
+rubygems_version: 4.0.11
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files: []