logstash-input-azure_event_hubs 1.4.7 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 180938c864f4ab3d685ee1780acae884dec1041b1c950b935b12d5a48bf14667
-  data.tar.gz: 2c411191905591ab555c6dfce60900c27b417bd6832fc72a909a88327d8f926b
+  metadata.gz: b6df7b5517ace2611b9fe482c3614e7955d31a2f43ba03b906e1426c0d475526
+  data.tar.gz: 7313f77d50d78a426238edba6d06c1ff1a9f199099db87c1e3c183f2856758f0
 SHA512:
-  metadata.gz: c95ed7f2d117194bd58d3ad64dc94e4ec1abe8e5e9bbd9c0baf7d55cabb46be3ee516fc5a17d49e86c8039216d12b97beafcd4adfb6040b42367019f431bc0d8
-  data.tar.gz: 6d0ef1ef16d8da554cf4caaf1285474015c2e47a51c1afec77fda85c1fb8e568ddaec43a539c658d3614d7916abc0f847419d664df6a3dfb0d967e78ce634ca8
+  metadata.gz: 1e3c437f56a83bc77d5d249d4879aa1d9e6f37c6c4a0730e49a73144aeca6edccde825f1cf4094f461d7ab1f78f3f88f8cc7838b62f1b063246673692cf00572
+  data.tar.gz: 87d3c7871814028f4ec7036460d3895111b2d86477f88a93038e89f4282bf61cae589f1806f7a66021122ac812dcc07958e63cf75142540efa021463de76f069

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.4.9
+  - Fixed issue with `getHostContext` method accessibility, causing plugin not to be able to run  [#93](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/93)
+
+## 1.4.8
+  - Fixed connection placeholder replacements errors with Logstash `8.15.1` and `8.15.2` [#92](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/92)
+
 ## 1.4.7
   - [DOCS] Clarify examples for single and multiple event hubs [#90](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/90)
 

data/VERSION

@@ -1 +1 @@
-1.4.7
+1.4.9

data/lib/logstash/inputs/azure_event_hubs.rb

@@ -332,8 +332,7 @@ class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
         connections = *params['event_hub_connections'] # ensure array
         connections.each.with_index do |_connection, i|
           begin
-            connection = self.class.replace_placeholders(_connection) if self.class.respond_to? 'replace_placeholders' # 6.x
-            connection = self.class.replace_env_placeholders(_connection) if self.class.respond_to? 'replace_env_placeholders' # 5.x
+            connection = replace_connection_placeholders(_connection)
             event_hub_name = ConnectionStringBuilder.new(connection).getEventHubName
             redacted_connection = connection.gsub(/(SharedAccessKey=)([0-9a-zA-Z=+]*)([;]*)(.*)/, '\\1<redacted>\\3\\4')
             params['event_hub_connections'][i] = redacted_connection # protect from leaking logs
@@ -361,6 +360,25 @@ class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
 
   attr_reader :event_hubs_exploded
 
+  def replace_connection_placeholders(value)
+    connection = value
+    if self.class.respond_to? :replace_placeholders
+      # Logstash 6.x
+      if self.class.method(:replace_placeholders).arity == 1
+        connection = self.class.replace_placeholders(connection)
+      else
+        # Logstash 8.15.1 and 8.15.2 changed the method arity including a new boolean parameter `refine`.
+        # This was fixed in 8.15.3. see https://github.com/elastic/logstash/pull/16485
+        connection = self.class.replace_placeholders(connection, false)
+      end
+    end
+
+    # Logstash 5.x
+    connection = self.class.replace_env_placeholders(connection) if self.class.respond_to? :replace_env_placeholders
+
+    connection
+  end
+
   def register
     # augment the exploded config with the defaults
     @event_hubs_exploded.each do |event_hub|
@@ -393,20 +411,7 @@ class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
                 scheduled_executor_service)
           else
             @logger.warn("You have NOT specified a `storage_connection_string` for #{event_hub_name}. This configuration is only supported for a single Logstash instance.")
-            checkpoint_manager = InMemoryCheckpointManager.new
-            lease_manager = InMemoryLeaseManager.new
-            event_processor_host = EventProcessorHost.new(
-                EventProcessorHost.createHostName('logstash'),
-                event_hub_name,
-                event_hub['consumer_group'],
-                event_hub['event_hub_connections'].first.value, #there will only be one in this array by the time it gets here
-                checkpoint_manager,
-                lease_manager,
-                scheduled_executor_service,
-                nil)
-            #using java_send to avoid naming conflicts with 'initialize' method
-            lease_manager.java_send :initialize, [HostContext], event_processor_host.getHostContext
-            checkpoint_manager.java_send :initialize, [HostContext], event_processor_host.getHostContext
+            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)
@@ -478,4 +483,38 @@ class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
       @logger.debug("interrupted while waiting to close executor service, this can generally be ignored", :exception => e, :backtrace => e.backtrace) if e
     end
   end
+
+  def create_in_memory_event_processor_host(event_hub, event_hub_name, scheduled_executor_service)
+    checkpoint_manager = InMemoryCheckpointManager.new
+    lease_manager = InMemoryLeaseManager.new
+    event_processor_host = EventProcessorHost.new(
+      EventProcessorHost.createHostName('logstash'),
+      event_hub_name,
+      event_hub['consumer_group'],
+      event_hub['event_hub_connections'].first.value, #there will only be one in this array by the time it gets here
+      checkpoint_manager,
+      lease_manager,
+      scheduled_executor_service,
+      nil)
+    host_context = get_host_context(event_processor_host)
+    #using java_send to avoid naming conflicts with 'initialize' method
+    lease_manager.java_send :initialize, [HostContext], host_context
+    checkpoint_manager.java_send :initialize, [HostContext], host_context
+    event_processor_host
+  end
+
+  private
+
+  # This method is used to get around the fact that recent versions of jruby do not
+  # allow access to the package private protected method `getHostContext`
+  def get_host_context(event_processor_host)
+    call_private(event_processor_host, 'getHostContext')
+  end
+
+  def call_private(clazz, method)
+    method = clazz.java_class.declared_method(method)
+    method.accessible = true
+    method.invoke(clazz)
+  end
+
 end

data/spec/inputs/azure_event_hub_spec.rb

@@ -207,10 +207,10 @@ describe LogStash::Inputs::AzureEventHubs do
         register_counter = java.util.concurrent.atomic.AtomicInteger.new
         unregister_counter = java.util.concurrent.atomic.AtomicInteger.new
         assertion_count = java.util.concurrent.atomic.AtomicInteger.new
+        allow(input).to receive(:get_host_context) {mock_host_context}
         allow_any_instance_of(InMemoryLeaseManager).to receive(:java_send)
         allow_any_instance_of(InMemoryCheckpointManager).to receive(:java_send)
 
-        allow(mock_host).to receive(:getHostContext) {mock_host_context}
         allow(mock_host_context).to receive(:getEventHubPath) {"foo"}
 
         expect(mock_host).to receive(:registerEventProcessorFactory).at_most(3).times {
@@ -256,6 +256,11 @@ describe LogStash::Inputs::AzureEventHubs do
         expect(assertion_count.get).to be == 3
       end
 
+      it "can create an in memory EPH" do
+        #event_hub, event_hub_name, scheduled_executor_service
+        exploded_config = input.event_hubs_exploded
+        input.create_in_memory_event_processor_host(exploded_config[0], exploded_config[0]['event_hubs'].first, nil)
+      end
     end
 
     describe "Bad Basic Config" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-azure_event_hubs
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.9
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-07 00:00:00.000000000 Z
+date: 2024-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -17,8 +17,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
   name: logstash-core-plugin-api
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -31,8 +31,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-codec-plain
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,8 +45,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
   name: logstash-codec-json
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,8 +59,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.22
   name: stud
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -73,8 +73,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
   name: logstash-devutils
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Consumes events from Azure Event Hubs for use with Logstash