Replace loggregator_emitter gem with gRPC V2 client (#5043)

Author: serdarozerr

Gemfile

@@ -12,7 +12,6 @@ gem 'hashdiff'
 gem 'httpclient'
 gem 'json-diff'
 gem 'json-schema'
-gem 'loggregator_emitter', '~> 5.0'
 gem 'mime-types', '~> 3.7'
 gem 'multipart-parser'
 gem 'netaddr', '>= 2.0.4'

Gemfile.lock

@@ -94,7 +94,6 @@ GEM
       ms_rest_azure (~> 0.7.0)
     backport (1.2.0)
     base64 (0.3.0)
-    beefcake (1.0.0)
     benchmark (0.5.0)
     bigdecimal (4.1.2)
     bit-struct (0.17)
@@ -284,8 +283,6 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loggregator_emitter (5.2.0)
-      beefcake (~> 1.0.0)
     loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -640,7 +637,6 @@ DEPENDENCIES
   json-diff
   json-schema
   listen
-  loggregator_emitter (~> 5.0)
   machinist (~> 1.0.6)
   mime-types (~> 3.7)
   mock_redis

config/cloud_controller.yml

@@ -122,8 +122,7 @@ log_audit_events: false
 telemetry_log_path: spec/artifacts/cloud_controller_telemetry.log
 
 loggregator:
-  router: "127.0.0.1:3456"
-  internal_url: 'http://loggregator-trafficcontroller.service.cf.internal:8081'
+  endpoint: "127.0.0.1:3456"
 
 logcache:
   host: 'http://doppler.service.cf.internal'

lib/cloud_controller/config_schemas/api_schema.rb

@@ -316,8 +316,11 @@ class ApiSchema < VCAP::Config
           },
 
           optional(:loggregator) => {
-            router: String,
-            internal_url: String
+            endpoint: String,
+            optional(:ca_file) => String,
+            optional(:cert_file) => String,
+            optional(:key_file) => String,
+            optional(:subject_name) => String
           },
 
           optional(:fluent) => {

lib/cloud_controller/config_schemas/clock_schema.rb

@@ -179,10 +179,6 @@ class ClockSchema < VCAP::Config
           optional(:uaa_client_secret) => String,
           optional(:uaa_client_scope) => String,
 
-          optional(:loggregator) => {
-            router: String
-          },
-
           optional(:fluent) => {
             optional(:host) => String,
             optional(:port) => Integer

lib/cloud_controller/config_schemas/worker_schema.rb

@@ -195,7 +195,11 @@ class WorkerSchema < VCAP::Config
           },
 
           optional(:loggregator) => {
-            router: String
+            endpoint: String,
+            optional(:ca_file) => String,
+            optional(:cert_file) => String,
+            optional(:key_file) => String,
+            optional(:subject_name) => String
           },
 
           optional(:fluent) => {

lib/cloud_controller/runner.rb

@@ -3,7 +3,7 @@
 require 'cloud_controller/uaa/uaa_token_decoder'
 require 'cloud_controller/uaa/uaa_verification_keys'
 require 'app_log_emitter'
-require 'loggregator_emitter'
+require 'loggregator_emitter/client'
 require 'fluent_emitter'
 require 'cloud_controller/rack_app_builder'
 require 'cloud_controller/metrics/periodic_updater'
@@ -174,16 +174,21 @@ def setup_blobstore
     end
 
     def setup_app_log_emitter
+      VCAP::AppLogEmitter.logger = logger
       VCAP::AppLogEmitter.fluent_emitter = fluent_emitter if @config.get(:fluent)
 
-      if @config.get(:loggregator) && @config.get(
-        :loggregator, :router
+      return unless @config.get(:loggregator) && @config.get(:loggregator, :endpoint)
+
+      VCAP::AppLogEmitter.emitter = LoggregatorEmitter::Client.new(
+        endpoint: @config.get(:loggregator, :endpoint),
+        origin: 'cloud_controller',
+        source_type: 'API',
+        instance_id: @config.get(:index),
+        ca_cert_file: @config.get(:loggregator, :ca_file),
+        client_cert_file: @config.get(:loggregator, :cert_file),
+        client_key_file: @config.get(:loggregator, :key_file),
+        subject_name: @config.get(:loggregator, :subject_name)
       )
-        VCAP::AppLogEmitter.emitter = LoggregatorEmitter::Emitter.new(@config.get(:loggregator, :router), 'cloud_controller', 'API',
-                                                                      @config.get(:index))
-      end
-
-      VCAP::AppLogEmitter.logger = logger
     end
 
     def fluent_emitter

lib/delayed_job/delayed_worker.rb

@@ -3,6 +3,7 @@
 require 'puma'
 require 'prometheus/middleware/exporter'
 require 'cloud_controller/standalone_metrics_webserver'
+require 'loggregator_emitter/client'
 
 class CloudController::DelayedWorker
   DEFAULT_READ_AHEAD_POSTGRES = 0
@@ -96,15 +97,21 @@ def get_initialized_delayed_worker(config, logger)
   end
 
   def setup_app_log_emitter(config, logger)
+    VCAP::AppLogEmitter.logger = logger
     VCAP::AppLogEmitter.fluent_emitter = fluent_emitter(config) if config.get(:fluent)
-    if config.get(:loggregator) && config.get(
-      :loggregator, :router
-    )
-      VCAP::AppLogEmitter.emitter = LoggregatorEmitter::Emitter.new(config.get(:loggregator, :router), 'cloud_controller', 'API',
-                                                                    config.get(:index))
-    end
 
-    VCAP::AppLogEmitter.logger = logger
+    return unless config.get(:loggregator) && config.get(:loggregator, :endpoint)
+
+    VCAP::AppLogEmitter.emitter = LoggregatorEmitter::Client.new(
+      endpoint: config.get(:loggregator, :endpoint),
+      origin: 'cloud_controller',
+      source_type: 'API',
+      instance_id: config.get(:index),
+      ca_cert_file: config.get(:loggregator, :ca_file),
+      client_cert_file: config.get(:loggregator, :cert_file),
+      client_key_file: config.get(:loggregator, :key_file),
+      subject_name: config.get(:loggregator, :subject_name)
+    )
   end
 
   def fluent_emitter(config)