logstash_writer 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56ff81449377331566f5125d7fa345461b53e1cd68722100ac35a109e67338a0
-  data.tar.gz: cba2b98aa5bdb9955e857dd05ec9164d3c27c0eb9958a2b5934a2da54aa9c41c
+  metadata.gz: 0aee91f724739c7f2a3c573dc323048217ca5bcda61728bad1e0daa01b5b6928
+  data.tar.gz: 0e17940054d609ff3097b61b257d1488263c4eb1f13e6e5e3b14b00a9c561369
 SHA512:
-  metadata.gz: 2e8eade114bd9db859908fff83df8a7da5ae5eaab00949adcbf6969dcf04770ad5d79ae72f61ce673b96a298d868a29710eaf3142ecac16e33c5620ff41ea7dd
-  data.tar.gz: 5483adccb182f57023c0787328436d35d82f946e7b17823edb492b999d200152a2c4db53d963d47907d7d072dd416a14d1ed4448216ace4d8c0469aa338ec57e
+  metadata.gz: 7af085a2d487f1c21dedad9f7d897b219ae94047e5e38ce124a7a415f6a99e300220db21cb7ef3eaad3ad6cf474d68418b473bebe5d157b884acabebcf9e1ee0
+  data.tar.gz: 2c0fde510617bb7785deec8c7f16f7a21be006f9c2c087f07d50ae3e1d0ec278b285fdca288c97fc736a862d9e6438394fce45ecbd60113ccce025583750a993

data/README.md

@@ -186,7 +186,7 @@ conduct](CODE_OF_CONDUCT.md).
 Unless otherwise stated, everything in this repo is covered by the following
 copyright notice:
 
-    Copyright (C) 2015  Civilized Discourse Construction Kit, Inc.
+    Copyright (C) 2016,2017,2018  Civilized Discourse Construction Kit, Inc.
 
     This program is free software: you can redistribute it and/or modify it
     under the terms of the GNU General Public License version 3, as

data/lib/logstash_writer.rb

@@ -8,8 +8,8 @@ require 'prometheus/client'
 #
 # Flings events, represented as JSON objects, to logstash using the
 # `json_lines` codec (over TCP).  Doesn't do any munging or modification of
-# the event data given to it, other than adding `@timestamp` and
-# `[@metadata][_id]` fields if they do not already exist.
+# the event data given to it, other than adding a `@timestamp` field if
+# it doesn't already exist.
 #
 # We support highly-available logstash installations by means of multiple
 # address records, or via SRV records.  See the docs for .new for details
@@ -104,8 +104,8 @@ class LogstashWriter
 
   # Add an event to the queue, to be sent to logstash.  Actual event
   # delivery will happen in a worker thread that is started with
-  # #run.  If the event does not have a `@timestamp` or `[@metadata][_id]`
-  # element, they will be added with appropriate values.
+  # #run.  If the event does not have a `@timestamp` field, it will
+  # be added set to the current time.
   #
   # @param e [Hash] the event data to be sent.
   #
@@ -120,22 +120,6 @@ class LogstashWriter
       e[:@timestamp] = Time.now.utc.strftime("%FT%T.%NZ")
     end
 
-    if e.has_key?("@metadata")
-      e[:@metadata] = (e[:@metadata] || {}).merge(e.delete("@metadata"))
-    end
-
-    unless e.has_key?(:@metadata)
-      e[:@metadata] = {}
-    end
-
-    unless e[:@metadata].has_key?(:_id) || e.has_key?("_id")
-      # This is the quickest way I've found to get a long, random string.
-      # We don't need any sort of cryptographic or unpredictability
-      # guarantees for what we're doing here, so SecureRandom is unnecessary
-      # overhead.
-      e[:@metadata][:_id] = rand(0x1000_0000_0000_0000_0000_0000_0000_0000).to_s(36)
-    end
-
     @queue_mutex.synchronize do
       @queue << { content: e, arrival_timestamp: Time.now }
       while @queue.length > @backlog
@@ -303,7 +287,7 @@ class LogstashWriter
             # server and recycle
             @metrics[:write_exception].increment(server: @current_target.describe_peer, class: ex.class.to_s)
             @metrics[:connected].set({ server: @current_target.describe_peer }, 0)
-            @logger.info("LogstashWriter") { "Error while writing to current server #{@current_target.describe_peer}: #{ex.message} (#{ex.class})" }
+            @logger.error("LogstashWriter") { "Error while writing to current server #{@current_target.describe_peer}: #{ex.message} (#{ex.class})" }
             @current_target.close
             @current_target = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash_writer
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Matt Palmer