logstash-output-azure_service_bus 0.3.3 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00ca92128e4c0d68fdd5184c52a693b06b5b4dba3c6d4e788e125a4f3938c5ad
-  data.tar.gz: 4bf58b704a0aa7b30d30980f4af08b050dd6d26e01fa4d047038987a9f1ca4a3
+  metadata.gz: 471a18d0fdea0bf6c21bdd48db014c8d30cb479c2b5200eac4f831d13b1d4038
+  data.tar.gz: 06aa88159a5f0966c47dfee28876fe380c3f19d6858a1f14190a71584b366641
 SHA512:
-  metadata.gz: b36ba705d6c21811f6b9972faa894b9bd69bf5aa6ff71c2ee396c5c25ddc07ba185e31996abaaae2038aa3800ca0c3e8d08d0f759ec0a7a47123aa32a1a89ce8
-  data.tar.gz: fbb975e48bb80167b3a15d6da7801c32df42b04346b2df3bf0f17ecdd150a84c454911e1cfdb15a8fd481aab00d93e9b18d6eb29f42326c4eac8033f80c9983f
+  metadata.gz: ec4141fb080e65c35e2db12c59725cab3f62bfe78baac6fa7eb1ab4fb7e303fe48f40657bf82911e32af017e5e34fc472d0ab0be9efc3c9442d65820a515a2e8
+  data.tar.gz: 7db1ae28aaf1628f2ea39e048fc2e564eabcbc554006af062dbe0dc5cb9394ac5068dce209265506dd6f7ab4f7b9c8bdcbb7dda50af304b9562912dfd4c8c433

data/lib/logstash/outputs/azure_service_bus.rb

@@ -18,18 +18,21 @@ class LogStash::Outputs::AzureServiceBus < LogStash::Outputs::Base
       interval: 1,
       interval_randomness: 0.5,
       backoff_factor: 2,
-      exceptions: [Faraday::ConnectionFailed, Faraday::TimeoutError, Faraday::RetriableResponse, Errno::ECONNRESET],
+      exceptions: [Faraday::ConnectionFailed, Faraday::TimeoutError, Faraday::RetriableResponse, Faraday::SSLError],
       methods: [], # Empty -> all methods
       retry_statuses: [401, 403, 404, 410, 429, 500], # https://docs.microsoft.com/en-us/rest/api/servicebus/send-message-batch#response-codes
       retry_block: lambda do |env, _options, _retries, exception|
         if env.status.nil?
-          @logger.warn("Problem (#{exception}) for #{env.method.upcase} #{env.url}")
+          @logger.warn("Problem while sending message(s) to Service Bus: #{exception.inspect}")
         else
-          @logger.warn("Problem (HTTP #{env.status}) for #{env.method.upcase} #{env.url}")
+          @logger.warn("Problem while sending message(s) to Service Bus: HTTP #{env.status}")
+          if env.status == 401
+            refresh_access_token
+            env.request_headers['Authorization'] = "Bearer #{@access_token}"
+          end
         end
       end,
-      retry_if: lambda do |env, _exc|
-        refresh_access_token if env.status == 401
+      retry_if: lambda do |_env, _exc|
         true # Always retry
       end
     }
@@ -68,30 +71,31 @@ class LogStash::Outputs::AzureServiceBus < LogStash::Outputs::Base
     end
   rescue StandardError => e
     # Hopefully we never make it here and "throw away" messages since we have an agressive retry strategy.
-    @logger.error("Error (#{e}) while sending message to Service Bus")
+    @logger.error("Error while sending message(s) to Service Bus: #{e.inspect}")
   else
     if response.status == 201
       @logger.debug("Sent #{messages.length} message(s) to Service Bus")
     else
-      @logger.error("Error while sending message to Service Bus: HTTP #{response.status}")
+      @logger.error("Error while sending message(s) to Service Bus: HTTP #{response.status}")
     end
   end
 
   def refresh_access_token
-    @logger.info('Refreshing Azure access token')
+    @logger.info('Refreshing Azure access token...')
     begin
       response = Faraday.get('http://169.254.169.254/metadata/identity/oauth2/token', { 'api-version' => '2018-02-01', 'resource' => 'https://servicebus.azure.net/' }) do |req|
         req.headers = { 'Metadata' => 'true' }
-        req.options.timeout = 4
+        req.options.timeout = 10
       end
     rescue StandardError => e # We just catch everything and move on since @service_bus_conn will handle retries.
-      @logger.error("Error while fetching access token: #{e}")
+      @logger.error("Error while fetching access token: #{e.inpsect}")
     else
       if response.status == 200
         data = JSON.parse(response.body)
         @access_token = data['access_token']
+        @logger.info('Successfully refreshed Azure access token')
       else
-        @logger.error("HTTP error when fetching access token: #{response.body}")
+        @logger.error("Error while fetching access token: HTTP #{response.status}")
       end
     end
   end

data/logstash-output-azure_service_bus.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-azure_service_bus'
-  s.version       = '0.3.3'
+  s.version       = '0.3.6'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Send Logstash messages to Azure Service Bus.'
   s.homepage      = 'https://github.com/gharryg/logstash-output-azure_service_bus'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-azure_service_bus
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.6
 platform: ruby
 authors:
 - Harrison Golden