logstash_writer 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e9c21173eb335510d759c7a95e155143843638f57683255a76b6004d5436d43
-  data.tar.gz: 84b3446aeed41977f6323afa1ddc2dbb30d6ac53ae1bf4e5a809754c63a308cb
+  metadata.gz: 9576e2183a13c91af62f4c79799abfc40d972fd73fdcdae1ac0bad43130dcd60
+  data.tar.gz: 374055c057069d5fc384238d3c7e25d94a3a1dcdc36043bc91b59f41816351e7
 SHA512:
-  metadata.gz: 44e83922151535909f5994645bfcbf4049b98213759fa4b3655a3f4bfe185fca8da7c6970c6e95cee8f081e53bfe2ed020d8502eced9f1aa30625c88b5634bd4
-  data.tar.gz: 68131f6cf7c645a67a0d71ac95247b084bde331b464770bfed28bb2153365e40c06e3265f0399096f55150e2e5b000e23d63bf3622336f72c689f162a70f91ef
+  metadata.gz: 13e50c9fd6de39119a8ceee4950d5c43317678c4af61fc2bd85a531b2fb57be2825e0ca1ca46324a5a3a791dc797b6c6d428e58459965504c4b91bf5e89b2ec4
+  data.tar.gz: c6d45ca2e6dd84fc0047a97e31dbfd6a1841e2e4f978fa91bd46e876837d0ae82a55351d873d0cd86fffc675ca8865e03b12f8dd5e0498cfc5052a53dff8f50d

data/README.md

@@ -6,11 +6,11 @@ implementation of a means of getting events to a logstash cluster.
 
 It's a gem:
 
-    gem install gemplate
+    gem install logstash_writer
 
 There's also the wonders of [the Gemfile](http://bundler.io):
 
-    gem 'gemplate'
+    gem 'logstash_writer'
 
 If you're the sturdy type that likes to run from git:
 
@@ -41,6 +41,10 @@ as that is fixed, we are stuck with the `json_lines` approach.
 
 # Usage
 
+Start by including the necessary files:
+
+    require 'logstash_writer'
+
 An instance of `LogstashWriter` needs to be given the location of a server
 (or servers) to send the events to.  This can be any of:
 
@@ -117,7 +121,7 @@ The metrics that are exposed are:
   always be `received - (sent + dropped)`, but this gauge is maintained
   separately as a cross-check in case of bugs.
 
-* **`logstash_writer_last_sent_event_timestamp`** -- the UTC timestamp,
+* **`logstash_writer_last_sent_event_time_seconds`** -- the UTC timestamp,
   represented as the number of (fractional) seconds since the Unix epoch, at
   which the most recent event sent to a logstash server was originally
   submitted via `#send_event`.  This might require some unpacking.
@@ -129,7 +133,7 @@ The metrics that are exposed are:
 
   Firstly, if there are queued events, you can tell how far behind in real
   time your logstash event history is, by calculating `NOW() -
-  logstash_writer_last_sent_event_timestamp`.  Thus, if you're not finding
+  logstash_writer_last_sent_event_time_seconds`.  Thus, if you're not finding
   events in your Kibana dashboard you were expecting to see, you can tell
   that there's a clog in the pipes by looking at this.
 

data/lib/logstash_writer.rb

@@ -79,7 +79,7 @@ class LogstashWriter
       queue_size:          metrics_registry.gauge(:"#{metrics_prefix}_queue_size", "The number of events currently in the queue to be sent"),
       dropped:             metrics_registry.counter(:"#{metrics_prefix}_events_dropped_total", "The number of events which have been dropped from the queue"),
 
-      lag:                 metrics_registry.gauge(:"#{metrics_prefix}_last_sent_event_timestamp", "When the last event successfully sent to logstash was originally received"),
+      lag:                 metrics_registry.gauge(:"#{metrics_prefix}_last_sent_event_time_seconds", "When the last event successfully sent to logstash was originally received"),
 
       connected:           metrics_registry.gauge(:"#{metrics_prefix}_connected_to_server", "Boolean flag indicating whether we are currently connected to a logstash server"),
       connect_exception:   metrics_registry.counter(:"#{metrics_prefix}_connect_exceptions_total", "The number of exceptions that have occurred whilst attempting to connect to a logstash server"),
@@ -115,7 +115,7 @@ class LogstashWriter
     end
 
     unless e.has_key?(:@timestamp) || e.has_key?("@timestamp")
-      e[:@timestamp] = Time.now.utc.strftime("%FT%TZ")
+      e[:@timestamp] = Time.now.utc.strftime("%FT%T.%NZ")
     end
 
     unless e.has_key?(:_id) || e.has_key?("_id")
@@ -243,6 +243,12 @@ class LogstashWriter
           end
         rescue StandardError => ex
           @logger.error("LogstashWriter") { (["Exception in write_loop: #{ex.message} (#{ex.class})"] + ex.backtrace).join("\n  ") }
+          # If there was some sort of error, there's a non-trivial chance the
+          # socket has gone *boom*, so let's invalidate it and go around again
+          if @current_socket
+            @current_socket.close
+            @current_socket = nil
+          end
           @queue_mutex.synchronize { @queue.unshift(event) if event }
           @metrics[:write_loop_exception].increment(class: ex.class.to_s)
           @metrics[:write_loop_ok].set({}, 0)

data/logstash_writer.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 2.3.0"
 
-  s.add_runtime_dependency "frankenstein", "~> 1.0"
   # prometheus-client provides no guaranteed backwards compatibility,
   # and in fact happily breaks things with no notice, so we're stuck
   # with hard-coding a specific version to avoid unexpected disaster.

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: logstash_writer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-10-03 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: frankenstein
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: prometheus-client
   requirement: !ruby/object:Gem::Requirement