logstash-input-azure_event_hubs 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea227160d8df826c7f951a24a5605710a3fbd29ce2807e9aa7a3350f8670a60c
-  data.tar.gz: 0e8b5aee085c3be22429479f922f07db1ab61c401df0263be26dc4b75811310b
+  metadata.gz: 918f01f6e51772ded08ddf2c4b26c983f9d80467c28be9edf69f7b2e2b7695b8
+  data.tar.gz: 3b653247e953e4d0c7a9ab702c05d05a4f74f8aea8c7d9f24577bdf3e47296ac
 SHA512:
-  metadata.gz: 8f1576187d0066c24c4880762e60abaaf73b33908702fe4cfd51c0e919589e059ac9cf84b9ad8c988a7b698e431cdf6554b96c303da76e712759be40738368e4
-  data.tar.gz: 69cfff27b98ea0a50877b374b862376fcc0a26b983ed167db1ab6e47026096be70591eea4d812cbc2f93cf0fc478033fd91c405b943d4a70e9f24785be22001d
+  metadata.gz: d9381d380185b9782a59234089d7dbbf6bfd9cb1ee8d22a4e27c5cd94693c801f707bf5400cc002be3d8c58c5009d794379f5260cba3a7595efe4232cb34c6f2
+  data.tar.gz: ddcc9852cb7908aae7aa2dc665d9b88d3c8d95c1d9e2d3feaf609e31fe92850e7dcc272daa72f28f0b2da6c4c5bc7c8219e3c7e667321a42474e0b9a03ae7e84

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.5.3
+  - Fix: With `config_mode => 'advanced'`, event hub-specific settings (`initial_position`, `max_batch_size`, `prefetch_count`, `receive_timeout`, `initial_position_look_back`) were being ignored and replaced with global defaults. These settings are now correctly applied per event hub [#104](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/104)
+
+## 1.5.2
+  - Updated JWT dependency [#101](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/101)
+
 ## 1.5.1
   - Updated multiple Java dependencies [#99](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/99)
 

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.3

data/lib/logstash/inputs/azure_event_hubs.rb

@@ -417,12 +417,12 @@ class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
             event_processor_host = create_in_memory_event_processor_host(event_hub, event_hub_name, scheduled_executor_service)
           end
           options = EventProcessorOptions.new
-          options.setMaxBatchSize(max_batch_size)
-          options.setPrefetchCount(prefetch_count)
-          options.setReceiveTimeOut(Duration.ofSeconds(receive_timeout))
+          options.setMaxBatchSize(event_hub['max_batch_size'])
+          options.setPrefetchCount(event_hub['prefetch_count'])
+          options.setReceiveTimeOut(Duration.ofSeconds(event_hub['receive_timeout']))
           
           options.setExceptionNotification(LogStash::Inputs::Azure::ErrorNotificationHandler.new)
-          case @initial_position
+          case event_hub['initial_position']
           when 'beginning'
             msg = "Configuring Event Hub #{event_hub_name} to read events all events."
             @logger.debug("If this is the initial read... " + msg) if event_hub['storage_connection']
@@ -434,10 +434,10 @@ class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
             @logger.info(msg) unless event_hub['storage_connection']
             options.setInitialPositionProvider(EventProcessorOptions::EndOfStreamInitialPositionProvider.new(options))
           when 'look_back'
-            msg = "Configuring Event Hub #{event_hub_name} to read events starting at 'now - #{@initial_position_look_back}' seconds."
+            msg = "Configuring Event Hub #{event_hub_name} to read events starting at 'now - #{event_hub['initial_position_look_back']}' seconds."
             @logger.debug("If this is the initial read... " + msg) if event_hub['storage_connection']
             @logger.info(msg) unless event_hub['storage_connection']
-            options.setInitialPositionProvider(LogStash::Inputs::Azure::LookBackPositionProvider.new(@initial_position_look_back))
+            options.setInitialPositionProvider(LogStash::Inputs::Azure::LookBackPositionProvider.new(event_hub['initial_position_look_back']))
           end
           event_processor_host.registerEventProcessorFactory(LogStash::Inputs::Azure::ProcessorFactory.new(queue, event_hub['codec'], event_hub['checkpoint_interval'], self.method(:decorate), event_hub['decorate_events']), options)
               .when_complete(lambda {|x, e|

data/lib/logstash-input-azure_event_hubs.rb

@@ -20,7 +20,7 @@ require_jar('com.fasterxml.jackson.datatype', 'jackson-datatype-joda', '2.16.2')
 require_jar('com.github.stephenc.jcip', 'jcip-annotations', '1.0-1')
 require_jar('com.google.guava', 'guava', '32.0.1-jre')
 require_jar('com.nimbusds', 'lang-tag', '1.7')
-require_jar('com.nimbusds', 'nimbus-jose-jwt', '9.37.2')
+require_jar('com.nimbusds', 'nimbus-jose-jwt', '10.0.2')
 require_jar('com.nimbusds', 'oauth2-oidc-sdk', '8.36.2')
 require_jar('com.squareup.okhttp3', 'logging-interceptor', '4.12.0')
 require_jar('com.squareup.okhttp3', 'okhttp-urlconnection', '4.12.0')

data/spec/inputs/azure_event_hub_spec.rb

@@ -175,34 +175,59 @@ describe LogStash::Inputs::AzureEventHubs do
                 # same named event hub with different configuration is allowed
                 {'event_hub_name0' => {
                     'event_hub_connection' => 'Endpoint=sb://...',
+                    'storage_connection' => 'DefaultEndpointsProtocol=https;AccountName=...',
                     'consumer_group' => 'ls'}}
             ],
             'codec' => 'plain',
             'consumer_group' => 'default_consumer_group',
             'max_batch_size' => 21,
+            'prefetch_count' => 250,
+            'receive_timeout' => 90,
+            'initial_position' => 'beginning',
+            'initial_position_look_back' => 7200,
+            'checkpoint_interval' => 15,
+            'decorate_events' => false,
             'threads' => 9
         }
       end
       it_behaves_like "an exploded Event Hub config", 1
-      it "it explodes the 2cnd advanced config event hub correctly" do
+
+      it "it explodes the second advanced config event hub correctly (with individual and inherited settings)" do
         exploded_config = input.event_hubs_exploded
         expect(exploded_config[1]['event_hubs'].size).to be == 1 #always 1 in the exploded form
         expect(exploded_config[1]['event_hubs'][0]).to eql('event_hub_name1')
         expect(exploded_config[1]['event_hub_connections'][0].value).to eql('1Endpoint=sb://...')
         expect(exploded_config[1]['storage_connection'].value).to eql('1DefaultEndpointsProtocol=https;AccountName=...')
         expect(exploded_config[1]['threads']).to be == 9
-        expect(exploded_config[1]['codec'].class.to_s).to eq("LogStash::Codecs::JSON") # different between configs
-        expect(exploded_config[1]['consumer_group']).to eql('cg1') # override global
-        expect(exploded_config[1]['max_batch_size']).to be == 21 # filled from global
-        expect(exploded_config[1]['prefetch_count']).to be == 300 # default
+        expect(exploded_config[1]['codec'].class.to_s).to eq("LogStash::Codecs::JSON")
+        expect(exploded_config[1]['consumer_group']).to eql('cg1')
+        expect(exploded_config[1]['max_batch_size']).to be == 21
+        expect(exploded_config[1]['prefetch_count']).to be == 250
         expect(exploded_config[1]['receive_timeout']).to be == 41
         expect(exploded_config[1]['initial_position']).to eql('end')
-        expect(exploded_config[1]['initial_position_look_back']).to be == 86400 # default
+        expect(exploded_config[1]['initial_position_look_back']).to be == 7200
         expect(exploded_config[1]['checkpoint_interval']).to be == 61
         expect(exploded_config[1]['decorate_events']).to be_falsy
         expect(exploded_config[1]['storage_container']).to eq('alt_container')
       end
 
+      it "it explodes the third advanced config event hub correctly (mostly inherited settings)" do
+        exploded_config = input.event_hubs_exploded
+        expect(exploded_config[2]['event_hubs'].size).to be == 1
+        expect(exploded_config[2]['event_hubs'][0]).to eql('event_hub_name0')
+        expect(exploded_config[2]['event_hub_connections'][0].value).to eql('Endpoint=sb://...')
+        expect(exploded_config[2]['storage_connection'].value).to eql('DefaultEndpointsProtocol=https;AccountName=...')
+        expect(exploded_config[2]['threads']).to be == 9
+        expect(exploded_config[2]['codec'].class.to_s).to eq("LogStash::Codecs::Plain")
+        expect(exploded_config[2]['consumer_group']).to eql('ls')
+        expect(exploded_config[2]['max_batch_size']).to be == 21
+        expect(exploded_config[2]['prefetch_count']).to be == 250
+        expect(exploded_config[2]['receive_timeout']).to be == 90
+        expect(exploded_config[2]['initial_position']).to eql('beginning')
+        expect(exploded_config[2]['initial_position_look_back']).to be == 7200
+        expect(exploded_config[2]['checkpoint_interval']).to be == 15
+      end
+
       it "it runs the Event Processor Host" do
         mock_queue = double("queue")
         mock_host = double("event_processor_host")

metadata

@@ -1,22 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-azure_event_hubs
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Elastic
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-03 00:00:00.000000000 Z
+date: 2025-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logstash-core-plugin-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  name: logstash-core-plugin-api
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,12 +24,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-plain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-plain
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -39,12 +38,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: logstash-codec-json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: logstash-codec-json
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -53,12 +52,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: stud
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.22
-  name: stud
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,12 +66,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.22
 - !ruby/object:Gem::Dependency
+  name: logstash-devutils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-  name: logstash-devutils
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -121,7 +120,7 @@ files:
 - vendor/jar-dependencies/com/microsoft/azure/qpid-proton-j-extensions/1.2.4/qpid-proton-j-extensions-1.2.4.jar
 - vendor/jar-dependencies/com/microsoft/rest/client-runtime/1.7.3/client-runtime-1.7.3.jar
 - vendor/jar-dependencies/com/nimbusds/lang-tag/1.7/lang-tag-1.7.jar
-- vendor/jar-dependencies/com/nimbusds/nimbus-jose-jwt/9.37.2/nimbus-jose-jwt-9.37.2.jar
+- vendor/jar-dependencies/com/nimbusds/nimbus-jose-jwt/10.0.2/nimbus-jose-jwt-10.0.2.jar
 - vendor/jar-dependencies/com/nimbusds/oauth2-oidc-sdk/8.36.2/oauth2-oidc-sdk-8.36.2.jar
 - vendor/jar-dependencies/com/squareup/okhttp3/logging-interceptor/4.12.0/logging-interceptor-4.12.0.jar
 - vendor/jar-dependencies/com/squareup/okhttp3/okhttp-urlconnection/4.12.0/okhttp-urlconnection-4.12.0.jar
@@ -144,7 +143,6 @@ licenses:
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,8 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: Consumes events from Azure Event Hubs for use with Logstash
 test_files: