loggregator_emitter 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf819100b9ada951567d64e0d8e95bbadadb394f
-  data.tar.gz: a9659c18062b4c13a2a4b4e0b5bc028348f7407a
+  metadata.gz: 0d1ef9bf97fbc5930c29130a377344fa40b1264b
+  data.tar.gz: 9fd666bb99d2120fa012cb2f372e17a8f335de35
 SHA512:
-  metadata.gz: 44999954cf8adb80fd69b1c287fcf01e86b2eb7eb7d1af81105c95cd4c8e0c07fc3df5afd007a2ead1b6830b107cad66b78187e4ab6434903ec0f241bdb9306f
-  data.tar.gz: 818ebb9490ddafb9c96d601c0af77fac9539c6519eba2fbe73a125249a72176c0fe4230891b62d371676bc6c022b6aa7de16c68aa28938212ec87c8ce8116778
+  metadata.gz: 800c01ae3b281d7738fac0c5473a3f28a15d9a7c9cf4a52a6b2d4381888e116c4532c1ea9786e1e02cc52f421e24a282ebcba8b29755dd426e232ed9c83da7e6
+  data.tar.gz: 80df9ff95e024d76be537843d3c70cf725b8366ca6c64ff02a5396ab698bc8385a1e571c11724d8790c1d6cef47af21b4ef6c1eef8151f8708c90bad0059f0fa

data/README.md

@@ -39,7 +39,7 @@ Call emit() or emit_error() on this emitter with the application GUID and the me
 
 ### Regenerating Protobuf library
 
-BEEFCAKE_NAMESPACE=Sonde protoc --beefcake_out lib/sonde -I lib/sonde lib/sonde/sonde.proto
+BEEFCAKE_NAMESPACE=Sonde protoc --beefcake_out lib/sonde -I ~/workspace/cf-release/src/loggregator/src/github.com/cloudfoundry/sonde-go/definitions/events ~/workspace/cf-release/src/loggregator/src/github.com/cloudfoundry/sonde-go/definitions/events/envelope.proto
 
 ### Versioning
 

data/lib/loggregator_emitter/emit.rb

@@ -1,7 +1,6 @@
 require 'socket'
 require 'resolv'
-require 'sonde/sonde.pb'
-require 'sonde/sonde_extender'
+require 'sonde'
 
 module LoggregatorEmitter
   class Emitter

data/lib/sonde.rb

@@ -0,0 +1,7 @@
+require 'sonde/error.pb'
+require 'sonde/metric.pb'
+require 'sonde/log.pb'
+require 'sonde/uuid.pb'
+require 'sonde/http.pb'
+require 'sonde/envelope.pb'
+require 'sonde/sonde_extender'

data/lib/sonde/envelope.pb.rb

@@ -0,0 +1,38 @@
+## Generated from envelope.proto for events
+require "beefcake"
+
+module Sonde
+
+  class Envelope
+    include Beefcake::Message
+
+    module EventType
+      HttpStart = 2
+      HttpStop = 3
+      HttpStartStop = 4
+      LogMessage = 5
+      ValueMetric = 6
+      CounterEvent = 7
+      Error = 8
+      ContainerMetric = 9
+    end
+  end
+
+  class Envelope
+    required :origin, :string, 1
+    required :eventType, Envelope::EventType, 2
+    optional :timestamp, :int64, 6
+    optional :deployment, :string, 13
+    optional :job, :string, 14
+    optional :index, :string, 15
+    optional :ip, :string, 16
+    optional :httpStart, HttpStart, 4
+    optional :httpStop, HttpStop, 5
+    optional :httpStartStop, HttpStartStop, 7
+    optional :logMessage, LogMessage, 8
+    optional :valueMetric, ValueMetric, 9
+    optional :counterEvent, CounterEvent, 10
+    optional :error, Error, 11
+    optional :containerMetric, ContainerMetric, 12
+  end
+end

data/lib/sonde/error.pb.rb

@@ -0,0 +1,15 @@
+## Generated from error.proto for events
+require "beefcake"
+
+module Sonde
+
+  class Error
+    include Beefcake::Message
+  end
+
+  class Error
+    required :source, :string, 1
+    required :code, :int32, 2
+    required :message, :string, 3
+  end
+end

data/lib/sonde/http.pb.rb

@@ -0,0 +1,110 @@
+## Generated from http.proto for events
+require "beefcake"
+
+module Sonde
+
+  module PeerType
+    Client = 1
+    Server = 2
+  end
+
+  module Method
+    GET = 1
+    POST = 2
+    PUT = 3
+    DELETE = 4
+    HEAD = 5
+    ACL = 6
+    BASELINE_CONTROL = 7
+    BIND = 8
+    CHECKIN = 9
+    CHECKOUT = 10
+    CONNECT = 11
+    COPY = 12
+    DEBUG = 13
+    LABEL = 14
+    LINK = 15
+    LOCK = 16
+    MERGE = 17
+    MKACTIVITY = 18
+    MKCALENDAR = 19
+    MKCOL = 20
+    MKREDIRECTREF = 21
+    MKWORKSPACE = 22
+    MOVE = 23
+    OPTIONS = 24
+    ORDERPATCH = 25
+    PATCH = 26
+    PRI = 27
+    PROPFIND = 28
+    PROPPATCH = 29
+    REBIND = 30
+    REPORT = 31
+    SEARCH = 32
+    SHOWMETHOD = 33
+    SPACEJUMP = 34
+    TEXTSEARCH = 35
+    TRACE = 36
+    TRACK = 37
+    UNBIND = 38
+    UNCHECKOUT = 39
+    UNLINK = 40
+    UNLOCK = 41
+    UPDATE = 42
+    UPDATEREDIRECTREF = 43
+    VERSION_CONTROL = 44
+  end
+
+  class HttpStart
+    include Beefcake::Message
+  end
+
+  class HttpStop
+    include Beefcake::Message
+  end
+
+  class HttpStartStop
+    include Beefcake::Message
+  end
+
+  class HttpStart
+    required :timestamp, :int64, 1
+    required :requestId, UUID, 2
+    required :peerType, PeerType, 3
+    required :method, Method, 4
+    required :uri, :string, 5
+    required :remoteAddress, :string, 6
+    required :userAgent, :string, 7
+    optional :parentRequestId, UUID, 8
+    optional :applicationId, UUID, 9
+    optional :instanceIndex, :int32, 10
+    optional :instanceId, :string, 11
+  end
+
+  class HttpStop
+    required :timestamp, :int64, 1
+    required :uri, :string, 2
+    required :requestId, UUID, 3
+    required :peerType, PeerType, 4
+    required :statusCode, :int32, 5
+    required :contentLength, :int64, 6
+    optional :applicationId, UUID, 7
+  end
+
+  class HttpStartStop
+    required :startTimestamp, :int64, 1
+    required :stopTimestamp, :int64, 2
+    required :requestId, UUID, 3
+    required :peerType, PeerType, 4
+    required :method, Method, 5
+    required :uri, :string, 6
+    required :remoteAddress, :string, 7
+    required :userAgent, :string, 8
+    required :statusCode, :int32, 9
+    required :contentLength, :int64, 10
+    optional :parentRequestId, UUID, 11
+    optional :applicationId, UUID, 12
+    optional :instanceIndex, :int32, 13
+    optional :instanceId, :string, 14
+  end
+end

data/lib/sonde/log.pb.rb

@@ -0,0 +1,23 @@
+## Generated from log.proto for events
+require "beefcake"
+
+module Sonde
+
+  class LogMessage
+    include Beefcake::Message
+
+    module MessageType
+      OUT = 1
+      ERR = 2
+    end
+  end
+
+  class LogMessage
+    required :message, :bytes, 1
+    required :message_type, LogMessage::MessageType, 2
+    required :timestamp, :int64, 3
+    optional :app_id, :string, 4
+    optional :source_type, :string, 5
+    optional :source_instance, :string, 6
+  end
+end

data/lib/sonde/metric.pb.rb

@@ -0,0 +1,37 @@
+## Generated from metric.proto for events
+require "beefcake"
+
+module Sonde
+
+  class ValueMetric
+    include Beefcake::Message
+  end
+
+  class CounterEvent
+    include Beefcake::Message
+  end
+
+  class ContainerMetric
+    include Beefcake::Message
+  end
+
+  class ValueMetric
+    required :name, :string, 1
+    required :value, :double, 2
+    required :unit, :string, 3
+  end
+
+  class CounterEvent
+    required :name, :string, 1
+    required :delta, :uint64, 2
+    optional :total, :uint64, 3
+  end
+
+  class ContainerMetric
+    required :applicationId, :string, 1
+    required :instanceIndex, :int32, 2
+    required :cpuPercentage, :double, 3
+    required :memoryBytes, :uint64, 4
+    required :diskBytes, :uint64, 5
+  end
+end

data/lib/sonde/sonde_extender.rb

@@ -1,5 +1,4 @@
 module Sonde
-
   class LogMessage
     def message_type_name
       {MessageType::OUT => 'STDOUT', MessageType::ERR => 'STDERR'}[message_type]
@@ -15,5 +14,4 @@ module Sonde
       Time.at(num_secs, fractional_usecs)
     end
   end
-
 end

data/lib/sonde/uuid.pb.rb

@@ -0,0 +1,14 @@
+## Generated from uuid.proto for events
+require "beefcake"
+
+module Sonde
+
+  class UUID
+    include Beefcake::Message
+  end
+
+  class UUID
+    required :low, :uint64, 1
+    required :high, :uint64, 2
+  end
+end

data/loggregator_emitter.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "loggregator_emitter"
-  spec.version       = '5.0.0'
+  spec.version       = '5.0.1'
   spec.authors       = ["Pivotal"]
   spec.email         = ["cf-eng@pivotallabs.com"]
   spec.description   = "Library to emit data to Loggregator"

data/spec/support/fake_loggregator_server.rb

@@ -1,6 +1,5 @@
 require 'socket'
-require 'sonde/sonde.pb'
-require 'sonde/sonde_extender'
+require 'sonde'
 
 class FakeLoggregatorServer
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loggregator_emitter
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Pivotal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -98,9 +98,14 @@ files:
 - lib/loggregator_messages/log_message.pb.rb
 - lib/loggregator_messages/log_message.proto
 - lib/loggregator_messages/log_message_extender.rb
-- lib/sonde/sonde.pb.rb
-- lib/sonde/sonde.proto
+- lib/sonde.rb
+- lib/sonde/envelope.pb.rb
+- lib/sonde/error.pb.rb
+- lib/sonde/http.pb.rb
+- lib/sonde/log.pb.rb
+- lib/sonde/metric.pb.rb
 - lib/sonde/sonde_extender.rb
+- lib/sonde/uuid.pb.rb
 - lib/symmetric/encryption.rb
 - loggregator_emitter.gemspec
 - spec/loggregator_emitter/emit_performance_spec.rb

data/lib/sonde/sonde.pb.rb

@@ -1,42 +0,0 @@
-## Generated from sonde.proto for events
-require "beefcake"
-
-module Sonde
-
-  class Envelope
-    include Beefcake::Message
-
-    module EventType
-      LogMessage = 5
-    end
-  end
-
-  class LogMessage
-    include Beefcake::Message
-
-    module MessageType
-      OUT = 1
-      ERR = 2
-    end
-  end
-
-  class Envelope
-    required :origin, :string, 1
-    required :eventType, Envelope::EventType, 2
-    optional :timestamp, :int64, 6
-    optional :deployment, :string, 13
-    optional :job, :string, 14
-    optional :index, :string, 15
-    optional :ip, :string, 16
-    optional :logMessage, LogMessage, 8
-  end
-
-  class LogMessage
-    required :message, :bytes, 1
-    required :message_type, LogMessage::MessageType, 2
-    required :timestamp, :int64, 3
-    optional :app_id, :string, 4
-    optional :source_type, :string, 5
-    optional :source_instance, :string, 6
-  end
-end

data/lib/sonde/sonde.proto

@@ -1,39 +0,0 @@
-package events;
-
-/// Envelope wraps an Event and adds metadata.
-message Envelope {
-    /// Type of the wrapped event.
-    enum EventType {
-        LogMessage = 5;
-    }
-
-    required string origin = 1;               /// Unique description of the origin of this event.
-    required EventType eventType = 2;         /// Type of wrapped event. Only the optional field corresponding to the value of eventType should be set.
-
-    optional int64 timestamp = 6;             /// UNIX timestamp (in nanoseconds) event was wrapped in this Envelope.
-
-    optional string deployment = 13;          /// Deployment name (used to uniquely identify source).
-    optional string job = 14;                 /// Job name (used to uniquely identify source).
-    optional string index = 15;               /// Index of job (used to uniquely identify source).
-    optional string ip = 16;                  /// IP address (used to uniquely identify source).
-
-    // Removed Heartbeat at position 3
-    optional LogMessage logMessage = 8;
-}
-
-/// A LogMessage contains a "log line" and associated metadata.
-message LogMessage {
-
-    /// MessageType stores the destination of the message (corresponding to STDOUT or STDERR).
-    enum MessageType {
-        OUT = 1;
-        ERR = 2;
-    }
-
-    required bytes message = 1;            /// Bytes of the log message. (Note that it is not required to be a single line.)
-    required MessageType message_type = 2; /// Type of the message (OUT or ERR).
-    required int64 timestamp = 3;          /// UNIX timestamp (in nanoseconds) when the log was written.
-    optional string app_id = 4;            /// Application that emitted the message (or to which the application is related).
-    optional string source_type = 5;       /// Source of the message. For Cloud Foundry, this can be "APP", "RTR", "DEA", "STG", etc.
-    optional string source_instance = 6;   /// Instance that emitted the message.
-}