google-cloud-logging 1.10.8 → 2.2.1

data/lib/google/cloud/logging/entry/operation.rb

@@ -28,7 +28,8 @@ module Google
         class Operation
           ##
           # @private Create an empty Operation object.
-          def initialize; end
+          def initialize
+          end
 
           ##
           # An arbitrary operation identifier. Log entries with the same
@@ -61,10 +62,10 @@ module Google
 
           ##
           # @private Exports the Operation to a
-          # Google::Logging::V2::LogEntryOperation object.
+          # Google::Cloud::Logging::V2::LogEntryOperation object.
           def to_grpc
             return nil if empty?
-            Google::Logging::V2::LogEntryOperation.new(
+            Google::Cloud::Logging::V2::LogEntryOperation.new(
               id:       id.to_s,
               producer: producer.to_s,
               first:    !(!first),
@@ -74,7 +75,7 @@ module Google
 
           ##
           # @private New Google::Cloud::Logging::Entry::Operation from a
-          # Google::Logging::V2::LogEntryOperation object.
+          # Google::Cloud::Logging::V2::LogEntryOperation object.
           def self.from_grpc grpc
             return new if grpc.nil?
             new.tap do |o|

data/lib/google/cloud/logging/entry/source_location.rb

@@ -28,7 +28,8 @@ module Google
         class SourceLocation
           ##
           # @private Create an empty SourceLocation object.
-          def initialize; end
+          def initialize
+          end
 
           ##
           # Source file name. Depending on the runtime environment, this might
@@ -57,10 +58,10 @@ module Google
 
           ##
           # @private Exports the SourceLocation to a
-          # Google::Logging::V2::LogEntrySourceLocation object.
+          # Google::Cloud::Logging::V2::LogEntrySourceLocation object.
           def to_grpc
             return nil if empty?
-            Google::Logging::V2::LogEntrySourceLocation.new(
+            Google::Cloud::Logging::V2::LogEntrySourceLocation.new(
               file:     file.to_s,
               line:     line,
               function: function.to_s
@@ -69,7 +70,7 @@ module Google
 
           ##
           # @private New Google::Cloud::Logging::Entry::SourceLocation from a
-          # Google::Logging::V2::LogEntrySourceLocation object.
+          # Google::Cloud::Logging::V2::LogEntrySourceLocation object.
           def self.from_grpc grpc
             return new if grpc.nil?
             new.tap do |o|

data/lib/google/cloud/logging/log/list.rb

@@ -110,17 +110,17 @@ module Google
           #
           #   logs.all(request_limit: 10) { |l| puts l }
           #
-          def all request_limit: nil
+          def all request_limit: nil, &block
             request_limit = request_limit.to_i if request_limit
             unless block_given?
               return enum_for :all, request_limit: request_limit
             end
             results = self
             loop do
-              results.each { |r| yield r }
+              results.each(&block)
               if request_limit
                 request_limit -= 1
-                break if request_limit < 0
+                break if request_limit.negative?
               end
               break unless results.next?
               results = results.next
@@ -129,7 +129,7 @@ module Google
 
           ##
           # @private New Log::List from a
-          # Google::Logging::V2::ListLogsResponse object.
+          # Google::Cloud::Logging::V2::ListLogsResponse object.
           def self.from_grpc grpc_list, service, resource: nil, max: nil
             logs = new Array(grpc_list.log_names)
             token = grpc_list.next_page_token

data/lib/google/cloud/logging/logger.rb

@@ -313,14 +313,8 @@ module Google
           severity = derive_severity(severity) || ::Logger::UNKNOWN
           return true if severity < @level
 
-          if message.nil?
-            if block_given?
-              message = yield
-            else
-              message = progname
-              # progname = nil # TODO: Figure out what to do with the progname
-            end
-          end
+          message ||= block_given? ? yield : progname
+          # TODO: Figure out what to do with the progname
 
           write_entry severity, message unless @closed
           true
@@ -570,7 +564,7 @@ module Google
             end
           end
 
-          request_env = info && info.env || {}
+          request_env = info&.env || {}
 
           compute_labels(request_env).merge merged_labels
         end
@@ -594,7 +588,7 @@ module Google
         ##
         # @private Get Google Cloud deverity from logger level number.
         def gcloud_severity severity_int
-          %i[DEBUG INFO WARNING ERROR CRITICAL DEFAULT][severity_int]
+          [:DEBUG, :INFO, :WARNING, :ERROR, :CRITICAL, :DEFAULT][severity_int]
         rescue StandardError
           :DEFAULT
         end
@@ -610,11 +604,9 @@ module Google
         ##
         # @private Compute values for labels
         def compute_labels request_env
-          Hash[
-            labels.map do |k, value_or_proc|
-              [k, compute_label_value(request_env, value_or_proc)]
-            end
-          ]
+          labels.to_h.transform_values do |value_or_proc|
+            compute_label_value request_env, value_or_proc
+          end
         end
 
         ##

data/lib/google/cloud/logging/metric.rb

@@ -43,14 +43,14 @@ module Google
         attr_accessor :service
 
         ##
-        # @private The gRPC Google::Logging::V2::LogMetric object.
+        # @private The gRPC Google::Cloud::Logging::V2::LogMetric object.
         attr_accessor :grpc
 
         ##
         # @private Create an empty Metric object.
         def initialize
           @service = nil
-          @grpc = Google::Logging::V2::LogMetric.new
+          @grpc = Google::Cloud::Logging::V2::LogMetric.new
         end
 
         ##

data/lib/google/cloud/logging/metric/list.rb

@@ -123,17 +123,17 @@ module Google
           #     puts "#{metric.name}: #{metric.filter}"
           #   end
           #
-          def all request_limit: nil
+          def all request_limit: nil, &block
             request_limit = request_limit.to_i if request_limit
             unless block_given?
               return enum_for :all, request_limit: request_limit
             end
             results = self
             loop do
-              results.each { |r| yield r }
+              results.each(&block)
               if request_limit
                 request_limit -= 1
-                break if request_limit < 0
+                break if request_limit.negative?
               end
               break unless results.next?
               results = results.next
@@ -142,7 +142,7 @@ module Google
 
           ##
           # @private New Metric::List from a
-          # Google::Logging::V2::ListLogMetricsResponse object.
+          # Google::Cloud::Logging::V2::ListLogMetricsResponse object.
           def self.from_grpc grpc_list, service, max = nil
             metrics = new(Array(grpc_list.metrics).map do |grpc_metric|
               Metric.from_grpc grpc_metric, service

data/lib/google/cloud/logging/middleware.rb

@@ -57,7 +57,7 @@ module Google
         def initialize app, logger: nil, on_init: nil, **kwargs
           @app = app
 
-          load_config kwargs
+          load_config(**kwargs)
 
           logger ||= Middleware.logger
           logger ||= begin
@@ -71,7 +71,7 @@ module Google
             Middleware.logger = logging.logger log_name, resource
           end
 
-          on_init.call if on_init
+          on_init&.call
 
           @logger = logger
         end
@@ -288,9 +288,7 @@ module Google
         ##
         # Fallback to default configuration values if not defined already
         def init_default_config
-          configuration.project_id ||= begin
-            (Cloud.configure.project_id || Logging.default_project_id)
-          end
+          configuration.project_id ||= (Cloud.configure.project_id || Logging.default_project_id)
           configuration.credentials ||= Cloud.configure.credentials
           configuration.log_name ||= DEFAULT_LOG_NAME
           configuration.log_name_map ||= DEFAULT_LOG_NAME_MAP

data/lib/google/cloud/logging/project.rb

@@ -357,7 +357,7 @@ module Google
         #                       resource: resource,
         #                       labels: labels
         #
-        def async_writer max_batch_count: 10000, max_batch_bytes: 10000000,
+        def async_writer max_batch_count: 10_000, max_batch_bytes: 10_000_000,
                          max_queue_size: 100, interval: 5, threads: 10,
                          partial_success: false
 

data/lib/google/cloud/logging/rails.rb

@@ -158,7 +158,7 @@ module Google
         ##
         # @private Merge Rails configuration into Logging instrumentation
         # configuration.
-        def self.merge_rails_config rails_config # rubocop:disable AbcSize
+        def self.merge_rails_config rails_config
           gcp_config = rails_config.google_cloud
           log_config = gcp_config.logging
 
@@ -175,13 +175,10 @@ module Google
             config.log_name ||= log_config.log_name
             config.labels ||= log_config.labels
             config.log_name_map ||= log_config.log_name_map
-            config.monitored_resource.type ||=
-              log_config.monitored_resource.type
-            config.monitored_resource.labels ||=
-              log_config.monitored_resource.labels.to_h
+            config.monitored_resource.type ||= log_config.monitored_resource.type
+            config.monitored_resource.labels ||= log_config.monitored_resource.labels.to_h
             if config.set_default_logger_on_rails_init.nil?
-              config.set_default_logger_on_rails_init = \
-                log_config.set_default_logger_on_rails_init
+              config.set_default_logger_on_rails_init = log_config.set_default_logger_on_rails_init
             end
           end
         end
@@ -206,15 +203,15 @@ module Google
               # if credentials is not a Credentials object, create one
               Logging::Credentials.new credentials
             end
-          rescue Exception => e
-            STDOUT.puts "Note: Google::Cloud::Logging is disabled because " \
+          rescue Exception => e # rubocop:disable Lint/RescueException
+            $stdout.puts "Note: Google::Cloud::Logging is disabled because " \
               "it failed to authorize with the service. (#{e.message}) " \
               "Falling back to the default Rails logger."
             return false
           end
 
           if project_id.to_s.empty?
-            STDOUT.puts "Note: Google::Cloud::Logging is disabled because " \
+            $stdout.puts "Note: Google::Cloud::Logging is disabled because " \
               "the project ID could not be determined. " \
               "Falling back to the default Rails logger."
             return false

data/lib/google/cloud/logging/resource_descriptor/list.rb

@@ -128,17 +128,17 @@ module Google
           #     puts rd.type
           #   end
           #
-          def all request_limit: nil
+          def all request_limit: nil, &block
             request_limit = request_limit.to_i if request_limit
             unless block_given?
               return enum_for :all, request_limit: request_limit
             end
             results = self
             loop do
-              results.each { |r| yield r }
+              results.each(&block)
               if request_limit
                 request_limit -= 1
-                break if request_limit < 0
+                break if request_limit.negative?
               end
               break unless results.next?
               results = results.next
@@ -147,7 +147,7 @@ module Google
 
           ##
           # @private New ResourceDescriptor::List from a
-          # Google::Logging::V2::ListMonitoredResourceDescriptorsResponse
+          # Google::Cloud::Logging::V2::ListMonitoredResourceDescriptorsResponse
           # object.
           def self.from_grpc grpc_list, service, max = nil
             rds = new(Array(grpc_list.resource_descriptors).map do |grpc|

data/lib/google/cloud/logging/service.rb

@@ -16,7 +16,6 @@
 require "google/cloud/errors"
 require "google/cloud/logging/version"
 require "google/cloud/logging/v2"
-require "google/gax/errors"
 require "uri"
 
 module Google
@@ -26,61 +25,59 @@ module Google
       # @private Represents the gRPC Logging service, including all the API
       # methods.
       class Service
-        attr_accessor :project, :credentials, :timeout, :client_config, :host
+        attr_accessor :project
+        attr_accessor :credentials
+        attr_accessor :timeout
+        attr_accessor :host
 
         ##
         # Creates a new Service instance.
-        def initialize project, credentials, timeout: nil, client_config: nil,
-                       host: nil
+        def initialize project, credentials, timeout: nil, host: nil
           @project = project
           @credentials = credentials
           @timeout = timeout
-          @client_config = client_config || {}
-          @host = host || V2::LoggingServiceV2Client::SERVICE_ADDRESS
+          @host = host
         end
 
         def logging
           return mocked_logging if mocked_logging
           @logging ||= \
-            V2::LoggingServiceV2Client.new(
-              credentials:     credentials,
-              timeout:         timeout,
-              client_config:   client_config,
-              service_address: service_address,
-              service_port:    service_port,
-              lib_name:        "gccl",
-              lib_version:     Google::Cloud::Logging::VERSION
-            )
+            V2::LoggingService::Client.new do |config|
+              config.credentials = credentials if credentials
+              config.timeout = timeout if timeout
+              config.endpoint = host if host
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::Logging::VERSION
+              config.metadata = { "google-cloud-resource-prefix" => "projects/#{@project}" }
+            end
         end
         attr_accessor :mocked_logging
 
         def sinks
           return mocked_sinks if mocked_sinks
           @sinks ||= \
-            V2::ConfigServiceV2Client.new(
-              credentials:     credentials,
-              timeout:         timeout,
-              client_config:   client_config,
-              service_address: service_address,
-              service_port:    service_port,
-              lib_name:        "gccl",
-              lib_version:     Google::Cloud::Logging::VERSION
-            )
+            V2::ConfigService::Client.new do |config|
+              config.credentials = credentials if credentials
+              config.timeout = timeout if timeout
+              config.endpoint = host if host
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::Logging::VERSION
+              config.metadata = { "google-cloud-resource-prefix" => "projects/#{@project}" }
+            end
         end
         attr_accessor :mocked_sinks
 
         def metrics
           return mocked_metrics if mocked_metrics
           @metrics ||= \
-            V2::MetricsServiceV2Client.new(
-              credentials:     credentials,
-              timeout:         timeout,
-              client_config:   client_config,
-              service_address: service_address,
-              service_port:    service_port,
-              lib_name:        "gccl",
-              lib_version:     Google::Cloud::Logging::VERSION
-            )
+            V2::MetricsService::Client.new do |config|
+              config.credentials = credentials if credentials
+              config.timeout = timeout if timeout
+              config.endpoint = host if host
+              config.lib_name = "gccl"
+              config.lib_version = Google::Cloud::Logging::VERSION
+              config.metadata = { "google-cloud-resource-prefix" => "projects/#{@project}" }
+            end
         end
         attr_accessor :mocked_metrics
 
@@ -90,20 +87,12 @@ module Google
           project_ids = Array(projects).map { |p| "projects/#{p}" }
           resource_names = Array(resources) + project_ids
           resource_names = ["projects/#{@project}"] if resource_names.empty?
-          call_opts = default_options
-          if token
-            call_opts = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
-
-          execute do
-            paged_enum = logging.list_log_entries \
-              resource_names, filter: filter, order_by: order, page_size: max,
-                              options: call_opts
-            paged_enum.page.response
-          end
+          paged_enum = logging.list_log_entries resource_names: resource_names,
+                                                filter:         filter,
+                                                order_by:       order,
+                                                page_size:      max,
+                                                page_token:     token
+          paged_enum.response
         end
 
         def write_entries entries, log_name: nil, resource: nil, labels: nil,
@@ -114,157 +103,93 @@ module Google
           end
           resource = resource.to_grpc if resource
           labels = Hash[labels.map { |k, v| [String(k), String(v)] }] if labels
-
-          execute do
-            logging.write_log_entries entries,
-                                      log_name: log_path(log_name),
-                                      resource: resource, labels: labels,
-                                      partial_success: partial_success,
-                                      options: default_options
-          end
+          logging.write_log_entries entries:         entries,
+                                    log_name:        log_path(log_name),
+                                    resource:        resource,
+                                    labels:          labels,
+                                    partial_success: partial_success
         end
 
         def list_logs resource: nil, token: nil, max: nil
           parent = resource || "projects/#{@project}"
-          call_opts = default_options
-          if token
-            call_opts = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
-
-          execute do
-            paged_enum = logging.list_logs parent, page_size: max,
-                                                   options:   call_opts
-            paged_enum.page.response
-          end
+          paged_enum = logging.list_logs parent:     parent,
+                                         page_size:  max,
+                                         page_token: token
+          paged_enum.response
         end
 
         def delete_log name
-          execute do
-            logging.delete_log log_path(name), options: default_options
-          end
+          logging.delete_log log_name: log_path(name)
         end
 
         def list_resource_descriptors token: nil, max: nil
-          call_opts = default_options
-          if token
-            call_opts = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
-
-          execute do
-            logging.list_monitored_resource_descriptors \
-              page_size: max, options: call_opts
-          end
+          logging.list_monitored_resource_descriptors page_size: max, page_token: token
         end
 
         def list_sinks token: nil, max: nil
-          call_opts = default_options
-          if token
-            call_opts = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
-
-          execute do
-            paged_enum = sinks.list_sinks \
-              project_path, page_size: max, options: call_opts
-            paged_enum.page.response
-          end
+          paged_enum = sinks.list_sinks parent: project_path, page_size: max, page_token: token
+          paged_enum.response
         end
 
         def create_sink name, destination, filter, unique_writer_identity: nil
-          sink = Google::Logging::V2::LogSink.new({
-            name: name, destination: destination, filter: filter
-          }.delete_if { |_, v| v.nil? })
-
-          execute do
-            sinks.create_sink project_path, sink,
-                              unique_writer_identity: unique_writer_identity,
-                              options:                default_options
-          end
+          sink = Google::Cloud::Logging::V2::LogSink.new(
+            {
+              name: name, destination: destination, filter: filter
+            }.delete_if { |_, v| v.nil? }
+          )
+          sinks.create_sink parent:                 project_path,
+                            sink:                   sink,
+                            unique_writer_identity: unique_writer_identity
         end
 
         def get_sink name
-          execute { sinks.get_sink sink_path(name), options: default_options }
+          sinks.get_sink sink_name: sink_path(name)
         end
 
         def update_sink name, destination, filter, unique_writer_identity: nil
-          sink = Google::Logging::V2::LogSink.new(
+          sink = Google::Cloud::Logging::V2::LogSink.new(
             {
               name: name, destination: destination, filter: filter
             }.delete_if { |_, v| v.nil? }
           )
-
-          execute do
-            sinks.update_sink sink_path(name), sink,
-                              unique_writer_identity: unique_writer_identity,
-                              options:                default_options
-          end
+          sinks.update_sink sink_name:              sink_path(name),
+                            sink:                   sink,
+                            unique_writer_identity: unique_writer_identity
         end
 
         def delete_sink name
-          execute do
-            sinks.delete_sink sink_path(name), options: default_options
-          end
+          sinks.delete_sink sink_name: sink_path(name)
         end
 
         def list_metrics token: nil, max: nil
-          call_opts = default_options
-          if token
-            call_opts = Google::Gax::CallOptions.new(
-              kwargs:     default_headers,
-              page_token: token
-            )
-          end
-
-          execute do
-            paged_enum = metrics.list_log_metrics \
-              project_path, page_size: max, options: call_opts
-            paged_enum.page.response
-          end
+          paged_enum = metrics.list_log_metrics parent:     project_path,
+                                                page_size:  max,
+                                                page_token: token
+          paged_enum.response
         end
 
         def create_metric name, filter, description
-          metric = Google::Logging::V2::LogMetric.new(
+          metric = Google::Cloud::Logging::V2::LogMetric.new(
             { name: name, description: description,
               filter: filter }.delete_if { |_, v| v.nil? }
           )
-
-          execute do
-            metrics.create_log_metric project_path, metric,
-                                      options: default_options
-          end
+          metrics.create_log_metric parent: project_path, metric: metric
         end
 
         def get_metric name
-          execute do
-            metrics.get_log_metric metric_path(name), options: default_options
-          end
+          metrics.get_log_metric metric_name: metric_path(name)
         end
 
         def update_metric name, description, filter
-          metric = Google::Logging::V2::LogMetric.new(
+          metric = Google::Cloud::Logging::V2::LogMetric.new(
             { name: name, description: description,
               filter: filter }.delete_if { |_, v| v.nil? }
           )
-
-          execute do
-            metrics.update_log_metric metric_path(name), metric,
-                                      options: default_options
-          end
+          metrics.update_log_metric metric_name: metric_path(name), metric: metric
         end
 
         def delete_metric name
-          execute do
-            metrics.delete_log_metric metric_path(name),
-                                      options: default_options
-          end
+          metrics.delete_log_metric metric_name: metric_path(name)
         end
 
         def log_path log_name
@@ -280,16 +205,6 @@ module Google
 
         protected
 
-        def service_address
-          return nil if host.nil?
-          URI.parse("//#{host}").host
-        end
-
-        def service_port
-          return nil if host.nil?
-          URI.parse("//#{host}").port
-        end
-
         def project_path
           "projects/#{@project}"
         end
@@ -304,14 +219,6 @@ module Google
           "#{project_path}/metrics/#{metric_name}"
         end
 
-        def default_headers
-          { "google-cloud-resource-prefix" => "projects/#{@project}" }
-        end
-
-        def default_options
-          Google::Gax::CallOptions.new kwargs: default_headers
-        end
-
         ##
         # @private Get a Google::Protobuf::Timestamp object from a Time object.
         def time_to_timestamp time
@@ -329,13 +236,6 @@ module Google
           # Time.at takes microseconds, so convert nano seconds to microseconds
           Time.at timestamp.seconds, Rational(timestamp.nanos, 1000)
         end
-
-        def execute
-          yield
-        rescue Google::Gax::GaxError => e
-          # GaxError wraps BadStatus, but exposes it as #cause
-          raise Google::Cloud::Error.from_error(e.cause)
-        end
       end
     end
   end