logstash-input-google_pubsub_compressed_batches 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93658a8c341decdeadf6a727cc398e3a2ed8a6fd8fa6a3f4a74db5fa185f4a1b
-  data.tar.gz: 8a9f67dbb8b555e07d4773a05312df9e59762c875d187c65313aee1a0c771e1e
+  metadata.gz: 0f5214fad7a25763f2f63aa0b18fd32b7af81cab156cb104a68d4c37da5af471
+  data.tar.gz: 4134da7ea97087725a404cb24939041d7e881a5537a8f019e056882080e238bf
 SHA512:
-  metadata.gz: 77bd07a7f38be37c8ab8b07f89cbf805efdae31b37bf1b16200375e6c5cac4bea77303120648f394ab1a5a70037a572309973a2a7e559cf8ed3cbd07a8d43516
-  data.tar.gz: 88b74105e77cf4aa8dda57819423389908445257e8261ecfb3f95dcc53bbbc607401e8325edc329424da5ce2b4e11d002bea170536ae80e83cd419a3db01f50d
+  metadata.gz: c62b860f7bbf8845e648f3a2b24a964bf44a65ff1ee1a7c17e7c7462e2c78a26301bdf8bbffb1ef9129bd95373f285809b8a5e3bcead7ceed03b020a03ad021a
+  data.tar.gz: 4525ad91b4e5ed78f5f273995047655a25bd56d5587fe463e61b5a8e464c42db99341164d3eea0bd3708f5b4d9deaca1bc7cd74a666d74440a118ef15a56e855

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## 1.2.3
+## 1.2.6
  - Added support for reading zlib compressed batch
 
 ## 1.2.1

data/lib/logstash/inputs/google_pubsub.rb

@@ -252,11 +252,11 @@ class LogStash::Inputs::GooglePubSub < LogStash::Inputs::Base
     @logger.debug("Pulling messages from sub '#{@subscription_id}'")
     handler = MessageReceiver.new do |message|
       # handle incoming message, then ack/nack the received message
-      data = message.getData().toStringUtf8()
       algorithm = message.getAttributesMap()["compression_algorithm"]
 
       case algorithm
       when nil
+        data = message.getData().toStringUtf8()
         @codec.decode(data) do |event|
           event.set("host", event.get("host") || @host)
           event.set("[@metadata][pubsub_message]", extract_metadata(message)) if @include_metadata
@@ -264,9 +264,24 @@ class LogStash::Inputs::GooglePubSub < LogStash::Inputs::Base
           queue << event
         end
       when COMPRESSION_ALGORITHM_ZLIB
-        lines = Zlib::Inflate.inflate(data).split(BATCHED_RECORD_SEPARATOR)
+        data = message.getData().toByteArray()
+
+        # decompress batch
+        bais = java.io.ByteArrayInputStream.new(data)
+        iis = java.util.zip.InflaterInputStream.new(bais)
+
+        result = ""
+        buf = Java::byte[5].new
+        rlen = -1
+
+        while (rlen = iis.read(buf)) != -1 do
+          result += java.lang.String.new(java.util.Arrays.copyOf(buf, rlen), "UTF-8")
+        end
+
+        # split into multiple events
+        lines = result.split(BATCHED_RECORD_SEPARATOR)
         lines.each do |line|
-          event = LogStash::Event.new(line)
+          event = LogStash::Event.new("message" => line)
           event.set("host", event.get("host") || @host)
           event.set("[@metadata][pubsub_message]", extract_metadata(message)) if @include_metadata
           decorate(event)

data/logstash-input-google_pubsub_compressed_batches.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-input-google_pubsub_compressed_batches'
-  s.version         = '1.2.5'
+  s.version         = '1.2.6'
   s.licenses = ['Apache-2.0']
   s.summary = "Consume events from a Google Cloud PubSub service. Supports zlib compressed batches"
   s.description = "This gem is a Logstash input plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash-input-google_pubsub_compressed_batches
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Eric Johnson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement