fluent-plugin-scalyr 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ed19a4785fee04bde919ac58992fe818f9c768c2
-  data.tar.gz: f25e22d8da36757fdd9bcfe3281ee83311820302
+SHA256:
+  metadata.gz: 607dd0cf45280387ab9c19b460eab081f2111b1059f8036032e13c1c5c4fd901
+  data.tar.gz: 3d0fa711e084ce2f204dbf69c249363a88d73293a6874c8eb6a175ee920e5cc5
 SHA512:
-  metadata.gz: f4c8fd4a61667aef02f4e9ef392d5b96dac935c1cff109d66d611bc783b6944f5bf8ab5d7dd655080da67b5e521c1a3742a69a895791b902843c0b18d485fedd
-  data.tar.gz: b70e0f02e8a91fc0c821ac0568e9c2dafb8fd1f8e20bac9421f892be5cc074a71a93f722d7c9d84cbfe38b781b6ba7814c601a061c99ea0a9a2de34dd69706a8
+  metadata.gz: f6075b808c1126d4b4d8ba7ea30fb5d899facc78c38f4d0d95afc8c97f5eca8f28aefdf414b267dd45695ebe70feb2dd976be76babb8f8458d1240382077a3f0
+  data.tar.gz: deeafb8a4886f51ce635541756e33ba5c3a98b31e6c4ac6f0a5a37a9f8f8862e2a32d0be2026d90f6f7828157e43ac77261529364f1b2bf697b9a2948f7fd3e4

data/README.md

@@ -1,5 +1,5 @@
 Scalyr output plugin for Fluentd
-=========================
+================================
 
 **Note:** Fluentd introduced breaking changes to their plugin API between
 version 0.12 and 0.14.
@@ -24,7 +24,7 @@ Fluentd may format log messages into json or some other format.  If you want to
   format none
 ```
 
-The Scalyr output plugin assigns a unique Scalyr session id for each Fluentd <match> block.  It is recommended that a single machine doesn't create too many simultaneous Scalyr sessions, so if possible you should try to have a single match for all logs you wish to send to Scalyr.
+The Scalyr output plugin assigns a unique Scalyr session id for each Fluentd <match> block, or for each worker.  It is recommended that a single machine doesn't create too many simultaneous Scalyr sessions, so if possible you should try to have a single match for all logs you wish to send to Scalyr.
 
 This can be done by specifying tags such as scalyr.apache, scalyr.maillog etc and matching on scalyr.\*
 
@@ -66,7 +66,8 @@ The following configuration options are also supported:
 
   #scalyr specific options
   api_write_token YOUR_SCALYR_WRITE_TOKEN
-  compression_type bz2
+  compression_type deflate
+  compression_level 6
   use_hostname_for_serverhost true
   server_attributes {
     "serverHost": "front-1",
@@ -80,7 +81,7 @@ The following configuration options are also supported:
   ssl_verify_depth 5
   message_field message
 
-  max_request_buffer 3000000
+  max_request_buffer 5500000
 
   force_message_encoding nil
   replace_invalid_utf8 false
@@ -99,6 +100,10 @@ The following configuration options are also supported:
 </match>
 ```
 
+For some additional examples of configuration for different setups, please refer to the
+[examples/configs/](https://github.com/scalyr/scalyr-fluentd/tree/master/examples/configs/)
+directory.
+
 ### Scalyr specific options
 
 ***compression_type*** - compress Scalyr traffic to reduce network traffic. Options are `bz2` and `deflate`. See [here](https://www.scalyr.com/help/scalyr-agent#compressing) for more details.  This feature is optional.
@@ -129,7 +134,7 @@ The cURL project maintains CA certificate bundles automatically converted from m
 
 ***message_field*** - Scalyr expects all log events to have a 'message' field containing the contents of a log message.  If your event has the log message stored in another field, you can specify the field name here, and the plugin will rename that field to 'message' before sending the data to Scalyr.  **Note:** this will override any existing 'message' field if the log record contains both a 'message' field and the field specified by this config option.
 
-***max_request_buffer*** - The maximum size in bytes of each request to send to Scalyr.  Defaults to 3,000,000 (3MB).  Fluentd chunks that generate JSON requests larger than the max_request_buffer will be split in to multiple separate requests.  **Note:** The maximum size the Scalyr servers accept for this value is 6MB and requests containing data larger than this will be rejected.
+***max_request_buffer*** - The maximum size in bytes of each request to send to Scalyr.  Defaults to 5,500,000 (5.5MB).  Fluentd chunks that generate JSON requests larger than the max_request_buffer will be split in to multiple separate requests.  **Note:** The maximum size the Scalyr servers accept for this value is 6MB and requests containing data larger than this will be rejected.
 
 ***force_message_encoding*** - Set a specific encoding for all your log messages (defaults to nil).  If your log messages are not in UTF-8, this can cause problems when converting the message to JSON in order to send to the Scalyr server.  You can avoid these problems by setting an encoding for your log messages so they can be correctly converted.
 

data/VERSION

@@ -1 +1 @@
-0.8.9
+0.8.10

data/fluent-plugin-scalyr.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |gem|
   gem.authors = ["Imron Alston"]
   gem.licenses = ["Apache-2.0"]
   gem.email = "imron@scalyr.com"
-  gem.has_rdoc = false
   gem.platform = Gem::Platform::RUBY
   gem.files = Dir['AUTHORS', 'Gemfile', 'LICENSE', 'README.md', 'Rakefile', 'VERSION', 'fluent-plugin-scalyr.gemspec', 'fluent.conf.sample', 'lib/**/*', 'test/**/*']
   gem.test_files = Dir.glob("{test,spec,features}/**/*")

data/fluent.conf.sample

@@ -1,7 +1,7 @@
 <match scalyr.*>
   @type scalyr
   api_write_token YOUR_WRITE_LOGS_API_TOKEN
-  compression_type bz2
+  compression_type deflate
 
   ##Scalyr specific options
   # server_attributes {

data/lib/fluent/plugin/out_scalyr.rb

@@ -43,11 +43,11 @@ module Scalyr
     config_param :ssl_verify_peer, :bool, :default => true
     config_param :ssl_verify_depth, :integer, :default => 5
     config_param :message_field, :string, :default => "message"
-    config_param :max_request_buffer, :integer, :default => 3000000
+    config_param :max_request_buffer, :integer, :default => 5500000
     config_param :force_message_encoding, :string, :default => nil
     config_param :replace_invalid_utf8, :bool, :default => false
     config_param :compression_type, :string, :default => nil #Valid options are bz2, deflate or None. Defaults to None.
-    config_param :compression_level, :integer, :default => 9 #An int containing the compression level of compression to use, from 1-9. Defaults to 9 (max)
+    config_param :compression_level, :integer, :default => 6 #An int containing the compression level of compression to use, from 1-9. Defaults to 6
 
     config_section :buffer do
       config_set_default :retry_max_times, 40 #try a maximum of 40 times before discarding
@@ -67,6 +67,10 @@ module Scalyr
       true
     end
 
+    def multi_workers_ready?
+      true
+    end
+
     def configure( conf )
 
       if conf.elements('buffer').empty?
@@ -139,15 +143,10 @@ module Scalyr
 
     def start
       super
-      $log.info "Scalyr Fluentd Plugin ID - #{self.plugin_id()}"
       #Generate a session id.  This will be called once for each <match> in fluent.conf that uses scalyr
       @session = SecureRandom.uuid
 
-      @sync = Mutex.new
-      #the following variables are all under the control of the above mutex
-        @thread_ids = Hash.new #hash of tags -> id
-        @next_id = 1 #incrementing thread id for the session
-        @last_timestamp = 0 #timestamp of most recent event in nanoseconds since epoch
+      $log.info "Scalyr Fluentd Plugin ID id=#{self.plugin_id()} worker=#{fluentd_worker_id} session=#{@session}"
 
     end
 
@@ -334,22 +333,7 @@ module Scalyr
 
         timestamp = self.to_nanos( sec, nsec )
 
-        thread_id = 0
-
-        @sync.synchronize {
-          #ensure timestamp is at least 1 nanosecond greater than the last one
-          timestamp = [timestamp, @last_timestamp + 1].max
-          @last_timestamp = timestamp
-
-          #get thread id or add a new one if we haven't seen this tag before
-          if @thread_ids.key? tag
-            thread_id = @thread_ids[tag]
-          else
-            thread_id = @next_id
-            @thread_ids[tag] = thread_id
-            @next_id += 1
-          end
-        }
+        thread_id = tag
 
         #then update the map of threads for this chunk
         current_threads[tag] = thread_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-scalyr
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Imron Alston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -168,14 +168,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Scalyr plugin for fluentd
 test_files:
-- test/helper.rb
-- test/test_ssl_verify.rb
 - test/test_handle_response.rb
-- test/test_events.rb
+- test/test_ssl_verify.rb
 - test/test_config.rb
+- test/test_events.rb
+- test/helper.rb