loggregator_emitter 2.0.3 → 3.0.0

data/.travis.yml

@@ -1,3 +1,6 @@
+notifications:
+  email:
+  - cf-loggregator@pivotallabs.com
 language: ruby
 rvm:
   - 1.9.3

data/lib/loggregator_emitter/emit.rb

@@ -9,35 +9,18 @@ module LoggregatorEmitter
     MAX_MESSAGE_BYTE_SIZE = (9 * 1024) - 512
     TRUNCATED_STRING = "TRUNCATED"
 
-    SOURCE_TYPE_BY_ID = {
-          1 => "CLOUD_CONTROLLER",
-          2 => "ROUTER",
-          3 => "UAA",
-          4 => "DEA",
-          5 => "WARDEN_CONTAINER",
-          6 => "LOGGREGATOR",
-    }
-
-    def initialize(loggregator_server, source_type_or_name, source_id = nil, secret=nil)
+    def initialize(loggregator_server, source_name, source_id = nil, secret=nil)
       @host, @port = loggregator_server.split(/:([^:]*$)/)
 
       raise ArgumentError, "Must provide valid loggregator server: #{loggregator_server}" if !valid_hostname || !valid_port
-      raise ArgumentError, "Must provide valid source_type_or_name: #{source_type_or_name}" unless source_type_or_name
-
       @host = ::Resolv.getaddresses(@host).last
       raise ArgumentError, "Must provide valid loggregator server: #{loggregator_server}" unless @host
 
-      case source_type_or_name
-        when LogMessage::SourceType::CLOUD_CONTROLLER..LogMessage::SourceType::LOGGREGATOR
-          @source_type = source_type_or_name
-          @source_name = SOURCE_TYPE_BY_ID[source_type_or_name]
-        when String
-          raise ArgumentError, "Custom Source String must be 3 characters" unless source_type_or_name.size == 3
-          @source_type = LogMessage::SourceType::UNKNOWN
-          @source_name = source_type_or_name
-        else
-          raise ArgumentError, "Invalid source: #{source_type_or_name.inspect}  Please use a string or a known source type constant"
-      end
+      raise ArgumentError, "Must provide valid source_name: #{source_name}" unless source_name
+
+      raise ArgumentError, "source_name must be a 3-character string" unless source_name.is_a? String
+      raise ArgumentError, "Custom Source String must be 3 characters" unless source_name.size == 3
+      @source_name = source_name
 
       @secret = secret
       @source_id = source_id && source_id.to_s
@@ -87,7 +70,6 @@ module LoggregatorEmitter
       lm.message = message
       lm.app_id = app_id
       lm.source_id = @source_id
-      lm.source_type = @source_type
       lm.source_name = @source_name
       lm.message_type = type
       lm

data/lib/loggregator_messages/log_message.pb.rb

@@ -9,21 +9,11 @@ class LogMessage
     OUT = 1
     ERR = 2
   end
-  module SourceType
-    CLOUD_CONTROLLER = 1
-    ROUTER = 2
-    UAA = 3
-    DEA = 4
-    WARDEN_CONTAINER = 5
-    LOGGREGATOR = 6
-    UNKNOWN = 7
-  end
 
   required :message, :bytes, 1
   required :message_type, LogMessage::MessageType, 2
   required :timestamp, :sint64, 3
   required :app_id, :string, 4
-  required :source_type, LogMessage::SourceType, 5
   optional :source_id, :string, 6
   repeated :drain_urls, :string, 7
   optional :source_name, :string, 8

data/lib/loggregator_messages/log_message.proto

@@ -6,21 +6,10 @@ message LogMessage {
         ERR = 2;
     }
 
-    enum SourceType {
-        CLOUD_CONTROLLER = 1;
-        ROUTER = 2;
-        UAA = 3;
-        DEA = 4;
-        WARDEN_CONTAINER = 5;
-        LOGGREGATOR = 6;
-        UNKNOWN = 7;
-    }
-
     required bytes message = 1;
     required MessageType message_type = 2;
     required sint64 timestamp = 3;
     required string app_id = 4;
-    required SourceType source_type = 5;
     optional string source_id = 6;
     repeated string drain_urls = 7;
     optional string source_name = 8;

data/loggregator_emitter.gemspec

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

data/spec/loggregator_emitter/emit_spec.rb

@@ -19,12 +19,12 @@ describe LoggregatorEmitter do
 
   describe "configuring emitter" do
     describe "valid configurations" do
-      it "is valid with IP and proper source type" do
-        expect { LoggregatorEmitter::Emitter.new("0.0.0.0:12345", LogMessage::SourceType::DEA) }.not_to raise_error
+      it "is valid with IP and proper source name" do
+        expect { LoggregatorEmitter::Emitter.new("0.0.0.0:12345", "DEA") }.not_to raise_error
       end
 
-      it "is valid with resolveable hostname and proper source type" do
-        expect { LoggregatorEmitter::Emitter.new("localhost:12345", LogMessage::SourceType::DEA) }.not_to raise_error
+      it "is valid with resolveable hostname and proper source name" do
+        expect { LoggregatorEmitter::Emitter.new("localhost:12345", "DEA") }.not_to raise_error
       end
 
       it "accepts a string as source type/name" do
@@ -35,15 +35,15 @@ describe LoggregatorEmitter do
     describe "invalid configurations" do
       describe "error based on loggregator_server" do
         it "raises if host has protocol" do
-          expect { LoggregatorEmitter::Emitter.new("http://0.0.0.0:12345", LogMessage::SourceType::DEA) }.to raise_error(ArgumentError)
+          expect { LoggregatorEmitter::Emitter.new("http://0.0.0.0:12345", "DEA") }.to raise_error(ArgumentError)
         end
 
         it "raises if host is blank" do
-          expect { LoggregatorEmitter::Emitter.new(":12345", LogMessage::SourceType::DEA) }.to raise_error(ArgumentError)
+          expect { LoggregatorEmitter::Emitter.new(":12345", "DEA") }.to raise_error(ArgumentError)
         end
 
         it "raises if host is unresolvable" do
-          expect { LoggregatorEmitter::Emitter.new("i.cant.resolve.foo:12345", LogMessage::SourceType::DEA) }.to raise_error(ArgumentError)
+          expect { LoggregatorEmitter::Emitter.new("i.cant.resolve.foo:12345", "DEA") }.to raise_error(ArgumentError)
         end
 
         it "raises if source is an unknown integer" do
@@ -69,7 +69,7 @@ describe LoggregatorEmitter do
 
   describe "emit_log_envelope" do
     def make_emitter(host)
-      LoggregatorEmitter::Emitter.new("#{host}:#{@free_port}", LogMessage::SourceType::CLOUD_CONTROLLER, 42, "secret")
+      LoggregatorEmitter::Emitter.new("#{host}:#{@free_port}", "API", 42, "secret")
     end
 
     it "successfully writes envelope protobuffers" do
@@ -90,7 +90,6 @@ describe LoggregatorEmitter do
 
       expect(message.log_message.message).to eq "Hello there!"
       expect(message.log_message.app_id).to eq "my_app_id"
-      expect(message.log_message.source_type).to eq LogMessage::SourceType::CLOUD_CONTROLLER
       expect(message.log_message.source_id).to eq "42"
       expect(message.log_message.message_type).to eq LogMessage::MessageType::OUT
     end
@@ -114,7 +113,7 @@ describe LoggregatorEmitter do
   {"emit" => LogMessage::MessageType::OUT, "emit_error" => LogMessage::MessageType::ERR}.each do |emit_method, message_type|
     describe "##{emit_method}" do
       def make_emitter(host)
-        LoggregatorEmitter::Emitter.new("#{host}:#{@free_port}", LogMessage::SourceType::CLOUD_CONTROLLER, 42)
+        LoggregatorEmitter::Emitter.new("#{host}:#{@free_port}", "API", 42)
       end
 
       it "successfully writes protobuffers using ipv4" do
@@ -131,7 +130,6 @@ describe LoggregatorEmitter do
         message = messages[0]
         expect(message.message).to eq "Hello there!"
         expect(message.app_id).to eq "my_app_id"
-        expect(message.source_type).to eq LogMessage::SourceType::CLOUD_CONTROLLER
         expect(message.source_id).to eq "42"
         expect(message.message_type).to eq message_type
 
@@ -209,28 +207,27 @@ describe LoggregatorEmitter do
     end
 
     it "when type is known" do
-      @emitter = LoggregatorEmitter::Emitter.new("0.0.0.0:#{@free_port}", LogMessage::SourceType::CLOUD_CONTROLLER)
-      expect(emit_message.source_name).to eq "CLOUD_CONTROLLER"
+      @emitter = LoggregatorEmitter::Emitter.new("0.0.0.0:#{@free_port}", "API")
+      expect(emit_message.source_name).to eq "API"
     end
 
     it "when type is unknown" do
       @emitter = LoggregatorEmitter::Emitter.new("0.0.0.0:#{@free_port}", "STG")
       expect(emit_message.source_name).to eq "STG"
-      expect(emit_message.source_type).to eq LogMessage::SourceType::UNKNOWN
     end
 
     it "id can be nil" do
-      @emitter = LoggregatorEmitter::Emitter.new("0.0.0.0:#{@free_port}", LogMessage::SourceType::CLOUD_CONTROLLER)
+      @emitter = LoggregatorEmitter::Emitter.new("0.0.0.0:#{@free_port}", "API")
       expect(emit_message.source_id).to eq nil
     end
 
     it "id can be passed in as a string" do
-      @emitter = LoggregatorEmitter::Emitter.new("0.0.0.0:#{@free_port}", LogMessage::SourceType::CLOUD_CONTROLLER, "some_source_id")
+      @emitter = LoggregatorEmitter::Emitter.new("0.0.0.0:#{@free_port}", "API", "some_source_id")
       expect(emit_message.source_id).to eq "some_source_id"
     end
 
     it "id can be passed in as an integer" do
-      @emitter = LoggregatorEmitter::Emitter.new("0.0.0.0:#{@free_port}", LogMessage::SourceType::CLOUD_CONTROLLER, 13)
+      @emitter = LoggregatorEmitter::Emitter.new("0.0.0.0:#{@free_port}", "API", 13)
       expect(emit_message.source_id).to eq "13"
     end
   end

data/spec/loggregator_emitter/log_message_extender_spec.rb

@@ -8,8 +8,7 @@ describe LogMessage do
         {
           :message => "thesearebytes",
           :message_type => 1,
-          :timestamp => 3,
-          :source_type => "UAA"
+          :timestamp => 3
         })
 
       expect(msg.message_type_name).to eq("STDOUT")
@@ -20,8 +19,7 @@ describe LogMessage do
         {
           :message => "thesearebytes",
           :message_type => 2,
-          :timestamp => 3,
-          :source_type => "UAA"
+          :timestamp => 3
         })
 
       expect(msg.message_type_name).to eq("STDERR")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loggregator_emitter
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beefcake
@@ -119,6 +119,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -622288572178698844
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25