fluent-plugin-google-cloud 0.12.10 → 0.12.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bbc10ef9a5f3f10b7a2557bf3876dd63a613423f1294504fdda212bc986ed6d
-  data.tar.gz: ae2e397ebc1fc18b2e97c1e1553a8eee3d782bc2160850344bb7bf4126c6263c
+  metadata.gz: fa2b2de4444cf81be485251db598ee31599684827a2c4ecef5227e1254622aa6
+  data.tar.gz: 0d11b11e1f6fcdbb6d712133f911c15eb968f74e020dbfa98a30cfb6e5717602
 SHA512:
-  metadata.gz: 1363d1c35d8a1dc951f8c4c373d59a7c893fba8e8fcc0bf3d4d0f5463b3f00ff407351e7fd21f1fbc7a2c89481f273b59a2b3e1ae7035417dc74cdcce5bc9ced
-  data.tar.gz: edb5f975479e4aa0a814fe51808bfeb3d875842aea757f162da8f807c49d974905f6d27c6eae7d0185bb5b5a63f942326156e7e9b3e0f2d08f5f738f0c4e8f24
+  metadata.gz: ca9bf71962b1f2f19270a278f12d4c4e4626bc8f7e0bfc235802ae24f95ae7e65f44243c6600d8f23fedbdcdd840b4fce53b3ccddb4a454806cf32286b3d7ed8
+  data.tar.gz: 64cf9cd901800e5ea6711356101c8a39a1310ef99c17e34fd2a3676629abc2a32ad4a60af709d57749953c14e7f6dcad5d01c14880a3e0781e09579924fe8cc7

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.12.10)
+    fluent-plugin-google-cloud (0.12.11)
       fluentd (= 1.13.3)
-      google-api-client (= 0.30.8)
+      google-api-client (= 0.44.2)
       google-cloud-logging (= 1.6.6)
       google-protobuf (= 3.20.0)
       googleapis-common-protos (= 1.3.10)
       googleauth (= 0.9.0)
       grpc (= 1.45.0)
-      json (= 2.2.0)
+      json (= 2.6.3)
       opencensus (= 0.5.0)
       opencensus-stackdriver (= 0.4.1)
 
@@ -51,14 +51,15 @@ GEM
       googleapis-common-protos-types (>= 1.0.4, < 2.0)
       googleauth (~> 0.9)
       grpc (~> 1.25)
-    google-api-client (0.30.8)
+    google-api-client (0.44.2)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.10.0)
+      googleauth (~> 0.9)
       httpclient (>= 2.8.1, < 3.0)
       mini_mime (~> 1.0)
       representable (~> 3.0)
       retriable (>= 2.0, < 4.0)
-      signet (~> 0.10)
+      rexml
+      signet (~> 0.12)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
@@ -104,7 +105,7 @@ GEM
     hashdiff (1.0.1)
     http_parser.rb (0.7.0)
     httpclient (2.8.3)
-    json (2.2.0)
+    json (2.6.3)
     jwt (2.7.0)
     memoist (0.16.2)
     metaclass (0.0.4)
@@ -122,17 +123,17 @@ GEM
       google-cloud-trace-v2 (~> 0.1)
       opencensus (~> 0.5)
     os (1.1.4)
-    parser (2.7.2.0)
+    parallel (1.22.1)
+    parser (3.2.1.1)
       ast (~> 2.4.1)
     power_assert (2.0.3)
-    powerpack (0.1.3)
     prometheus-client (0.9.0)
       quantile (~> 0.2.1)
     public_suffix (5.0.1)
     quantile (0.2.1)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.1.1)
     rake (10.5.0)
+    regexp_parser (2.7.0)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
@@ -140,12 +141,18 @@ GEM
     retriable (3.1.2)
     rexml (3.2.5)
     rly (0.2.3)
-    rubocop (0.39.0)
-      parser (>= 2.3.0.7, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+    rubocop (1.48.1)
+      json (~> 2.3)
+      parallel (~> 1.10)
+      parser (>= 3.2.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.28.0)
+      parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     serverengine (2.3.2)
       sigdump (~> 0.2.2)
@@ -174,10 +181,10 @@ GEM
     trailblazer-option (0.1.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2022.7)
+    tzinfo-data (1.2023.2)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.4.2)
     webmock (3.6.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
@@ -194,7 +201,7 @@ DEPENDENCIES
   mocha (= 1.9.0)
   prometheus-client (< 0.10)
   rake (= 10.5.0)
-  rubocop (= 0.39.0)
+  rubocop (= 1.48.1)
   test-unit (= 3.3.3)
   webmock (= 3.6.2)
 

data/Rakefile

@@ -28,15 +28,16 @@ task :fix_perms do
   end
 
   files.each do |file|
-    mode = File.stat(file).mode & 0777
-    next unless mode & 0444 != 0444
+    mode = File.stat(file).mode & 0o777
+    next unless mode & 0o444 != 0o444
+
     puts "Changing mode of #{file} from #{mode.to_s(8)} to "\
-         "#{(mode | 0444).to_s(8)}"
-    chmod mode | 0444, file
+         "#{(mode | 0o444).to_s(8)}"
+    chmod mode | 0o444, file
   end
 end
 
 desc 'Run unit tests and RuboCop to check for style violations'
-task all: [:rubocop, :test, :fix_perms]
+task all: %i[rubocop test fix_perms]
 
 task default: :all

data/fluent-plugin-google-cloud.gemspec

@@ -1,35 +1,35 @@
 Gem::Specification.new do |gem|
   gem.name          = 'fluent-plugin-google-cloud'
-  gem.description   = <<-eos
+  gem.description   = <<-DESCRIPTION
    Fluentd plugins for the Stackdriver Logging API, which will make logs
    viewable in the Stackdriver Logs Viewer and can optionally store them
    in Google Cloud Storage and/or BigQuery.
    This is an official Google Ruby gem.
-eos
+  DESCRIPTION
   gem.summary       = 'fluentd plugins for the Stackdriver Logging API'
   gem.homepage      =
     'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
   gem.license       = 'Apache-2.0'
-  gem.version       = '0.12.10'
+  gem.version       = '0.12.11'
   gem.authors       = ['Stackdriver Agents Team']
   gem.email         = ['stackdriver-agents@google.com']
-  gem.required_ruby_version = Gem::Requirement.new('>= 2.2')
+  gem.required_ruby_version = Gem::Requirement.new('>= 2.6')
 
   gem.files         = Dir['**/*'].keep_if { |file| File.file?(file) }
   gem.test_files    = gem.files.grep(/^(test)/)
   gem.require_paths = ['lib']
 
-  # Note: In order to update the Fluentd version, please update both here and
+  # NOTE: In order to update the Fluentd version, please update both here and
   # also the fluentd version in
   # https://github.com/GoogleCloudPlatform/google-fluentd/blob/master/config/software/fluentd.rb.
   gem.add_runtime_dependency 'fluentd', '1.13.3'
+  gem.add_runtime_dependency 'google-api-client', '0.44.2'
   gem.add_runtime_dependency 'googleapis-common-protos', '1.3.10'
   gem.add_runtime_dependency 'googleauth', '0.9.0'
-  gem.add_runtime_dependency 'google-api-client', '0.30.8'
   gem.add_runtime_dependency 'google-cloud-logging', '1.6.6'
   gem.add_runtime_dependency 'google-protobuf', '3.20.0'
   gem.add_runtime_dependency 'grpc', '1.45.0'
-  gem.add_runtime_dependency 'json', '2.2.0'
+  gem.add_runtime_dependency 'json', '2.6.3'
   gem.add_runtime_dependency 'opencensus', '0.5.0'
   gem.add_runtime_dependency 'opencensus-stackdriver', '0.4.1'
 
@@ -42,9 +42,9 @@ eos
   # initialized.
   # https://github.com/googleapis/google-auth-library-ruby/issues/227
   # https://github.com/farcaller/rly/issues/2
+  gem.add_development_dependency 'coveralls', '0.8.23'
   gem.add_development_dependency 'rake', '10.5.0'
-  gem.add_development_dependency 'rubocop', '0.39.0'
+  gem.add_development_dependency 'rubocop', '1.48.1'
   gem.add_development_dependency 'test-unit', '3.3.3'
   gem.add_development_dependency 'webmock', '3.6.2'
-  gem.add_development_dependency 'coveralls', '0.8.23'
 end

data/lib/fluent/plugin/common.rb

@@ -12,13 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'uri'
+
 module Common
   # Constants for service names, resource types and etc.
   module ServiceConstants
     APPENGINE_CONSTANTS = {
       service: 'appengine.googleapis.com',
       resource_type: 'gae_app',
-      metadata_attributes: %w(gae_backend_name gae_backend_version)
+      metadata_attributes: %w[gae_backend_name gae_backend_version]
     }.freeze
     COMPUTE_CONSTANTS = {
       service: 'compute.googleapis.com',
@@ -27,9 +29,9 @@ module Common
     GKE_CONSTANTS = {
       service: 'container.googleapis.com',
       resource_type: 'gke_container',
-      extra_resource_labels: %w(namespace_id pod_id container_name),
-      extra_common_labels: %w(namespace_name pod_name),
-      metadata_attributes: %w(cluster-name cluster-location),
+      extra_resource_labels: %w[namespace_id pod_id container_name],
+      extra_common_labels: %w[namespace_name pod_name],
+      metadata_attributes: %w[cluster-name cluster-location],
       stream_severity_map: {
         'stdout' => 'INFO',
         'stderr' => 'ERROR'
@@ -47,12 +49,12 @@ module Common
     DATAFLOW_CONSTANTS = {
       service: 'dataflow.googleapis.com',
       resource_type: 'dataflow_step',
-      extra_resource_labels: %w(region job_name job_id step_id)
+      extra_resource_labels: %w[region job_name job_id step_id]
     }.freeze
     DATAPROC_CONSTANTS = {
       service: 'cluster.dataproc.googleapis.com',
       resource_type: 'cloud_dataproc_cluster',
-      metadata_attributes: %w(dataproc-cluster-uuid dataproc-cluster-name)
+      metadata_attributes: %w[dataproc-cluster-uuid dataproc-cluster-name]
     }.freeze
     EC2_CONSTANTS = {
       service: 'ec2.amazonaws.com',
@@ -61,7 +63,7 @@ module Common
     ML_CONSTANTS = {
       service: 'ml.googleapis.com',
       resource_type: 'ml_job',
-      extra_resource_labels: %w(job_id task_name)
+      extra_resource_labels: %w[job_id task_name]
     }.freeze
 
     # The map between a subservice name and a resource type.
@@ -111,7 +113,7 @@ module Common
       end
 
       begin
-        open('http://' + METADATA_SERVICE_ADDR, proxy: false) do |f|
+        URI.open("http://#{METADATA_SERVICE_ADDR}", proxy: false) do |f|
           if f.meta['metadata-flavor'] == 'Google'
             @log.info 'Detected GCE platform'
             return Platform::GCE
@@ -132,10 +134,10 @@ module Common
     def fetch_gce_metadata(platform, metadata_path)
       raise "Called fetch_gce_metadata with platform=#{platform}" unless
         platform == Platform::GCE
+
       # See https://cloud.google.com/compute/docs/metadata
-      open('http://' + METADATA_SERVICE_ADDR + '/computeMetadata/v1/' +
-           metadata_path, 'Metadata-Flavor' => 'Google', :proxy => false,
-           &:read)
+      URI.open("http://#{METADATA_SERVICE_ADDR}/computeMetadata/v1/#{metadata_path}",
+               'Metadata-Flavor' => 'Google', :proxy => false, &:read)
     end
 
     # EC2 Metadata server returns everything in one call. Store it after the
@@ -143,10 +145,10 @@ module Common
     def ec2_metadata(platform)
       raise "Called ec2_metadata with platform=#{platform}" unless
         platform == Platform::EC2
+
       unless @ec2_metadata
         # See http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-metadata.html
-        open('http://' + METADATA_SERVICE_ADDR +
-             '/latest/dynamic/instance-identity/document', proxy: false) do |f|
+        URI.open("http://#{METADATA_SERVICE_ADDR}/latest/dynamic/instance-identity/document", proxy: false) do |f|
           contents = f.read
           @ec2_metadata = JSON.parse(contents)
         end
@@ -164,6 +166,7 @@ module Common
         missing << 'vm_id' unless vm_id
       end
       return if missing.empty?
+
       raise Fluent::ConfigError,
             "Unable to obtain metadata parameters: #{missing.join(' ')}"
     end
@@ -203,15 +206,16 @@ module Common
     # 2. If not, try to retrieve it locally.
     def get_location(platform, zone, use_aws_availability_zone)
       # Response format: "projects/<number>/zones/<zone>"
-      zone ||= fetch_gce_metadata(platform,
-                                  'instance/zone').rpartition('/')[2] if
-        platform == Platform::GCE
+      if platform == Platform::GCE
+        zone ||= fetch_gce_metadata(platform,
+                                    'instance/zone').rpartition('/')[2]
+      end
       aws_location_key = if use_aws_availability_zone
                            'availabilityZone'
                          else
                            'region'
                          end
-      zone ||= 'aws:' + ec2_metadata(platform)[aws_location_key] if
+      zone ||= "aws:#{ec2_metadata(platform)[aws_location_key]}" if
         platform == Platform::EC2 &&
         ec2_metadata(platform).key?(aws_location_key)
       zone
@@ -222,7 +226,8 @@ module Common
     # Create a monitored resource from type and labels.
     def create_monitored_resource(type, labels)
       Google::Apis::LoggingV2::MonitoredResource.new(
-        type: type, labels: labels.to_h)
+        type: type, labels: labels.to_h
+      )
     end
 
     # Retrieve monitored resource via the legacy way.
@@ -231,25 +236,30 @@ module Common
     # Metadata Agent. Thus it should be equivalent to what Metadata Agent
     # returns.
     def determine_agent_level_monitored_resource_via_legacy(
-          platform, subservice_name, detect_subservice, vm_id, zone)
+      platform, subservice_name, detect_subservice, vm_id, zone
+    )
       resource_type = determine_agent_level_monitored_resource_type(
-        platform, subservice_name, detect_subservice)
+        platform, subservice_name, detect_subservice
+      )
       create_monitored_resource(
         resource_type,
         determine_agent_level_monitored_resource_labels(
-          platform, resource_type, vm_id, zone))
+          platform, resource_type, vm_id, zone
+        )
+      )
     end
 
     # Determine agent level monitored resource type.
     def determine_agent_level_monitored_resource_type(
-          platform, subservice_name, detect_subservice)
+      platform, subservice_name, detect_subservice
+    )
       case platform
       when Platform::OTHER
         # Unknown platform will be defaulted to GCE instance.
-        return COMPUTE_CONSTANTS[:resource_type]
+        COMPUTE_CONSTANTS[:resource_type]
 
       when Platform::EC2
-        return EC2_CONSTANTS[:resource_type]
+        EC2_CONSTANTS[:resource_type]
 
       when Platform::GCE
         # Resource types determined by subservice_name config.
@@ -269,14 +279,15 @@ module Common
         end
 
         # GCE instance.
-        return COMPUTE_CONSTANTS[:resource_type]
+        COMPUTE_CONSTANTS[:resource_type]
       end
     end
 
     # Determine agent level monitored resource labels based on the resource
     # type. Each resource type has its own labels that need to be filled in.
     def determine_agent_level_monitored_resource_labels(
-          platform, type, vm_id, zone)
+      platform, type, vm_id, zone
+    )
       case type
       # GAE app.
       when APPENGINE_CONSTANTS[:resource_type]
@@ -293,6 +304,7 @@ module Common
       when COMPUTE_CONSTANTS[:resource_type]
         raise "Cannot construct a #{type} resource without vm_id and zone" \
           unless vm_id && zone
+
         return {
           'instance_id' => vm_id,
           'zone' => zone
@@ -302,6 +314,7 @@ module Common
       when GKE_CONSTANTS[:resource_type]
         raise "Cannot construct a #{type} resource without vm_id and zone" \
           unless vm_id && zone
+
         return {
           'instance_id' => vm_id,
           'zone' => zone,
@@ -327,6 +340,7 @@ module Common
       when EC2_CONSTANTS[:resource_type]
         raise "Cannot construct a #{type} resource without vm_id and zone" \
           unless vm_id && zone
+
         labels = {
           'instance_id' => vm_id,
           'region' => zone
@@ -352,9 +366,8 @@ module Common
       # Returns the project ID (as a string) on success, or nil on failure.
       def self.project_id
         creds = Google::Auth.get_application_default(LOGGING_SCOPE)
-        if creds.respond_to?(:project_id)
-          return creds.project_id if creds.project_id
-        end
+        return creds.project_id if creds.respond_to?(:project_id) && creds.project_id
+
         if creds.issuer
           id = extract_project_id(creds.issuer)
           return id unless id.nil?

data/lib/fluent/plugin/filter_add_insert_ids.rb

@@ -65,21 +65,11 @@ module Fluent
       @log.info "Initialized the insert ID key to #{@insert_id}."
     end
 
-    def configure(conf)
-      super
-    end
-
-    def shutdown
-      super
-    end
-
     # rubocop:disable Lint/UnusedMethodArgument
     def filter(tag, time, record)
       # Only generate and add an insertId field if the record is a hash and
       # the insert ID field is not already set (or set to an empty string).
-      if record.is_a?(Hash) && record[@insert_id_key].to_s.empty?
-        record[@insert_id_key] = increment_insert_id
-      end
+      record[@insert_id_key] = increment_insert_id if record.is_a?(Hash) && record[@insert_id_key].to_s.empty?
       record
     end
     # rubocop:enable Lint/UnusedMethodArgument