logstash-input-azure_event_hubs 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 636123e36c33570aaf89bdcc73ea5278e12d31c82744b8438d3e547a2e26226d
-  data.tar.gz: 04d9bcdd2cf90d9cbd9618c029e296d6d67ba4925da1d47a2ed6178955b3cf26
+  metadata.gz: 8a7f87055eb3012bebd2fbe41eb12130c8ce91aa4853d56493e77de3e3eb1d32
+  data.tar.gz: 7d7be20be2704119f1cbe6e84d3f290d258a6063bdd4bea366dfab24d9be9af5
 SHA512:
-  metadata.gz: ff260a97dbed5ba989b14752858893eeec2a94ed1774e07c509987c709a5e91459128e5ca8680f4f7a42be2918694cb176aa74d83707101ff35e09f8557d743a
-  data.tar.gz: 22a1e7019abc970d1fbba51162f7dea7cce8f0070f82a31ecfe24e95cad8380c8949b0ee51352e608f5d01cf50fd5f9578c26da3ba654356e8da69a8471164d8
+  metadata.gz: 4153e44540964e59f5ca7a57389f418f1283c0dd679df9c7895be67527ad6b8214fd762940c06c191b924a187114ed435e87eb9bf58f7d57f11f96131688a788
+  data.tar.gz: 00c56ff144753427ee5c1e3b2dcc29dde057efee95434c2bbd0bb6736d3144add8f9d01df6d0efff9f0e084c73d698ed6f8cfeb1cecfb36acb5e501c2eb78f55

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.2.2
+ - Refactor: scope and review global java_imports [#57](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/57)
+
 ## 1.2.1
  - [DOC] Changed documentation to update the default number of threads [#55](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/55)
 
@@ -34,6 +37,6 @@
 ## 1.0.1
  - Fixed logging for exception handler
 
-## 1.0.0 
+## 1.0.0
  - Initial release of `logstash-input-azure_event_hubs` supersedes `logstash-input-azureeventhub`
  - Re-implementation that uses Event Processor Host API and new configuration options.

data/VERSION

@@ -1 +1 @@
-1.2.1
+1.2.2

data/lib/logstash/inputs/azure_event_hubs.rb

@@ -8,18 +8,17 @@ require "logstash/inputs/error_notification_handler"
 require "logstash/inputs/named_thread_factory"
 require "logstash/inputs/look_back_position_provider"
 
+class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
 
-java_import com.microsoft.azure.eventprocessorhost.EventProcessorHost
-java_import com.microsoft.azure.eventprocessorhost.EventProcessorOptions
-java_import com.microsoft.azure.eventprocessorhost.InMemoryCheckpointManager
-java_import com.microsoft.azure.eventprocessorhost.InMemoryLeaseManager
-java_import com.microsoft.azure.eventprocessorhost.HostContext
-java_import com.microsoft.azure.eventhubs.ConnectionStringBuilder
-java_import java.util.concurrent.Executors
-java_import java.util.concurrent.TimeUnit
-
+  java_import com.microsoft.azure.eventprocessorhost.EventProcessorHost
+  java_import com.microsoft.azure.eventprocessorhost.EventProcessorOptions
+  java_import com.microsoft.azure.eventprocessorhost.InMemoryCheckpointManager
+  java_import com.microsoft.azure.eventprocessorhost.InMemoryLeaseManager
+  java_import com.microsoft.azure.eventprocessorhost.HostContext
+  java_import com.microsoft.azure.eventhubs.ConnectionStringBuilder
+  java_import java.util.concurrent.Executors
+  java_import java.util.concurrent.TimeUnit
 
-class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
   config_name "azure_event_hubs"
 
   # This plugin supports two styles of configuration
@@ -476,5 +475,3 @@ class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
     end
   end
 end
-
-

data/lib/logstash/inputs/error_notification_handler.rb

@@ -1,12 +1,11 @@
 # encoding: utf-8
 require "logstash/util/loggable"
-java_import java.util.function.Consumer
 
 module LogStash
   module Inputs
     module Azure
       class ErrorNotificationHandler
-        include Consumer
+        include java.util.function.Consumer
         include LogStash::Util::Loggable
 
         def initialize
@@ -14,9 +13,9 @@ module LogStash
         end
 
         def accept(exception_received_event_args)
-          @logger.error("Error with Event Processor Host. ", 
+          @logger.error("Error with Event Processor Host. ",
             :host_name => exception_received_event_args.getHostname(),
-            :action => exception_received_event_args.getAction(), 
+            :action => exception_received_event_args.getAction(),
             :exception => exception_received_event_args.getException().toString())
         end
       end

data/lib/logstash/inputs/look_back_position_provider.rb

@@ -1,14 +1,15 @@
 # encoding: utf-8
 require "logstash/util/loggable"
-java_import java.util.function.Function
-java_import com.microsoft.azure.eventhubs.EventPosition
-java_import java.time.Instant
 
 module LogStash
   module Inputs
     module Azure
       class LookBackPositionProvider
-        include Function
+
+        java_import com.microsoft.azure.eventhubs.EventPosition
+        java_import java.time.Instant
+
+        include java.util.function.Function
         include LogStash::Util::Loggable
 
         def initialize(look_back_seconds)

data/lib/logstash/inputs/processor_factory.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require "logstash/inputs/processor"
+
 module LogStash
   module Inputs
     module Azure
@@ -22,6 +23,3 @@ module LogStash
     end
   end
 end
-
-
-

data/spec/inputs/azure_event_hub_spec.rb

@@ -2,16 +2,9 @@
 require "logstash/devutils/rspec/spec_helper"
 require "logstash/inputs/azure_event_hubs"
 
-
 java_import com.microsoft.azure.eventprocessorhost.EventProcessorHost
-java_import com.microsoft.azure.eventprocessorhost.EventProcessorOptions
 java_import com.microsoft.azure.eventprocessorhost.InMemoryCheckpointManager
 java_import com.microsoft.azure.eventprocessorhost.InMemoryLeaseManager
-java_import java.util.concurrent.ScheduledThreadPoolExecutor
-java_import java.util.concurrent.CompletableFuture
-java_import java.util.concurrent.TimeUnit
-java_import java.util.concurrent.atomic.AtomicInteger
-
 
 describe LogStash::Inputs::AzureEventHubs do
 
@@ -67,7 +60,7 @@ describe LogStash::Inputs::AzureEventHubs do
         mock_queue = double("queue")
         mock_host = double("event_processor_host")
         mock_host_context = double("host_context")
-        completable_future = CompletableFuture.new
+        completable_future = java.util.concurrent.CompletableFuture.new
         #simulate work being done before completing the future
         Thread.new do
           sleep 2
@@ -75,10 +68,10 @@ describe LogStash::Inputs::AzureEventHubs do
         end
 
         # rspec has issues with counters and concurrent code, so use threadsafe counters instead
-        host_counter = AtomicInteger.new
-        register_counter = AtomicInteger.new
-        unregister_counter = AtomicInteger.new
-        assertion_count = AtomicInteger.new
+        host_counter = java.util.concurrent.atomic.AtomicInteger.new
+        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(mock_host).to receive(:getHostContext) {mock_host_context}
         allow(mock_host_context).to receive(:getEventHubPath) {"foo"}
@@ -202,7 +195,7 @@ describe LogStash::Inputs::AzureEventHubs do
         mock_queue = double("queue")
         mock_host = double("event_processor_host")
         mock_host_context = double("host_context")
-        completable_future = CompletableFuture.new
+        completable_future = java.util.concurrent.CompletableFuture.new
         #simulate work being done before completing the future
         Thread.new do
           sleep 2
@@ -210,10 +203,10 @@ describe LogStash::Inputs::AzureEventHubs do
         end
 
         # rspec has issues with counters and concurrent code, so use threadsafe counters instead
-        host_counter = AtomicInteger.new
-        register_counter = AtomicInteger.new
-        unregister_counter = AtomicInteger.new
-        assertion_count = AtomicInteger.new
+        host_counter = java.util.concurrent.atomic.AtomicInteger.new
+        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_any_instance_of(InMemoryLeaseManager).to receive(:java_send)
         allow_any_instance_of(InMemoryCheckpointManager).to receive(:java_send)
 
@@ -319,4 +312,3 @@ describe LogStash::Inputs::AzureEventHubs do
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-azure_event_hubs
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement