logstash-output-azure_service_bus 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99f5b7844333f0e0e448661e5b4930cd5b8aea8a906d755e510020d69d24b2f1
-  data.tar.gz: 2a20f0f16747837014bec3671d873b6ea3a935379681a531c215a7d2ea691131
+  metadata.gz: c3ec4e870e1468a85580e2818896b9469a4113e8f6a021b1dd2b3e499b81a624
+  data.tar.gz: 158011583fa027e9976596ce9704c82e30c2507e7a65bd806e5cea7052589103
 SHA512:
-  metadata.gz: 3c4b5f891428d656e9ab0fba91a4c627b0f6dec11dc2d17f35d2917dd6304edf6029db5a36e6a49796171ad7b8a53efdb752c7e18ff5549ae193eda099618dc1
-  data.tar.gz: 83c8083226b583d344624e7621ac77df50dab3df6e86b8e32946ebb767d19a0a7f4c69ebcda28a79aa83748f102ad0f0f6132e0505bf2851ac62d9a36a1817f2
+  metadata.gz: 1e407a73289679319f6a96c26915f144a1288a0ed09340dc76c9393d57b692eea419024ceec76ad65418171634e1828344a4d4108d0da2be0a1ddbe9a9833ead
+  data.tar.gz: df7845a5345202913517bc10ddc1233d4b7887a66ad074bf909aab6b70ec51d7527b69391067017f48976bb6016e90bb88703402ec4268da13617ae34afcbdca

data/lib/logstash/outputs/azure_service_bus.rb

@@ -26,10 +26,13 @@ class LogStash::Outputs::AzureServiceBus < LogStash::Outputs::Base
           @logger.warn("Problem (#{exception}) for #{env.method.upcase} #{env.url}")
         else
           @logger.warn("Problem (HTTP #{env.status}) for #{env.method.upcase} #{env.url}")
+          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
     }
@@ -70,7 +73,7 @@ class LogStash::Outputs::AzureServiceBus < LogStash::Outputs::Base
     # 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")
   else
-    if response.status == 200
+    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}")
@@ -78,11 +81,11 @@ class LogStash::Outputs::AzureServiceBus < LogStash::Outputs::Base
   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', params: { 'api-version' => '2018-02-01', 'resource' => 'https://servicebus.azure.net/' }) do |req|
+      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}")
@@ -90,6 +93,7 @@ class LogStash::Outputs::AzureServiceBus < LogStash::Outputs::Base
       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}")
       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.1'
+  s.version       = '0.3.4'
   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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-azure_service_bus
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors:
 - Harrison Golden
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-18 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement