google-cloud-logging 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4373e8c818d66a86866dda2f4655158c801bbc53a715cd403b322a02b06b13c
-  data.tar.gz: 9a7c2dc232eab76f78d1932c71c8d655bae696de2c2561c07594ceeaafc39215
+  metadata.gz: 1bebb4573f1d510e3c8c6d007a92edbafcdf06c1c1a545791429541e7ee1c3db
+  data.tar.gz: 69f4fff5db4ac937df49ee56b7b93fbcf55e4041610f84f318f56e70703fca6d
 SHA512:
-  metadata.gz: 850c12ebfc25860f521c990d9bc0bf7eedaacd3d7754fa3f2cffcbf14d54107fbd520bdb75c54cba20d347be8f0a1d0e1eb6a2459f765d6dedf01a5c9d5ad295
-  data.tar.gz: 0e4540e7e5ee45505ebd4384503d88317284d38462176ac018b5c69000de78c913ce4db49abdf79bca3ec59e528ba8d8f0b586c6049d8dbd7d663b93b182a196
+  metadata.gz: 7a37da884d7f7f6bd6f7f908f907feda49b59894d7f1534d7b474c77e39e371ea96894185e9921e0a07166f70e2980fb0fc33852679c2dcf440d33cfa8bffdf0
+  data.tar.gz: c01f22ade5fd8c14957446b4e372f6e9476cb77c17b54a91079b86556156a5a6201e4cac80a5459fcaf34d791f623fb45396bd6cd643a57d29065d01cbea44a5

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+### 2.2.0 / 2021-03-10
+
+#### Features
+
+* Drop support for Ruby 2.4 and add support for Ruby 3.0
+
 ### 2.1.0 / 2020-09-16
 
 #### Features

data/CONTRIBUTING.md

@@ -24,7 +24,7 @@ be able to accept your pull requests.
 In order to use the google-cloud-logging console and run the project's tests,
 there is a small amount of setup:
 
-1. Install Ruby. google-cloud-logging requires Ruby 2.4+. You may choose to
+1. Install Ruby. google-cloud-logging requires Ruby 2.5+. You may choose to
    manage your Ruby and gem installations with [RVM](https://rvm.io/),
    [rbenv](https://github.com/rbenv/rbenv), or
    [chruby](https://github.com/postmodern/chruby).
@@ -45,7 +45,7 @@ there is a small amount of setup:
 
    ```sh
    $ cd google-cloud-logging/
-   $ bundle update
+   $ bundle install
    ```
 
 ## Console

data/LOGGING.md

@@ -3,7 +3,7 @@
 To enable logging for this library, set the logger for the underlying
 [gRPC](https://github.com/grpc/grpc/tree/master/src/ruby) library. The logger
 that you set may be a Ruby stdlib
-[`Logger`](https://ruby-doc.org/stdlib-2.5.0/libdoc/logger/rdoc/Logger.html) as
+[`Logger`](https://ruby-doc.org/stdlib/libdoc/logger/rdoc/Logger.html) as
 shown below, or a
 [`Google::Cloud::Logging::Logger`](https://googleapis.dev/ruby/google-cloud-logging/latest)
 that will write logs to [Stackdriver

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

@@ -65,7 +65,7 @@ module Google
 
         ##
         # @private Creates a new AsyncWriter instance.
-        def initialize logging, max_count: 10000, max_bytes: 10000000,
+        def initialize logging, max_count: 10_000, max_bytes: 10_000_000,
                        max_queue: 100, interval: 5, threads: 10,
                        partial_success: false
           # init MonitorMixin
@@ -210,7 +210,7 @@ module Google
             @stopped = true
             publish_batch!
             @cond.broadcast
-            @thread_pool.shutdown if @thread_pool
+            @thread_pool&.shutdown
           end
 
           self
@@ -457,7 +457,8 @@ module Google
         ##
         # @private
         class Batch
-          attr_reader :created_at, :entries
+          attr_reader :created_at
+          attr_reader :entries
 
           def initialize writer
             @writer = writer
@@ -499,7 +500,7 @@ module Google
 
           def publish_wait
             publish_wait = publish_at - Time.now
-            return 0 if publish_wait < 0
+            return 0 if publish_wait.negative?
             publish_wait
           end
 

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

@@ -39,14 +39,19 @@ module Google
         # @private Convert an Object to a Google::Protobuf::Value.
         def self.object_to_value obj
           case obj
-          when NilClass then Google::Protobuf::Value.new null_value: :NULL_VALUE
-          when Numeric then Google::Protobuf::Value.new number_value: obj
-          when String then Google::Protobuf::Value.new string_value: obj
-          when TrueClass then Google::Protobuf::Value.new bool_value: true
-          when FalseClass then Google::Protobuf::Value.new bool_value: false
-          when Hash then
+          when NilClass
+            Google::Protobuf::Value.new null_value: :NULL_VALUE
+          when Numeric
+            Google::Protobuf::Value.new number_value: obj
+          when String
+            Google::Protobuf::Value.new string_value: obj
+          when TrueClass
+            Google::Protobuf::Value.new bool_value: true
+          when FalseClass
+            Google::Protobuf::Value.new bool_value: false
+          when Hash
             Google::Protobuf::Value.new struct_value: hash_to_struct(obj)
-          when Array then
+          when Array
             Google::Protobuf::Value.new list_value: array_to_list(obj)
           else
             # TODO: Could raise ArgumentError here, or convert to a string

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

@@ -27,7 +27,8 @@ module Google
         class HttpRequest
           ##
           # @private Create an empty HttpRequest object.
-          def initialize; end
+          def initialize
+          end
 
           ##
           # The request method. Examples: `"GET"`, `"HEAD"`, `"PUT"`, `"POST"`.

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

@@ -126,17 +126,17 @@ module Google
           #     puts "[#{e.timestamp}] #{e.log_name} #{e.payload.inspect}"
           #   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

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

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

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

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/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

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

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

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

@@ -25,7 +25,10 @@ module Google
       # @private Represents the gRPC Logging service, including all the API
       # methods.
       class Service
-        attr_accessor :project, :credentials, :timeout, :host
+        attr_accessor :project
+        attr_accessor :credentials
+        attr_accessor :timeout
+        attr_accessor :host
 
         ##
         # Creates a new Service instance.

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

@@ -122,17 +122,17 @@ module Google
           #     puts "#{sink.name}: #{sink.filter} -> #{sink.destination}"
           #   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

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Logging
-      VERSION = "2.1.0".freeze
+      VERSION = "2.2.0".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-logging
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2021-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: 1.25.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -290,14 +290,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.13
 signing_key: 
 specification_version: 4
 summary: API Client library for Stackdriver Logging