logstash-input-azure_event_hubs 1.2.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a7f87055eb3012bebd2fbe41eb12130c8ce91aa4853d56493e77de3e3eb1d32
-  data.tar.gz: 7d7be20be2704119f1cbe6e84d3f290d258a6063bdd4bea366dfab24d9be9af5
+  metadata.gz: 19a25727df6bc548a4df97cf4408a711fea64979da39cbfd634e0e3ad2af5370
+  data.tar.gz: 02b064d76f7519abb3db9ca59490f5b40aff8ac5f43446699fb7f55c63a301db
 SHA512:
-  metadata.gz: 4153e44540964e59f5ca7a57389f418f1283c0dd679df9c7895be67527ad6b8214fd762940c06c191b924a187114ed435e87eb9bf58f7d57f11f96131688a788
-  data.tar.gz: 00c56ff144753427ee5c1e3b2dcc29dde057efee95434c2bbd0bb6736d3144add8f9d01df6d0efff9f0e084c73d698ed6f8cfeb1cecfb36acb5e501c2eb78f55
+  metadata.gz: 59fc2af3961aae68987bb72476fe9dddde460a3a7447456566053d5c2c2d8044525ee73a8ebd13b7c435c658689dc6d685794b4c84a3649918d632f9aa09ec2a
+  data.tar.gz: b34b4d1224d7395b43e255c3c28728196a7465890da847ac02d2206a91cc3b56bfe5099c6d372195b89e049b4da664795881bd662f7d4fd175f305c2828d81f9

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.4.1
+ - Update log4j dependencies [#71](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/71)
+ - Fixed Gradle's script to use Gradle 7 [#69](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/69)
+
+## 1.4.0
+ - Updated the minor version of Azure SDK and other dependencies to ensure users of this plugin get upstream fixes and improvements [#67](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/67)
+
+## 1.3.0
+ - Add EventHub `user properties` in `@metadata` object [#66](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/66)
+
+## 1.2.3
+ - Fixed missing configuration of `prefetch_count` and `receive_timeout` [#61](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/61)
+
 ## 1.2.2
  - Refactor: scope and review global java_imports [#57](https://github.com/logstash-plugins/logstash-input-azure_event_hubs/pull/57)
 

data/LICENSE

@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -186,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2020 Elastic and contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.4.1

data/lib/logstash/inputs/azure_event_hubs.rb

@@ -18,6 +18,7 @@ class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
   java_import com.microsoft.azure.eventhubs.ConnectionStringBuilder
   java_import java.util.concurrent.Executors
   java_import java.util.concurrent.TimeUnit
+  java_import java.time.Duration
 
   config_name "azure_event_hubs"
 
@@ -290,7 +291,7 @@ class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
   # }
   config :decorate_events, :validate => :boolean, :default => false
 
-  attr_reader :count, :pre_count
+  attr_reader :count
 
   def initialize(params)
 
@@ -409,6 +410,9 @@ class LogStash::Inputs::AzureEventHubs < LogStash::Inputs::Base
           end
           options = EventProcessorOptions.new
           options.setMaxBatchSize(max_batch_size)
+          options.setPrefetchCount(prefetch_count)
+          options.setReceiveTimeOut(Duration.ofSeconds(receive_timeout))
+          
           options.setExceptionNotification(LogStash::Inputs::Azure::ErrorNotificationHandler.new)
           case @initial_position
           when 'beginning'

data/lib/logstash/inputs/processor.rb

@@ -48,6 +48,7 @@ module LogStash
                 event.set("[@metadata][azure_event_hubs][sequence]", payload.getSystemProperties.getSequenceNumber)
                 event.set("[@metadata][azure_event_hubs][timestamp]",payload.getSystemProperties.getEnqueuedTime.getEpochSecond)
                 event.set("[@metadata][azure_event_hubs][event_size]", bytes.size)
+                event.set("[@metadata][azure_event_hubs][user_properties]", payload.getProperties)
               end
               @queue << event
               if @checkpoint_interval > 0

data/lib/logstash-input-azure_event_hubs.rb

@@ -1,11 +1,11 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
+require_jar('com.microsoft.azure', 'azure-eventhubs', '2.3.2')
+require_jar('com.microsoft.azure', 'qpid-proton-j-extensions', '1.2.4')
+require_jar('com.microsoft.azure', 'azure-eventhubs-eph', '2.5.2')
+require_jar('com.microsoft.azure', 'azure-storage', '8.6.6')
 require_jar('com.google.code.gson', 'gson', '2.8.5')
-require_jar('org.apache.qpid', 'proton-j', '0.33.3')
-require_jar('org.apache.logging.log4j', 'log4j-slf4j-impl', '2.9.1')
-require_jar('com.microsoft.azure', 'azure-eventhubs', '2.2.0')
-require_jar('com.microsoft.azure', 'qpid-proton-j-extensions', '1.1.0')
-require_jar('com.microsoft.azure', 'azure-eventhubs-eph', '2.4.0')
-require_jar('com.microsoft.azure', 'azure-storage', '8.0.0')
-require_jar('org.apache.logging.log4j', 'log4j-api', '2.9.1')
+require_jar('org.apache.qpid', 'proton-j', '0.33.9')
+require_jar('org.apache.logging.log4j', 'log4j-api', '2.15.0')
+require_jar('org.apache.logging.log4j', 'log4j-slf4j-impl', '2.15.0')

data/spec/inputs/azure_event_hub_spec.rb

@@ -21,7 +21,7 @@ describe LogStash::Inputs::AzureEventHubs do
           expect(exploded_config[i]['event_hub_connections'][0].value).to start_with('Endpoint=sb://...')
           expect(exploded_config[i]['storage_connection'].value).to eql('DefaultEndpointsProtocol=https;AccountName=...')
           expect(exploded_config[i]['threads']).to be == 9
-          expect(exploded_config[i]['codec']).to be_a_kind_of(LogStash::Codecs::Plain)
+          expect(exploded_config[i]['codec'].class.to_s).to eq("LogStash::Codecs::Plain")
           expect(exploded_config[i]['consumer_group']).to eql('cg')
           expect(exploded_config[i]['max_batch_size']).to be == 20
           expect(exploded_config[i]['prefetch_count']).to be == 30
@@ -179,7 +179,7 @@ describe LogStash::Inputs::AzureEventHubs do
         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']).to be_a_kind_of(LogStash::Codecs::JSON) # different between configs
+        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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-azure_event_hubs
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.4.1
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -104,13 +104,13 @@ files:
 - logstash-input-azure_event_hubs.gemspec
 - spec/inputs/azure_event_hub_spec.rb
 - vendor/jar-dependencies/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar
-- vendor/jar-dependencies/com/microsoft/azure/azure-eventhubs-eph/2.4.0/azure-eventhubs-eph-2.4.0.jar
-- vendor/jar-dependencies/com/microsoft/azure/azure-eventhubs/2.2.0/azure-eventhubs-2.2.0.jar
-- vendor/jar-dependencies/com/microsoft/azure/azure-storage/8.0.0/azure-storage-8.0.0.jar
-- vendor/jar-dependencies/com/microsoft/azure/qpid-proton-j-extensions/1.1.0/qpid-proton-j-extensions-1.1.0.jar
-- vendor/jar-dependencies/org/apache/logging/log4j/log4j-api/2.9.1/log4j-api-2.9.1.jar
-- vendor/jar-dependencies/org/apache/logging/log4j/log4j-slf4j-impl/2.9.1/log4j-slf4j-impl-2.9.1.jar
-- vendor/jar-dependencies/org/apache/qpid/proton-j/0.33.3/proton-j-0.33.3.jar
+- vendor/jar-dependencies/com/microsoft/azure/azure-eventhubs-eph/2.5.2/azure-eventhubs-eph-2.5.2.jar
+- vendor/jar-dependencies/com/microsoft/azure/azure-eventhubs/2.3.2/azure-eventhubs-2.3.2.jar
+- 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/org/apache/logging/log4j/log4j-api/2.15.0/log4j-api-2.15.0.jar
+- vendor/jar-dependencies/org/apache/logging/log4j/log4j-slf4j-impl/2.15.0/log4j-slf4j-impl-2.15.0.jar
+- vendor/jar-dependencies/org/apache/qpid/proton-j/0.33.9/proton-j-0.33.9.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache-2.0
@@ -133,8 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Consumes events from Azure Event Hubs for use with Logstash