middleware.rb in google-cloud-logging-1.5.0

- old
+ new

@@ -20,16 +20,17 @@
     module Logging
       class Middleware
         ##
         # The default log name used to instantiate the default logger if one
         # isn't provided.
-        DEFAULT_LOG_NAME = "ruby_app_log"
+        DEFAULT_LOG_NAME = "ruby_app_log".freeze
 
         ##
         # A default value for the log_name_map argument. Directs health check
         # logs to a separate log name so they don't spam the main log.
-        DEFAULT_LOG_NAME_MAP = { "/_ah/health" => "ruby_health_check_log" }
+        DEFAULT_LOG_NAME_MAP =
+          { "/_ah/health" => "ruby_health_check_log" }.freeze
 
         ##
         # The Google::Cloud::Logging::Logger instance
         attr_reader :logger
 
@@ -57,15 +58,16 @@
 
           if logger
             @logger = logger
           else
             log_name = configuration.log_name
-            logging = Logging.new project: configuration.project_id,
-                                  keyfile: configuration.keyfile
+            logging = Logging.new project_id: configuration.project_id,
+                                  credentials: configuration.credentials
             resource = Middleware.build_monitored_resource(
               configuration.monitored_resource.type,
-              configuration.monitored_resource.labels)
+              configuration.monitored_resource.labels
+            )
             @logger = logging.logger log_name, resource
           end
         end
 
         ##
@@ -223,21 +225,23 @@
         def self.default_monitored_resource
           type, labels =
             if Google::Cloud.env.app_engine?
               ["gae_app", {
                 module_id: Google::Cloud.env.app_engine_service_id,
-                version_id: Google::Cloud.env.app_engine_service_version }]
+                version_id: Google::Cloud.env.app_engine_service_version
+              }]
             elsif Google::Cloud.env.container_engine?
               ["container", {
                 cluster_name: Google::Cloud.env.container_engine_cluster_name,
                 namespace_id: \
                   Google::Cloud.env.container_engine_namespace_id || "default"
               }]
             elsif Google::Cloud.env.compute_engine?
               ["gce_instance", {
                 instance_id: Google::Cloud.env.instance_name,
-                zone: Google::Cloud.env.instance_zone }]
+                zone: Google::Cloud.env.instance_zone
+              }]
             else
               ["global", {}]
             end
 
           Google::Cloud::Logging::Resource.new.tap do |r|
@@ -254,25 +258,28 @@
         # Consolidate configurations from various sources. Also set
         # instrumentation config parameters to default values if not set
         # already.
         #
         def load_config **kwargs
-          configuration.project_id = kwargs[:project_id] ||
-                                     configuration.project_id
-          configuration.keyfile = kwargs[:keyfile] ||
-                                  configuration.keyfile
-          configuration.log_name_map ||= kwargs[:log_name_map] ||
-                                         configuration.log_name_map
+          project_id = kwargs[:project] || kwargs[:project_id]
+          configuration.project_id = project_id unless project_id.nil?
 
+          creds = kwargs[:credentials] || kwargs[:keyfile]
+          configuration.credentials = creds unless creds.nil?
+
+          log_name_map = kwargs[:log_name_map]
+          configuration.log_name_map = log_name_map unless log_name_map.nil?
+
           init_default_config
         end
 
         ##
         # Fallback to default configuration values if not defined already
         def init_default_config
-          configuration.project_id ||= Cloud.configure.project_id ||
-                                       Logging::Project.default_project_id
-          configuration.keyfile ||= Cloud.configure.keyfile
+          configuration.project_id ||= begin
+            (Cloud.configure.project_id || Logging.default_project_id)
+          end
+          configuration.credentials ||= Cloud.configure.credentials
           configuration.log_name ||= DEFAULT_LOG_NAME
           configuration.log_name_map ||= DEFAULT_LOG_NAME_MAP
         end
 
         ##