logstash-input-azure_event_hubs 1.5.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7436196eedeb1531011fbdc98262e106289899ca93f2dc5e26f1108ff61226e8
-  data.tar.gz: 41448d0feb43df207d8243c277ba466a687b0d6d1e379fcd4e71971d3e55e55d
+  metadata.gz: a3ed54d0aa0e98d074604c3f721a744a143f50cc2db0e6d220afa0307d6b68c5
+  data.tar.gz: 24d56cc39fb8d0b84b821e2d718c1b72dedc27a4983ab9d9226a64a94a4fd617
 SHA512:
-  metadata.gz: 6d3c2805330f655dbb1df9f96c7795f730fc1527592aa04fb9dd55d949b045f601efa101e748b7dfafd14e8dd76e8797452b37e612259959ca29d9cc5c799bf0
-  data.tar.gz: 255de80167c26d245ae75269606c2abe7fed3c61c3f6e1178f32c865d7dd7804f58afc7fcab6a951c04fff980e2047d16fce6b5448f09cef8ed19d6fe2b8f762
+  metadata.gz: 6fd88ed864d7ccba9dcff6f873782f337e289d353be2c1417afe10984a447573bf313f45316178ba6c280a1bbf29df7daf31dab1b79835c9115da3a71976e34d
+  data.tar.gz: 82d9aeee2e665fc3c1dccf7952726560ff823fb9de74a743423e0b695c8b649dfa2a18ea2768cb6d91e7c96adb678336b5aac68ff31eb419b9daebd0183b7741

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.5.4
+  - Ensure full jar-dependency tree is shipped with gem artifact [#110](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/110)
+  - Remove unused `adal4j` dependency [#107](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/107)
+
+## 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)
 

data/VERSION

@@ -1 +1 @@
-1.5.2
+1.5.4

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

@@ -1,38 +1,42 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
+require_jar('com.microsoft.azure', 'azure-eventhubs-eph', '3.3.0')
 require_jar('com.microsoft.azure', 'azure-eventhubs', '3.3.0')
 require_jar('com.microsoft.azure', 'qpid-proton-j-extensions', '1.2.4')
-require_jar('com.microsoft.azure', 'azure-eventhubs-eph', '3.3.0')
 require_jar('com.microsoft.azure', 'azure-storage', '8.6.6')
-require_jar('com.google.code.gson', 'gson', '2.8.9')
-require_jar('org.apache.qpid', 'proton-j', '0.33.8')
-require_jar('com.microsoft.azure', 'azure-keyvault-core', '1.2.4')
-require_jar('com.microsoft.azure', 'adal4j', '1.6.4')
-require_jar('com.microsoft.azure', 'azure-annotations', '1.10.0')
 require_jar('com.microsoft.azure', 'azure-client-authentication', '1.7.3')
 require_jar('com.microsoft.azure', 'azure-client-runtime', '1.7.3')
 require_jar('com.microsoft.rest', 'client-runtime', '1.7.3')
+require_jar('com.fasterxml.jackson.datatype', 'jackson-datatype-joda', '2.16.2')
+require_jar('com.squareup.retrofit2', 'converter-jackson', '2.7.2')
+require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.16.2')
 require_jar('com.fasterxml.jackson.core', 'jackson-annotations', '2.16.2')
 require_jar('com.fasterxml.jackson.core', 'jackson-core', '2.16.2')
-require_jar('com.fasterxml.jackson.core', 'jackson-databind', '2.16.2')
-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.code.gson', 'gson', '2.8.9')
+require_jar('com.microsoft.azure', 'azure-keyvault-core', '1.2.4')
 require_jar('com.google.guava', 'guava', '32.0.1-jre')
-require_jar('com.nimbusds', 'lang-tag', '1.7')
+require_jar('commons-codec', 'commons-codec', '1.14')
 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')
-require_jar('com.squareup.okhttp3', 'okhttp', '4.12.0')
-require_jar('org.jetbrains.kotlin', 'kotlin-stdlib-jdk8', '2.1.0')
 require_jar('com.squareup.retrofit2', 'adapter-rxjava', '2.7.2')
-require_jar('com.squareup.retrofit2', 'converter-jackson', '2.7.2')
 require_jar('com.squareup.retrofit2', 'retrofit', '2.7.2')
-require_jar('com.sun.mail', 'javax.mail', '1.6.1')
-require_jar('commons-codec', 'commons-codec', '1.14')
+require_jar('com.squareup.okhttp3', 'logging-interceptor', '3.12.2')
+require_jar('com.squareup.okhttp3', 'okhttp-urlconnection', '3.12.2')
+require_jar('com.squareup.okhttp3', 'okhttp', '4.12.0')
+require_jar('org.apache.commons', 'commons-lang3', '3.18.0')
+require_jar('com.squareup.okio', 'okio-jvm', '3.6.0')
+require_jar('org.jetbrains.kotlin', 'kotlin-stdlib-jdk8', '1.9.10')
+require_jar('org.jetbrains.kotlin', 'kotlin-stdlib-jdk7', '1.9.10')
+require_jar('org.jetbrains.kotlin', 'kotlin-stdlib', '2.1.0')
+require_jar('org.apache.qpid', 'proton-j', '0.33.8')
+require_jar('org.slf4j', 'slf4j-api', '1.7.30')
+require_jar('com.microsoft.azure', 'azure-annotations', '1.10.0')
+require_jar('com.google.guava', 'failureaccess', '1.0.1')
+require_jar('com.google.guava', 'listenablefuture', '9999.0-empty-to-avoid-conflict-with-guava')
+require_jar('com.google.code.findbugs', 'jsr305', '3.0.2')
+require_jar('org.checkerframework', 'checker-qual', '3.33.0')
+require_jar('com.google.errorprone', 'error_prone_annotations', '2.18.0')
+require_jar('com.google.j2objc', 'j2objc-annotations', '2.8')
 require_jar('io.reactivex', 'rxjava', '1.3.8')
-require_jar('javax.activation', 'activation', '1.1')
-require_jar('net.minidev', 'json-smart', '2.4.9')
-require_jar('org.checkerframework', 'checker-compat-qual', '2.0.0')
-require_jar('org.codehaus.mojo', 'animal-sniffer-annotations', '1.14')
+require_jar('joda-time', 'joda-time', '2.10.14')
+require_jar('org.jetbrains', 'annotations', '13.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.2
+  version: 1.5.4
 platform: ruby
 authors:
 - Elastic
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-11 00:00:00.000000000 Z
+date: 2026-01-21 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
@@ -107,10 +106,13 @@ files:
 - vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-core/2.16.2/jackson-core-2.16.2.jar
 - vendor/jar-dependencies/com/fasterxml/jackson/core/jackson-databind/2.16.2/jackson-databind-2.16.2.jar
 - vendor/jar-dependencies/com/fasterxml/jackson/datatype/jackson-datatype-joda/2.16.2/jackson-datatype-joda-2.16.2.jar
-- vendor/jar-dependencies/com/github/stephenc/jcip/jcip-annotations/1.0-1/jcip-annotations-1.0-1.jar
+- vendor/jar-dependencies/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar
 - vendor/jar-dependencies/com/google/code/gson/gson/2.8.9/gson-2.8.9.jar
+- vendor/jar-dependencies/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar
+- vendor/jar-dependencies/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar
 - vendor/jar-dependencies/com/google/guava/guava/32.0.1-jre/guava-32.0.1-jre.jar
-- vendor/jar-dependencies/com/microsoft/azure/adal4j/1.6.4/adal4j-1.6.4.jar
+- vendor/jar-dependencies/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
+- vendor/jar-dependencies/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar
 - vendor/jar-dependencies/com/microsoft/azure/azure-annotations/1.10.0/azure-annotations-1.10.0.jar
 - vendor/jar-dependencies/com/microsoft/azure/azure-client-authentication/1.7.3/azure-client-authentication-1.7.3.jar
 - vendor/jar-dependencies/com/microsoft/azure/azure-client-runtime/1.7.3/azure-client-runtime-1.7.3.jar
@@ -120,31 +122,31 @@ files:
 - vendor/jar-dependencies/com/microsoft/azure/azure-storage/8.6.6/azure-storage-8.6.6.jar
 - 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/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
+- vendor/jar-dependencies/com/squareup/okhttp3/logging-interceptor/3.12.2/logging-interceptor-3.12.2.jar
+- vendor/jar-dependencies/com/squareup/okhttp3/okhttp-urlconnection/3.12.2/okhttp-urlconnection-3.12.2.jar
 - vendor/jar-dependencies/com/squareup/okhttp3/okhttp/4.12.0/okhttp-4.12.0.jar
+- vendor/jar-dependencies/com/squareup/okio/okio-jvm/3.6.0/okio-jvm-3.6.0.jar
 - vendor/jar-dependencies/com/squareup/retrofit2/adapter-rxjava/2.7.2/adapter-rxjava-2.7.2.jar
 - vendor/jar-dependencies/com/squareup/retrofit2/converter-jackson/2.7.2/converter-jackson-2.7.2.jar
 - vendor/jar-dependencies/com/squareup/retrofit2/retrofit/2.7.2/retrofit-2.7.2.jar
-- vendor/jar-dependencies/com/sun/mail/javax.mail/1.6.1/javax.mail-1.6.1.jar
 - vendor/jar-dependencies/commons-codec/commons-codec/1.14/commons-codec-1.14.jar
 - vendor/jar-dependencies/io/reactivex/rxjava/1.3.8/rxjava-1.3.8.jar
-- vendor/jar-dependencies/javax/activation/activation/1.1/activation-1.1.jar
-- vendor/jar-dependencies/net/minidev/json-smart/2.4.9/json-smart-2.4.9.jar
+- vendor/jar-dependencies/joda-time/joda-time/2.10.14/joda-time-2.10.14.jar
+- vendor/jar-dependencies/org/apache/commons/commons-lang3/3.18.0/commons-lang3-3.18.0.jar
 - vendor/jar-dependencies/org/apache/qpid/proton-j/0.33.8/proton-j-0.33.8.jar
-- vendor/jar-dependencies/org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar
-- vendor/jar-dependencies/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar
-- vendor/jar-dependencies/org/jetbrains/kotlin/kotlin-stdlib-jdk8/2.1.0/kotlin-stdlib-jdk8-2.1.0.jar
+- vendor/jar-dependencies/org/checkerframework/checker-qual/3.33.0/checker-qual-3.33.0.jar
+- vendor/jar-dependencies/org/jetbrains/annotations/13.0/annotations-13.0.jar
+- vendor/jar-dependencies/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.10/kotlin-stdlib-jdk7-1.9.10.jar
+- vendor/jar-dependencies/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.10/kotlin-stdlib-jdk8-1.9.10.jar
+- vendor/jar-dependencies/org/jetbrains/kotlin/kotlin-stdlib/2.1.0/kotlin-stdlib-2.1.0.jar
+- vendor/jar-dependencies/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache-2.0
 metadata:
   logstash_plugin: 'true'
   logstash_group: input
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -160,8 +162,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: