logstash-output-scalyr 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6b9327052bb3d05f9d043f6c9d2c02456f3b300ceb0355abae8b7d050e99fb9
-  data.tar.gz: 1ff559076075d0b49728fce8bf103452d21d3c48ce9eff1a58d5d3c786b582f6
+  metadata.gz: ba6f9b828f98401b5f19e040e84f64a27de65fb6c41d4405c44b8038aac52450
+  data.tar.gz: 2aeed49b1518ea70df9f41bf4b627b748e23cd85104b45d96ce140d428220939
 SHA512:
-  metadata.gz: a1ac7b6792503f9cff444962efbc33f349cad7c9d525beaed05bcdc57ebadc5d688381c235fa21d2ff5004d6ca3277ac62336f027ba3880be1d9b01d40006f75
-  data.tar.gz: f07bcc497143581032ded69de2a6c833e4ea422e88fbbf12080adb07388e1f57cedc42319b1aca84f668e47c1d567ac25b4d3787bae74c84674416227ca9ba93
+  metadata.gz: d14976aa00f8d3a8021b9b955bf76102e003def61dff4b89069dff3ad6ca3c5861ed93ce3c500c7991aa809bcdbc3d3b4f601ae151bcf20e87d56ee3ce59d848
+  data.tar.gz: 9728d3b1925621e80e5623c208fe4125d18ba856d4358b109f6879ea1533da97a587b2f659c15ec90f04140dbf92640d122f5c2ed8e1c8f4cc5ec7bb5a12aa77

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Beta
 
+## 0.2.3
+
+- Increase default number of maximum retry attempts on failure from `5` to `15`.
+- Change "Unexpected error occurred while uploading to Scalyr (will backoff-retry)" message to
+  be logged under WARNING and not ERROR log level. This error is not fatal and simply indicates
+  client will retry a failed request. We use WARNING and not INFO so we still have visibility into
+  those messages (since most deployments have log level set to WARNING or above).
+
 ## 0.2.2
 
 - No longer vendor dependencies in the gem. This gem used to vendor a vulnerable log4j version

data/README.md

@@ -9,9 +9,9 @@ You can view documentation for this plugin [on the Scalyr website](https://app.s
 # Quick start
 
 1. Build the gem, run `gem build logstash-output-scalyr.gemspec` 
-2. Install the gem into a Logstash installation, run `/usr/share/logstash/bin/logstash-plugin install logstash-output-scalyr-0.2.2.gem` 
+2. Install the gem into a Logstash installation, run `/usr/share/logstash/bin/logstash-plugin install logstash-output-scalyr-0.2.3.gem` 
    or follow the latest official instructions on working with plugins from Logstash. As an alternative, you can directly install latest
-   stable version from RubyGems - ``/usr/share/logstash/bin/logstash-plugin --version 0.2.2 logstash-output-scalyr``
+   stable version from RubyGems - ``/usr/share/logstash/bin/logstash-plugin --version 0.2.3 logstash-output-scalyr``
 3. Configure the output plugin (e.g. add it to a pipeline .conf)
 4. Restart Logstash 
 
@@ -477,7 +477,7 @@ git clone https://github.com/Kami/logstash-config-tester ~/
 gem build logstash-output-scalyr.gemspec
 
 # 2. Copy it to the config test repo
-cp logstash-output-scalyr-0.2.2.gem ~/logstash-config-test/logstash-output-scalyr.gem
+cp logstash-output-scalyr-0.2.3.gem ~/logstash-config-test/logstash-output-scalyr.gem
 
 # 3. Build docker image with the latest dev version of the plugin (may take a while)
 docker-compose build

data/lib/logstash/outputs/scalyr.rb

@@ -105,7 +105,9 @@ class LogStash::Outputs::Scalyr < LogStash::Outputs::Base
   # Initial interval in seconds between bulk retries. Doubled on each retry up to `retry_max_interval`
   config :retry_initial_interval, :validate => :number, :default => 1
   # How many times to retry sending an event before giving up on it
-  config :max_retries, :validate => :number, :default => 5
+  # This will result in a total of around 12 minutes of retrying / sleeping with a default value
+  # for retry_max_interval
+  config :max_retries, :validate => :number, :default => 15
   # Whether or not to send messages that failed to send a max_retries amount of times to the DLQ or just drop them
   config :send_to_dlq, :validate => :boolean, :default => true
 
@@ -504,8 +506,8 @@ class LogStash::Outputs::Scalyr < LogStash::Outputs::Base
             @logger.debug(message, exc_data)
             exc_commonly_retried = true
           else
-            # all other failed uploads should be errors
-            @logger.error(message, exc_data)
+            # all other failed uploads should be warning
+            @logger.warn(message, exc_data)
             exc_commonly_retried = false
           end
           retry if @running and exc_retries < @max_retries

data/lib/scalyr/constants.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-PLUGIN_VERSION = "v0.2.2"
+PLUGIN_VERSION = "v0.2.3"
 
 # Special event level attribute name which can be used for setting event level serverHost attribute
 EVENT_LEVEL_SERVER_HOST_ATTRIBUTE_NAME = '__origServerHost'

data/logstash-output-scalyr.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-output-scalyr'
-  s.version         = '0.2.2'
+  s.version         = '0.2.3'
   s.licenses = ['Apache-2.0']
   s.summary = "Scalyr output plugin for Logstash"
   s.description     = "Sends log data collected by Logstash to Scalyr (https://www.scalyr.com)"

data/spec/logstash/outputs/scalyr_integration_spec.rb

@@ -42,9 +42,9 @@ describe LogStash::Outputs::Scalyr do
               })
               plugin.register
               plugin.instance_variable_set(:@running, false)
-              allow(plugin.instance_variable_get(:@logger)).to receive(:error)
+              allow(plugin.instance_variable_get(:@logger)).to receive(:warn)
               plugin.multi_receive(sample_events)
-              expect(plugin.instance_variable_get(:@logger)).to have_received(:error).with("Error uploading to Scalyr (will backoff-retry)",
+              expect(plugin.instance_variable_get(:@logger)).to have_received(:warn).with("Error uploading to Scalyr (will backoff-retry)",
                 {
                   :error_class=>"Scalyr::Common::Client::ServerError",
                   :batch_num=>1,
@@ -71,9 +71,9 @@ describe LogStash::Outputs::Scalyr do
               })
               plugin.register
               plugin.instance_variable_set(:@running, false)
-              allow(plugin.instance_variable_get(:@logger)).to receive(:error)
+              allow(plugin.instance_variable_get(:@logger)).to receive(:warn)
               plugin.multi_receive(sample_events)
-              expect(plugin.instance_variable_get(:@logger)).to have_received(:error).with("Error uploading to Scalyr (will backoff-retry)",
+              expect(plugin.instance_variable_get(:@logger)).to have_received(:warn).with("Error uploading to Scalyr (will backoff-retry)",
                 {
                   :error_class=>"Manticore::UnknownException",
                   :batch_num=>1,
@@ -101,9 +101,9 @@ describe LogStash::Outputs::Scalyr do
               })
               plugin.register
               plugin.instance_variable_set(:@running, false)
-              allow(plugin.instance_variable_get(:@logger)).to receive(:error)
+              allow(plugin.instance_variable_get(:@logger)).to receive(:warn)
               plugin.multi_receive(sample_events)
-              expect(plugin.instance_variable_get(:@logger)).to have_received(:error).with("Error uploading to Scalyr (will backoff-retry)",
+              expect(plugin.instance_variable_get(:@logger)).to have_received(:warn).with("Error uploading to Scalyr (will backoff-retry)",
                 {
                   :error_class=>"Manticore::UnknownException",
                   :batch_num=>1,
@@ -144,9 +144,9 @@ describe LogStash::Outputs::Scalyr do
               })
               plugin.register
               plugin.instance_variable_set(:@running, false)
-              allow(plugin.instance_variable_get(:@logger)).to receive(:error)
+              allow(plugin.instance_variable_get(:@logger)).to receive(:warn)
               plugin.multi_receive(sample_events)
-              expect(plugin.instance_variable_get(:@logger)).to have_received(:error).with("Error uploading to Scalyr (will backoff-retry)",
+              expect(plugin.instance_variable_get(:@logger)).to have_received(:warn).with("Error uploading to Scalyr (will backoff-retry)",
                 {
                   :error_class=>"Manticore::UnknownException",
                   :batch_num=>1,
@@ -166,7 +166,7 @@ describe LogStash::Outputs::Scalyr do
         end
       end
 
-      context "when an error occurs with retries at 5" do
+      context "when an error occurs with retries at 15" do
         it "exits after 5 retries and emits a log" do
               plugin = LogStash::Outputs::Scalyr.new({
                 'api_write_token' => '1234',
@@ -178,7 +178,7 @@ describe LogStash::Outputs::Scalyr do
               plugin.register
               allow(plugin.instance_variable_get(:@logger)).to receive(:error)
               plugin.multi_receive(sample_events)
-              expect(plugin.instance_variable_get(:@logger)).to have_received(:error).with("Failed to send 3 events after 5 tries.", anything
+              expect(plugin.instance_variable_get(:@logger)).to have_received(:error).with("Failed to send 3 events after 15 tries.", anything
               )
         end
       end
@@ -232,9 +232,9 @@ describe LogStash::Outputs::Scalyr do
         plugin.register
         plugin.instance_variable_set(:@running, false)
 
-        allow(plugin.instance_variable_get(:@logger)).to receive(:error)
+        allow(plugin.instance_variable_get(:@logger)).to receive(:warn)
         plugin.multi_receive(sample_events)
-        expect(plugin.instance_variable_get(:@logger)).to have_received(:error).with("Error uploading to Scalyr (will backoff-retry)",
+        expect(plugin.instance_variable_get(:@logger)).to have_received(:warn).with("Error uploading to Scalyr (will backoff-retry)",
           {
             :error_class=>"Scalyr::Common::Client::ServerError",
             :batch_num=>1,
@@ -265,9 +265,9 @@ describe LogStash::Outputs::Scalyr do
         plugin.register
         plugin.instance_variable_set(:@running, false)
 
-        allow(plugin.instance_variable_get(:@logger)).to receive(:error)
+        allow(plugin.instance_variable_get(:@logger)).to receive(:warn)
         plugin.multi_receive(sample_events)
-        expect(plugin.instance_variable_get(:@logger)).to have_received(:error).with("Error uploading to Scalyr (will backoff-retry)",
+        expect(plugin.instance_variable_get(:@logger)).to have_received(:warn).with("Error uploading to Scalyr (will backoff-retry)",
           {
             :error_class=>"Scalyr::Common::Client::ServerError",
             :batch_num=>1,

data/spec/logstash/outputs/scalyr_spec.rb

@@ -1071,7 +1071,6 @@ describe LogStash::Outputs::Scalyr do
       it "throws on invalid hostname" do
         config = {
             'api_write_token' => '1234',
-            'perform_connectivity_check' => false,
             'scalyr_server' => 'https://agent.invalid.foo.scalyr.com',
             'perform_connectivity_check' => true
         }
@@ -1082,7 +1081,6 @@ describe LogStash::Outputs::Scalyr do
       it "throws on invalid api key" do
         config = {
             'api_write_token' => '1234',
-            'perform_connectivity_check' => false,
             'scalyr_server' => 'https://agent.scalyr.com',
             'perform_connectivity_check' => true
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-scalyr
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Edward Chee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-15 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement