instana 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 465f9dad91e0e60f443e196091b1b725ed012094a5da4f8d0d9a8c525ba4b0de
-  data.tar.gz: e5c17ed36acd2197cbbc6e83a2c44b64562c7bd1785854fc4e2120fb01a99d3f
+  metadata.gz: 40aac99d17c0ed83570261a6a6a6c7a6900c7d44e24b2370476ce722c0642890
+  data.tar.gz: 76ed9ab5fafa402e0783f67928807dc435d94c84d6f32418d71eeb3fb590bf76
 SHA512:
-  metadata.gz: ef5f5fe6ff3272ac729be2d1b36f9653a06ab8bc8393e15e897712558c0c09258a8730f08e1ef8f8d7503e8e6168c177afc5c98609616ec5ba9bbdf9aa3a42b5
-  data.tar.gz: aba66786130415c9154453bb7daf853ffa976c7b048cdf15985706b778ee92dad8d963ff02040228c79f22c08f67a0ca9099af90439a99217420b99549632040
+  metadata.gz: eedd8d0ffdd1b66b2ce7733659fd31c6e1bab2c28b5c7afca00efc53a73b869d65a7cab27e107f61643fb128d871c750d0190cf568a9b6eec579fe6f8c7edf4a
+  data.tar.gz: 975ca25c4523771df6a70bd6a4e8bf3bb6164edcd90661e681d5bfc0c1747c9852ec2eef07a24502ccecad132462f697171a17dd2947133f5d8fbbc42e070562

data/lib/instana/backend/host_agent_activation_observer.rb

@@ -25,9 +25,9 @@ module Instana
       def update(_time, _old_version, new_version)
         return unless new_version.nil?
 
-        socket = @socket_proc.call(@client)
-
+        socket = nil
         try_forever_with_backoff do
+          socket = @socket_proc.call(@client)
           payload = discovery_payload(socket)
           discovery_response = @client.send_request('PUT', DISCOVERY_URL, payload)
 
@@ -45,7 +45,7 @@ module Instana
           ::Instana.config.read_config_from_agent(discovery)
         end
 
-        socket.close
+        socket&.close
       end
 
       private

data/lib/instana/backend/host_agent_reporting_observer.rb

@@ -64,8 +64,8 @@ module Instana
           response = @client.send_request('POST', path, spans)
 
           unless response.ok?
-            @logger.debug("Sent `#{spans.count}` spans to `#{path}` and got `#{response.code}`.")
-            @discovery.swap { nil }
+            @logger.warn("Failed to send `#{spans.count}` spans to `#{path}`. Response: #{response.code} - #{response.body}")
+            trigger_rediscovery
             break
           end
         end
@@ -82,8 +82,8 @@ module Instana
         if response.ok?
           handle_agent_tasks(response, discovery) unless response.body.empty?
         else
-          @logger.debug("Sent `#{payload}` to `#{path}` and got `#{response.code}`.")
-          @discovery.swap { nil }
+          @logger.warn("Failed to send metrics to `#{path}`. Response: #{response.code} - #{response.body}")
+          trigger_rediscovery
         end
       end
 
@@ -125,6 +125,11 @@ module Instana
 
         payload
       end
+
+      def trigger_rediscovery
+        @discovery.swap { nil }
+        ::Instana.agent.announce
+      end
     end
   end
 end

data/lib/instana/backend/request_client.rb

@@ -59,9 +59,25 @@ module Instana
 
                  data
                end
-
-        response = @client.send_request(method, path, body, headers)
-        Response.new(response)
+        begin
+          response = @client.send_request(method, path, body, headers)
+          Response.new(response)
+        rescue Errno::ECONNREFUSED => e
+          Instana.logger.debug("Connection refused to #{@host}:#{@port} - #{e.message}")
+          create_error_response('503', 'Connection Refused', 'Connection refused', e.message)
+        rescue Errno::EHOSTUNREACH => e
+          Instana.logger.debug("Host unreachable #{@host}:#{@port} - #{e.message}")
+          create_error_response('503', 'Host Unreachable', 'Host unreachable', e.message)
+        rescue Errno::ETIMEDOUT, Net::OpenTimeout, Net::ReadTimeout => e
+          Instana.logger.debug("Timeout connecting to #{@host}:#{@port} - #{e.message}")
+          create_error_response('408', 'Request Timeout', 'Timeout', e.message)
+        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 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)
+        end
       end
 
       private
@@ -71,6 +87,19 @@ module Instana
         INSTANA_USE_OJ ? Oj.dump(data, mode: :strict) : JSON.dump(data)
         # :nocov:
       end
+
+      def create_error_response(code, message, error_type, error_message)
+        # Create a mock response object that behaves like Net::HTTPResponse
+        error_response = Object.new
+        error_body = JSON.dump(error: error_type, message: error_message)
+
+        error_response.define_singleton_method(:code) { code }
+        error_response.define_singleton_method(:message) { message }
+        error_response.define_singleton_method(:body) { error_body }
+        error_response.define_singleton_method(:is_a?) { |klass| klass == Net::HTTPResponse || super(klass) }
+
+        Response.new(error_response)
+      end
     end
   end
 end

data/lib/instana/trace/span.rb

@@ -87,13 +87,13 @@ module Instana
 
       @attributes[:stack] = stack
                             .map do |call|
-                              file, line, *method = call.split(':')
+        file, line, *method = call.split(':')
 
-                              {
-                                c: file,
-                                n: line,
-                                m: method.join(' ')
-                              }
+        {
+          c: file,
+          n: line,
+          m: method.join(' ')
+        }
       end.take([limit, 40].min)
     end
 

data/lib/instana/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.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.7
+rubygems_version: 4.0.8
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files: []