loggregator_emitter 0.0.12.pre → 0.0.13.pre

data/Gemfile

@@ -1,6 +1,4 @@
 source 'https://rubygems.org'
 
-gem "loggregator_messages", "~> 0.0.5.pre"
-
 # Specify your gem's dependencies in .gemspec
 gemspec

data/Gemfile.lock

@@ -1,16 +1,14 @@
 PATH
   remote: .
   specs:
-    loggregator_emitter (0.0.12.pre)
-      loggregator_messages (~> 0.0.1.pre)
+    loggregator_emitter (0.0.13.pre)
+      beefcake (~> 0.3.7)
 
 GEM
   remote: https://rubygems.org/
   specs:
     beefcake (0.3.7)
     diff-lcs (1.2.4)
-    loggregator_messages (0.0.5.pre)
-      beefcake (~> 0.3.7)
     rake (10.1.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
@@ -27,6 +25,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.3)
   loggregator_emitter!
-  loggregator_messages (~> 0.0.5.pre)
   rake (~> 10.1.0)
   rspec (~> 2.14.1)

data/lib/loggregator_emitter.rb

@@ -1 +1,3 @@
 require "loggregator_emitter/emit"
+require "loggregator_messages/log_message.pb"
+require "loggregator_messages/log_message_extender"

data/lib/loggregator_emitter/emit.rb

@@ -1,4 +1,3 @@
-require "loggregator_messages"
 require 'socket'
 
 module LoggregatorEmitter

data/lib/loggregator_messages/log_message.pb.rb

@@ -0,0 +1,26 @@
+## Generated from log_message.proto for logMessage
+require "beefcake"
+
+
+class LogMessage
+  include Beefcake::Message
+
+  module MessageType
+    OUT = 1
+    ERR = 2
+  end
+  module SourceType
+    CLOUD_CONTROLLER = 1
+    ROUTER = 2
+    UAA = 3
+    DEA = 4
+    WARDEN_CONTAINER = 5
+  end
+
+  required :message, :bytes, 1
+  required :message_type, LogMessage::MessageType, 2
+  required :timestamp, :sint64, 3
+  optional :app_id, :string, 4
+  required :source_type, LogMessage::SourceType, 5
+  optional :source_id, :string, 6
+end

data/lib/loggregator_messages/log_message.proto

@@ -0,0 +1,23 @@
+package logMessage;
+
+message LogMessage {
+    enum MessageType {
+        OUT = 1;
+        ERR = 2;
+    }
+
+    enum SourceType {
+        CLOUD_CONTROLLER = 1;
+        ROUTER = 2;
+        UAA = 3;
+        DEA = 4;
+        WARDEN_CONTAINER = 5;
+    }
+
+    required bytes message = 1;
+    required MessageType message_type = 2;
+    required sint64 timestamp = 3;
+    optional string app_id = 4;
+    required SourceType source_type = 5;
+    optional string source_id = 6;
+}

data/lib/loggregator_messages/log_message_extender.rb

@@ -0,0 +1,23 @@
+class LogMessage
+  def message_type_name
+    {MessageType::OUT => 'STDOUT', MessageType::ERR => 'STDERR'}[message_type]
+  end
+
+  def source_type_name
+    {SourceType::CLOUD_CONTROLLER => 'CF[CC]',
+     SourceType::ROUTER => 'CF[Router]',
+     SourceType::UAA => 'CF[UAA]',
+     SourceType::DEA => 'CF[DEA]',
+     SourceType::WARDEN_CONTAINER => 'App',}[source_type]
+  end
+
+  def time=(time)
+    self.timestamp = (time.tv_sec * 1000000000) + time.tv_nsec
+  end
+
+  def time
+    num_secs = @timestamp / 1000000000
+    fractional_usecs = (@timestamp % 1000000000).to_f / 1000
+    Time.at(num_secs, fractional_usecs)
+  end
+end

data/loggregator_emitter.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "loggregator_emitter"
-  spec.version       = '0.0.12.pre'
+  spec.version       = '0.0.13.pre'
   spec.authors       = ["Pivotal"]
   spec.email         = ["cf-eng@pivotallabs.com"]
   spec.description   = "Library to emit data to Loggregator"
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
 
-  spec.add_dependency "loggregator_messages", "~> 0.0.1.pre"
+  spec.add_dependency "beefcake", "~> 0.3.7"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.0"

data/spec/loggregator_emitter/emit_spec.rb

@@ -1,5 +1,5 @@
 require 'support/fake_loggregator_server'
-require 'loggregator_emitter/emit'
+require 'loggregator_emitter'
 
 describe LoggregatorEmitter do
 

data/spec/loggregator_emitter/log_message_extender_spec.rb

@@ -0,0 +1,114 @@
+require "rspec"
+require "loggregator_emitter"
+
+describe LogMessage do
+  describe "#message_type_name" do
+    it "returns STDOUT for type == 1" do
+      msg = LogMessage.new(
+        {
+          :message => "thesearebytes",
+          :message_type => 1,
+          :timestamp => 3,
+          :source_type => 3
+        })
+
+      expect(msg.message_type_name).to eq("STDOUT")
+    end
+
+    it "returns STDERR for type == 2" do
+      msg = LogMessage.new(
+        {
+          :message => "thesearebytes",
+          :message_type => 2,
+          :timestamp => 3,
+          :source_type => 3
+        })
+
+      expect(msg.message_type_name).to eq("STDERR")
+    end
+  end
+
+  describe "#source_type_name" do
+    it "returns CloudController for type == 1" do
+      msg = LogMessage.new(
+          {
+              :message => "thesearebytes",
+              :message_type => 1,
+              :timestamp => 3,
+              :source_type => 1
+          })
+
+      expect(msg.source_type_name).to eq("CF[CC]")
+    end
+
+    it "returns Router for type == 2" do
+      msg = LogMessage.new(
+          {
+              :message => "thesearebytes",
+              :message_type => 2,
+              :timestamp => 3,
+              :source_type => 2
+          })
+
+      expect(msg.source_type_name).to eq("CF[Router]")
+    end
+    it "returns UAA for type == 3" do
+      msg = LogMessage.new(
+          {
+              :message => "thesearebytes",
+              :message_type => 2,
+              :timestamp => 3,
+              :source_type => 3
+          })
+
+      expect(msg.source_type_name).to eq("CF[UAA]")
+    end
+    it "returns DEA for type == 4" do
+      msg = LogMessage.new(
+          {
+              :message => "thesearebytes",
+              :message_type => 2,
+              :timestamp => 3,
+              :source_type => 4
+          })
+
+      expect(msg.source_type_name).to eq("CF[DEA]")
+    end
+    it "returns WardenContainer for type == 5" do
+      msg = LogMessage.new(
+          {
+              :message => "thesearebytes",
+              :message_type => 2,
+              :timestamp => 3,
+              :source_type => 5
+          })
+
+      expect(msg.source_type_name).to eq("App")
+    end
+  end
+
+  describe "#time=" do
+    it "takes a time object" do
+      msg = LogMessage.new
+      msg.time = Time.utc(2010, 1, 20, 19, 18, 17.654321011)
+
+      expect(msg.timestamp).to eq 1264015097654321011
+    end
+  end
+
+  describe "#time" do
+    it "returns a time object" do
+      msg = LogMessage.new
+      msg.timestamp = 1264015097654321011
+
+      expect(msg.time).to be_a Time
+    end
+
+    it "returns a time object with nanosecond precision" do
+      msg = LogMessage.new
+      msg.timestamp = 1264015097654321011
+
+      expect(msg.time.tv_nsec).to eq 654321011
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loggregator_emitter
 version: !ruby/object:Gem::Version
-  version: 0.0.12.pre
+  version: 0.0.13.pre
   prerelease: 7
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: loggregator_messages
+  name: beefcake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1.pre
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.1.pre
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -91,8 +91,12 @@ files:
 - Rakefile
 - lib/loggregator_emitter.rb
 - lib/loggregator_emitter/emit.rb
+- lib/loggregator_messages/log_message.pb.rb
+- lib/loggregator_messages/log_message.proto
+- lib/loggregator_messages/log_message_extender.rb
 - loggregator_emitter.gemspec
 - spec/loggregator_emitter/emit_spec.rb
+- spec/loggregator_emitter/log_message_extender_spec.rb
 - spec/support/fake_loggregator_server.rb
 homepage: https://www.github.com/cloudfoundry/loggregator_emitter
 licenses:
@@ -121,4 +125,5 @@ specification_version: 3
 summary: Library to emit data to Loggregator
 test_files:
 - spec/loggregator_emitter/emit_spec.rb
+- spec/loggregator_emitter/log_message_extender_spec.rb
 - spec/support/fake_loggregator_server.rb