fluent-plugin-google-cloud 0.10.9 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfb8318e26804ad6f09d4e16777e3bbef7448a671f6a81dc3c2c2e30fd5e8a92
-  data.tar.gz: 4410e23d39d9dacf8fad1b9053be2fc9da055c37e3be1fcd13916a04f0ae3758
+  metadata.gz: d9e2068fdf6e41a45b160c309d16a3fa0dd58ef555f19c76c93e798f0da03815
+  data.tar.gz: f9902899c11ecf784433b7437d9efcd0ebda4ff812aeaee7edb6e7aeffbc6d66
 SHA512:
-  metadata.gz: f28ea72b58f2ed3d8eedea65b002fad2dda4ffc8a62b4b0a5c5c26fd54e04a058d680ea9745199fa8dcfbae5b1b984400a3cae5e88332b563453eb0c6415967e
-  data.tar.gz: 2992d107c0617ba61f6637d6f0e57d997b6b19068d9c67bbd7794adef43489a8bf7dc133601ddfe59d1a150f47ce6b41388fb0decbded25a4d49b35dfabf2b00
+  metadata.gz: 39777bfde0e2c738c2d50506660604209e0860bd89a6669acfa1cc94bae5696d6bfae1089f17c7b197fa807ff6db8caac5e278a94b3c7db35b44366cf31c8d40
+  data.tar.gz: 71ded0ece74b31da78d665862a1fcd54c9ef0407c6b0f6bbd4eff26cfbe49072d8f17d84c9c86af8a97b14a3c380756df2578f88eb3beefacce2278724e02be5

data/Gemfile.lock

@@ -1,25 +1,31 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.10.9)
-      fluentd (= 1.11.2)
-      google-api-client (= 0.30.8)
-      google-cloud-logging (= 1.6.6)
-      google-protobuf (= 3.15.8)
-      googleapis-common-protos (= 1.3.10)
-      googleauth (= 0.9.0)
-      grpc (= 1.31.1)
-      json (= 2.2.0)
+    fluent-plugin-google-cloud (0.13.1)
+      fluentd (= 1.13.3)
+      google-api-client (= 0.53.0)
+      google-cloud-logging (= 2.3.2)
+      google-cloud-monitoring-v3 (= 0.10.0)
+      google-protobuf (= 3.22.1)
+      googleapis-common-protos (= 1.4.0)
+      googleauth (= 1.3.0)
+      grpc (= 1.53.0)
+      json (= 2.6.3)
       opencensus (= 0.5.0)
-      opencensus-stackdriver (= 0.3.2)
+      opencensus-stackdriver (= 0.4.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    activesupport (7.0.6)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.4)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.2.2)
     cool.io (1.7.1)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
@@ -30,135 +36,153 @@ GEM
     crack (0.4.5)
       rexml
     declarative (0.0.20)
-    docile (1.3.5)
-    faraday (0.17.4)
-      multipart-post (>= 1.2, < 3)
-    fluentd (1.11.2)
+    docile (1.4.0)
+    faraday (2.7.10)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
+    faraday-retry (2.2.0)
+      faraday (~> 2.0)
+    fluentd (1.13.3)
+      bundler
       cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.7.0)
+      http_parser.rb (>= 0.5.1, < 0.8.0)
       msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.0.4, < 3.0.0)
+      serverengine (>= 2.2.2, < 3.0.0)
       sigdump (~> 0.2.2)
       strptime (>= 0.2.2, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
+      webrick (>= 1.4.2, < 1.8.0)
       yajl-ruby (~> 1.0)
-    gapic-common (0.3.4)
-      google-protobuf (~> 3.12, >= 3.12.2)
-      googleapis-common-protos (>= 1.3.9, < 2.0)
-      googleapis-common-protos-types (>= 1.0.4, < 2.0)
-      googleauth (~> 0.9)
-      grpc (~> 1.25)
-    google-api-client (0.30.8)
+    gapic-common (0.19.1)
+      faraday (>= 1.9, < 3.a)
+      faraday-retry (>= 1.0, < 3.a)
+      google-protobuf (~> 3.14)
+      googleapis-common-protos (>= 1.3.12, < 2.a)
+      googleapis-common-protos-types (>= 1.3.1, < 2.a)
+      googleauth (~> 1.0)
+      grpc (~> 1.36)
+    gems (1.2.0)
+    google-api-client (0.53.0)
+      google-apis-core (~> 0.1)
+      google-apis-generator (~> 0.1)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (>= 0.5, < 0.10.0)
-      httpclient (>= 2.8.1, < 3.0)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
       mini_mime (~> 1.0)
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-      signet (~> 0.10)
+      retriable (>= 2.0, < 4.a)
+      rexml
+      webrick
+    google-apis-discovery_v1 (0.14.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-generator (0.12.0)
+      activesupport (>= 5.0)
+      gems (~> 1.2)
+      google-apis-core (>= 0.11.0, < 2.a)
+      google-apis-discovery_v1 (~> 0.5)
+      thor (>= 0.20, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.5.0)
-      faraday (>= 0.17.3, < 2.0)
-    google-cloud-errors (1.1.0)
-    google-cloud-logging (1.6.6)
-      concurrent-ruby (~> 1.1)
-      google-cloud-core (~> 1.2)
-      google-gax (~> 1.7)
-      googleapis-common-protos-types (>= 1.0.2)
-      stackdriver-core (~> 1.3)
-    google-cloud-monitoring (0.38.0)
-      google-gax (~> 1.8)
-      googleapis-common-protos (>= 1.3.9, < 2.0)
-      googleapis-common-protos-types (>= 1.0.4, < 2.0)
-    google-cloud-trace (0.41.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-logging (2.3.2)
       concurrent-ruby (~> 1.1)
       google-cloud-core (~> 1.5)
-      google-cloud-trace-v1 (~> 0.0)
-      google-cloud-trace-v2 (~> 0.0)
+      google-cloud-logging-v2 (~> 0.0)
       stackdriver-core (~> 1.3)
-    google-cloud-trace-v1 (0.3.0)
-      gapic-common (~> 0.3)
+    google-cloud-logging-v2 (0.10.1)
+      gapic-common (>= 0.19.1, < 2.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-monitoring-v3 (0.10.0)
+      gapic-common (>= 0.16.0, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-trace-v2 (0.3.0)
-      gapic-common (~> 0.3)
+    google-cloud-trace-v2 (0.6.1)
+      gapic-common (>= 0.19.1, < 2.a)
       google-cloud-errors (~> 1.0)
-    google-gax (1.8.1)
-      google-protobuf (~> 3.9)
-      googleapis-common-protos (>= 1.3.9, < 2.0)
-      googleauth (~> 0.9)
-      grpc (~> 1.24)
-      rly (~> 0.2.3)
-    google-protobuf (3.15.8)
-    googleapis-common-protos (1.3.10)
-      google-protobuf (~> 3.11)
-      googleapis-common-protos-types (>= 1.0.5, < 2.0)
+    google-protobuf (3.22.1)
+    googleapis-common-protos (1.4.0)
+      google-protobuf (~> 3.14)
+      googleapis-common-protos-types (~> 1.2)
       grpc (~> 1.27)
-    googleapis-common-protos-types (1.0.6)
+    googleapis-common-protos-types (1.6.0)
       google-protobuf (~> 3.14)
-    googleauth (0.9.0)
-      faraday (~> 0.12)
+    googleauth (1.3.0)
+      faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      signet (~> 0.7)
-    grpc (1.31.1)
-      google-protobuf (~> 3.12)
+      signet (>= 0.16, < 2.a)
+    grpc (1.53.0)
+      google-protobuf (~> 3.21)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (1.0.1)
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.7.0)
     httpclient (2.8.3)
-    json (2.2.0)
-    jwt (2.2.3)
+    i18n (1.14.1)
+      concurrent-ruby (~> 1.0)
+    json (2.6.3)
+    jwt (2.7.1)
     memoist (0.16.2)
     metaclass (0.0.4)
-    mini_mime (1.1.0)
+    mini_mime (1.1.2)
+    minitest (5.18.1)
     mocha (1.9.0)
       metaclass (~> 0.0.1)
-    msgpack (1.4.2)
+    msgpack (1.7.1)
     multi_json (1.15.0)
-    multipart-post (2.1.1)
     opencensus (0.5.0)
-    opencensus-stackdriver (0.3.2)
+    opencensus-stackdriver (0.4.1)
       concurrent-ruby (~> 1.0)
-      google-cloud-monitoring (~> 0.32)
-      google-cloud-trace (~> 0.35)
+      google-cloud-env (~> 1.3)
+      google-cloud-monitoring-v3 (~> 0.1)
+      google-cloud-trace-v2 (~> 0.1)
       opencensus (~> 0.5)
-    os (1.1.1)
-    parser (2.7.2.0)
+    os (1.1.4)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    power_assert (2.0.0)
-    powerpack (0.1.3)
+      racc
+    power_assert (2.0.3)
     prometheus-client (0.9.0)
       quantile (~> 0.2.1)
-    public_suffix (4.0.6)
+    public_suffix (5.0.3)
     quantile (0.2.1)
-    rainbow (2.2.2)
-      rake
-    rake (10.5.0)
-    representable (3.1.1)
+    racc (1.7.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
+    representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     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)
-    ruby-progressbar (1.11.0)
-    serverengine (2.2.3)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    serverengine (2.3.2)
       sigdump (~> 0.2.2)
-    sigdump (0.2.4)
-    signet (0.15.0)
-      addressable (~> 2.3)
-      faraday (>= 0.17.3, < 2.0)
+    sigdump (0.2.5)
+    signet (0.17.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simplecov (0.16.1)
@@ -174,21 +198,22 @@ GEM
       tins (~> 1.0)
     test-unit (3.3.3)
       power_assert
-    thor (1.1.0)
-    tins (1.28.0)
+    thor (1.2.2)
+    tins (1.32.1)
       sync
-    trailblazer-option (0.1.1)
-    tzinfo (2.0.4)
+    trailblazer-option (0.1.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2021.1)
+    tzinfo-data (1.2023.3)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
-    unicode-display_width (1.7.0)
-    webmock (3.6.2)
-      addressable (>= 2.3.6)
+    unicode-display_width (2.4.2)
+    webmock (3.17.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yajl-ruby (1.4.1)
+    webrick (1.7.0)
+    yajl-ruby (1.4.3)
 
 PLATFORMS
   ruby
@@ -198,10 +223,10 @@ DEPENDENCIES
   fluent-plugin-google-cloud!
   mocha (= 1.9.0)
   prometheus-client (< 0.10)
-  rake (= 10.5.0)
-  rubocop (= 0.39.0)
+  rake (= 13.0.6)
+  rubocop (= 1.48.1)
   test-unit (= 3.3.3)
-  webmock (= 3.6.2)
+  webmock (= 3.17.1)
 
 BUNDLED WITH
    2.1.4

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,47 +1,46 @@
 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.10.9'
+  gem.version       = '0.13.1'
   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']
 
-  gem.add_runtime_dependency 'fluentd', '1.11.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.15.8'
-  gem.add_runtime_dependency 'grpc', '1.31.1'
-  gem.add_runtime_dependency 'json', '2.2.0'
+  # 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.53.0'
+  gem.add_runtime_dependency 'googleapis-common-protos', '1.4.0'
+  gem.add_runtime_dependency 'googleauth', '1.3.0'
+  gem.add_runtime_dependency 'google-cloud-logging', '2.3.2'
+  gem.add_runtime_dependency 'google-cloud-monitoring-v3', '0.10.0'
+  gem.add_runtime_dependency 'google-protobuf', '3.22.1'
+  gem.add_runtime_dependency 'grpc', '1.53.0'
+  gem.add_runtime_dependency 'json', '2.6.3'
   gem.add_runtime_dependency 'opencensus', '0.5.0'
-  gem.add_runtime_dependency 'opencensus-stackdriver', '0.3.2'
+  gem.add_runtime_dependency 'opencensus-stackdriver', '0.4.1'
 
   gem.add_development_dependency 'mocha', '1.9.0'
   # Keep this the same as in
   # https://github.com/fluent/fluent-plugin-prometheus/blob/master/fluent-plugin-prometheus.gemspec
+  gem.add_development_dependency 'coveralls', '0.8.23'
   gem.add_development_dependency 'prometheus-client', '< 0.10'
-  # TODO(qingling128): Upgrade rake to 11.0+ after the following issues are
-  # fixed because rake (11.0+) requires ALL variables to be explicitly
-  # initialized.
-  # https://github.com/googleapis/google-auth-library-ruby/issues/227
-  # https://github.com/farcaller/rly/issues/2
-  gem.add_development_dependency 'rake', '10.5.0'
-  gem.add_development_dependency 'rubocop', '0.39.0'
+  gem.add_development_dependency 'rake', '13.0.6'
+  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'
+  gem.add_development_dependency 'webmock', '3.17.1'
 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?