fluent-plugin-google-cloud 0.7.30 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69f53f832195e094d1ccc25ebc93122730850648bcd4ec8d1d8e56556b8f664f
-  data.tar.gz: 86014003a39e162d5f747e67580706ed55b733d297a4610658245c9dc545659c
+  metadata.gz: db48fa801fa732a1558906459e4bebfd2c7eb66b35aa471e01629f8d2a95989c
+  data.tar.gz: 8dd3e21883be568e0a8eae1ae5d79cda7693e2bca747df493b4a1d77ac09a5e9
 SHA512:
-  metadata.gz: e05540db9fc2e3c8fa72f0e0ede54fb9b3fc82fd9a9cdc45f07907e768c9ab6ccb112d4f8dad34622f9ebd87de15528ba5f307ba5ae6839009713bf8c8998eb2
-  data.tar.gz: f7dbf7927b68cd34bff152525aefa017058cea5a3f4a79c02612e2007d48c60ccbba8234fd90d8ef52aabdc70b03677e5cfd912d804db74c4680f54ba472d93e
+  metadata.gz: 7f1d13d9c74cd06b3be961724b5cd59e4bd28870ae31e7b94166928598b44b2ec951da5850a92accfe2ea244553f6b4fd3093bd0e66c8bbb8ff261eac17a2b14
+  data.tar.gz: a99993cd8944ebb0d338d8c285550c78338b25fff8e6be0dba7e194eb7a1607f2924869c0df6b6a894d28dbb4a582a07a344ffa45018440b010f564f74991685

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.7.30)
+    fluent-plugin-google-cloud (0.8.0)
       fluentd (= 1.6.3)
       google-api-client (= 0.30.8)
       google-cloud-logging (= 1.6.6)
@@ -11,7 +11,7 @@ PATH
       grpc (= 1.22.0)
       json (= 2.2.0)
       opencensus (= 0.5.0)
-      opencensus-stackdriver (= 0.3.1)
+      opencensus-stackdriver (= 0.3.2)
 
 GEM
   remote: https://rubygems.org/
@@ -19,7 +19,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.0)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     cool.io (1.6.0)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
@@ -66,8 +66,8 @@ GEM
       google-gax (~> 1.7)
       googleapis-common-protos-types (>= 1.0.2)
       stackdriver-core (~> 1.3)
-    google-cloud-monitoring (0.29.5)
-      google-gax (~> 1.3)
+    google-cloud-monitoring (0.32.0)
+      google-gax (~> 1.7)
       googleapis-common-protos-types (>= 1.0.2)
     google-cloud-trace (0.35.0)
       concurrent-ruby (~> 1.1)
@@ -111,15 +111,15 @@ GEM
     multi_json (1.14.1)
     multipart-post (2.1.1)
     opencensus (0.5.0)
-    opencensus-stackdriver (0.3.1)
+    opencensus-stackdriver (0.3.2)
       concurrent-ruby (~> 1.0)
-      google-cloud-monitoring (~> 0.29.2)
-      google-cloud-trace (~> 0.33)
+      google-cloud-monitoring (~> 0.32)
+      google-cloud-trace (~> 0.35)
       opencensus (~> 0.5)
     os (1.0.1)
-    parser (2.7.0.2)
+    parser (2.7.0.3)
       ast (~> 2.4.0)
-    power_assert (1.1.5)
+    power_assert (1.1.6)
     powerpack (0.1.2)
     prometheus-client (0.9.0)
       quantile (~> 0.2.1)
@@ -145,9 +145,9 @@ GEM
     serverengine (2.2.1)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
-    signet (0.12.0)
+    signet (0.13.0)
       addressable (~> 2.3)
-      faraday (~> 0.9)
+      faraday (>= 0.17.3, < 2.0)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simplecov (0.16.1)
@@ -165,7 +165,7 @@ GEM
       power_assert
     thor (1.0.1)
     thread_safe (0.3.6)
-    tins (1.24.0)
+    tins (1.24.1)
       sync
     tzinfo (1.2.6)
       thread_safe (~> 0.1)

data/fluent-plugin-google-cloud.gemspec

@@ -10,7 +10,7 @@ eos
   gem.homepage      =
     'https://github.com/GoogleCloudPlatform/fluent-plugin-google-cloud'
   gem.license       = 'Apache-2.0'
-  gem.version       = '0.7.30'
+  gem.version       = '0.8.0'
   gem.authors       = ['Stackdriver Agents Team']
   gem.email         = ['stackdriver-agents@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.2')
@@ -28,7 +28,7 @@ eos
   gem.add_runtime_dependency 'grpc', '1.22.0'
   gem.add_runtime_dependency 'json', '2.2.0'
   gem.add_runtime_dependency 'opencensus', '0.5.0'
-  gem.add_runtime_dependency 'opencensus-stackdriver', '0.3.1'
+  gem.add_runtime_dependency 'opencensus-stackdriver', '0.3.2'
 
   gem.add_development_dependency 'mocha', '1.9.0'
   # Keep this the same as in

data/lib/fluent/plugin/out_google_cloud.rb

@@ -121,10 +121,6 @@ module Fluent
       K8S_NODE_CONSTANTS = {
         resource_type: 'k8s_node'
       }.freeze
-      DOCKER_CONSTANTS = {
-        service: 'docker.googleapis.com',
-        resource_type: 'docker_container'
-      }.freeze
       DATAFLOW_CONSTANTS = {
         service: 'dataflow.googleapis.com',
         resource_type: 'dataflow_step',
@@ -174,10 +170,6 @@ module Fluent
       DEFAULT_SPAN_ID_KEY = 'logging.googleapis.com/spanId'.freeze
       DEFAULT_TRACE_KEY = 'logging.googleapis.com/trace'.freeze
       DEFAULT_TRACE_SAMPLED_KEY = 'logging.googleapis.com/trace_sampled'.freeze
-
-      DEFAULT_METADATA_AGENT_URL =
-        'http://local-metadata-agent.stackdriver.com:8000'.freeze
-      METADATA_AGENT_URL_ENV_VAR = 'STACKDRIVER_METADATA_AGENT_URL'.freeze
     end
 
     # Internal constants.
@@ -346,7 +338,7 @@ module Fluent
     # running on GCE.
     #
     # The initial motivation for this is to separate out Kubernetes node
-    # component (Docker, Kubelet, etc.) logs from container logs.
+    # component (Kubelet, etc.) logs from container logs.
     config_param :detect_subservice, :bool, :default => true
     # The subservice_name overrides the subservice detection, if provided.
     config_param :subservice_name, :string, :default => nil
@@ -408,8 +400,13 @@ module Fluent
 
     # Whether valid entries should be written even if some other entries fail
     # due to INVALID_ARGUMENT or PERMISSION_DENIED errors when communicating to
-    # the Stackdriver Logging API. This is highly recommended.
-    config_param :partial_success, :bool, :default => true
+    # the Stackdriver Logging API. This flag is no longer used, and is kept for
+    # backwards compatibility, partial_success is enabled for all requests.
+    # TODO: Breaking change. Remove this flag in Logging Agent 2.0.0 release.
+    config_param :partial_success, :bool,
+                 :default => true,
+                 :skip_accessor => true,
+                 :deprecated => 'This feature is permanently enabled'
 
     # Whether to allow non-UTF-8 characters in user logs. If set to true, any
     # non-UTF-8 character would be replaced by the string specified by
@@ -449,15 +446,21 @@ module Fluent
     config_param :monitoring_type, :string,
                  :default => Monitoring::PrometheusMonitoringRegistry.name
 
-    # Whether to call metadata agent to retrieve monitored resource.
-    config_param :enable_metadata_agent, :bool, :default => false
-
-    # The URL of the Metadata Agent.
-    # If this option is set, its value is used to contact the Metadata Agent.
-    # Otherwise, the value of the STACKDRIVER_METADATA_AGENT_URL environment
-    # variable is used. If that is also unset, this defaults to
-    # 'http://local-metadata-agent.stackdriver.com:8000'.
-    config_param :metadata_agent_url, :string, :default => nil
+    # Whether to call metadata agent to retrieve monitored resource. This flag
+    # is kept for backwards compatibility, and is no longer used.
+    # TODO: Breaking change. Remove this flag in Logging Agent 2.0.0 release.
+    config_param :enable_metadata_agent, :bool,
+                 :default => false,
+                 :skip_accessor => true,
+                 :deprecated => 'This feature is permanently disabled'
+
+    # The URL of the Metadata Agent. This flag is kept for backwards
+    # compatibility, and is no longer used.
+    # TODO: Breaking change. Remove this flag in Logging Agent 2.0.0 release.
+    config_param :metadata_agent_url, :string,
+                 :default => nil,
+                 :skip_accessor => true,
+                 :deprecated => 'This feature is permanently disabled'
 
     # Whether to split log entries with different log tags into different
     # requests when talking to Stackdriver Logging API.
@@ -520,20 +523,6 @@ module Fluent
                   ' ignored.'
       end
 
-      # 1. If @metadata_agent_url is customized (aka not nil), use that.
-      # 2. Otherwise check the presence of the environment variable
-      #    STACKDRIVER_METADATA_AGENT_URL and use that if set.
-      # 3. Fall back to the default if neither is set.
-      if @enable_metadata_agent
-        # Convert to string to capture empty string.
-        @metadata_agent_url ||=
-          if ENV[METADATA_AGENT_URL_ENV_VAR].to_s.empty?
-            DEFAULT_METADATA_AGENT_URL
-          else
-            ENV[METADATA_AGENT_URL_ENV_VAR]
-          end
-      end
-
       # Alert on old authentication configuration.
       unless @auth_method.nil? && @private_key_email.nil? &&
              @private_key_path.nil? && @private_key_passphrase.nil?
@@ -903,7 +892,7 @@ module Fluent
         labels: labels.map do |k, v|
           [k.encode('utf-8'), convert_to_utf8(v)]
         end.to_h,
-        partial_success: @partial_success
+        partial_success: true
       )
       increment_successful_requests_count
       increment_ingested_entries_count(entries_count)
@@ -964,7 +953,7 @@ module Fluent
         @log.warn "Dropping #{entries_count} log message(s)",
                   error: error.to_s, error_code: error.code.to_s
 
-      # If partial_success is enabled, valid entries should have be
+      # As partial_success is enabled, valid entries should have been
       # written even if some other entries fail due to InvalidArgument or
       # PermissionDenied errors. Only invalid entries will be dropped.
       when \
@@ -1029,7 +1018,7 @@ module Fluent
           log_name: log_name,
           resource: resource,
           labels: labels,
-          partial_success: @partial_success
+          partial_success: true
         ),
         options: { api_format_version: '2' }
       )
@@ -1431,8 +1420,10 @@ module Fluent
       # Metadata Agent with this key.
       #
       # Examples:
-      # "container.<container_id>" // Docker container.
-      # "k8s_pod.<namespace_name>.<pod_name>" // GKE pod.
+      # // GKE Pod.
+      # "k8s_pod.<namespace_name>.<pod_name>"
+      # // GKE container.
+      # "k8s_container.<namespace_name>.<pod_name>.<container_name>"
       if local_resource_id
         converted_resource = monitored_resource_from_local_resource_id(
           local_resource_id)
@@ -1466,12 +1457,6 @@ module Fluent
                 .map { |l| [l, "#{GKE_CONSTANTS[:service]}/#{l}"] }.to_h))
         end
 
-      # Docker container.
-      # TODO(qingling128): Remove this logic once the resource is retrieved at a
-      # proper time (b/65175256).
-      when DOCKER_CONSTANTS[:resource_type]
-        common_labels.delete("#{COMPUTE_CONSTANTS[:service]}/resource_name")
-
       # TODO(qingling128): Temporary fallback for metadata agent restarts.
       # K8s resources.
       when K8S_CONTAINER_CONSTANTS[:resource_type],
@@ -1500,32 +1485,6 @@ module Fluent
       [resource, common_labels]
     end
 
-    # Take a locally unique resource id and convert it to the globally unique
-    # monitored resource.
-    def monitored_resource_from_local_resource_id(local_resource_id)
-      return unless local_resource_id
-      if @enable_metadata_agent
-        @log.debug 'Calling metadata agent with local_resource_id: ' \
-                  "#{local_resource_id}."
-        resource = query_metadata_agent_for_monitored_resource(
-          local_resource_id)
-        @log.debug 'Retrieved monitored resource from metadata agent: ' \
-                  "#{resource.inspect}."
-        if resource
-          # TODO(qingling128): Fix this temporary renaming from 'gke_container'
-          # to 'container'.
-          resource.type = 'container' if resource.type == 'gke_container'
-          return resource
-        end
-        @log.debug('Failed to retrieve monitored resource from Metadata' \
-                   " Agent with local_resource_id #{local_resource_id}.")
-      end
-      # Fall back to constructing monitored resource locally.
-      # TODO(qingling128): This entire else clause is temporary until we
-      # implement buffering and caching.
-      construct_k8s_resource_locally(local_resource_id)
-    end
-
     # Extract entry level monitored resource and common labels that should be
     # applied to individual entries.
     def determine_entry_level_monitored_resource_and_labels(
@@ -1589,49 +1548,6 @@ module Fluent
       [resource, common_labels]
     end
 
-    # Call Metadata Agent to get monitored resource information and parse
-    # response to Google::Api::MonitoredResource.
-    def query_metadata_agent_for_monitored_resource(local_resource_id)
-      response = query_metadata_agent("monitoredResource/#{local_resource_id}")
-      return nil if response.nil?
-      begin
-        resource = Google::Api::MonitoredResource.decode_json(response.to_json)
-      rescue Google::Protobuf::ParseError, ArgumentError => e
-        @log.error 'Error parsing monitored resource from Metadata Agent. ' \
-                   "response: #{response.inspect}", error: e
-        return nil
-      end
-
-      # TODO(qingling128): Use Google::Api::MonitoredResource directly after we
-      # upgrade gRPC version to include the fix for the protobuf map
-      # corruption issue.
-      Google::Apis::LoggingV2::MonitoredResource.new(
-        type: resource.type,
-        labels: resource.labels.to_h
-      )
-    end
-
-    # Issue a request to the Metadata Agent's local API and parse the response
-    # to JSON. Return nil in case of failure.
-    def query_metadata_agent(path)
-      url = "#{@metadata_agent_url}/#{path}"
-      @log.debug("Calling Metadata Agent: #{url}")
-      open(url) do |f|
-        response = f.read
-        parsed_hash = parse_json_or_nil(response)
-        if parsed_hash.nil?
-          @log.error 'Response from Metadata Agent is not in valid json ' \
-                     "format: '#{response.inspect}'."
-          return nil
-        end
-        @log.debug "Response from Metadata Agent: #{parsed_hash}"
-        return parsed_hash
-      end
-    rescue StandardError => e
-      @log.error "Error calling Metadata Agent at #{url}.", error: e
-      nil
-    end
-
     # TODO: This functionality should eventually be available in another
     # library, but implement it ourselves for now.
     module CredentialsInfo
@@ -2079,9 +1995,7 @@ module Fluent
       # 2. The only remaining key is 'message'
       if is_json
         json_payload = record
-      elsif [GKE_CONSTANTS[:resource_type],
-             DOCKER_CONSTANTS[:resource_type]].include?(resource_type) &&
-            record.key?('log')
+      elsif GKE_CONSTANTS[:resource_type] == resource_type && record.key?('log')
         text_payload = record['log']
       elsif record.size == 1 && record.key?('message')
         text_payload = record['message']
@@ -2208,7 +2122,7 @@ module Fluent
     end
 
     # Extract a map of error details from a potentially partially successful
-    # REST request. Return an empty map if @partial_success is not enabled.
+    # REST request.
     #
     # The keys in this map are [error_code, error_message] pairs, and the values
     # are a list of stringified indexes of log entries that failed due to this
@@ -2283,7 +2197,6 @@ module Fluent
     #   [3, 'Log name contains illegal character :']: ['1', '3']
     # }
     def construct_error_details_map(error)
-      return {} unless @partial_success
       error_details_map = Hash.new { |h, k| h[k] = [] }
 
       error_details = ensure_array(
@@ -2312,7 +2225,7 @@ module Fluent
     end
 
     # Extract a map of error details from a potentially partially successful
-    # gRPC request. Return an empty map if @partial_success is not enabled.
+    # gRPC request.
     #
     # The keys in this map are [error_code, error_message] pairs, and the values
     # are a list of indexes of log entries that failed due to this error.
@@ -2352,7 +2265,6 @@ module Fluent
     #   [3, 'Log name contains illegal character :']: [1, 3]
     # }
     def construct_error_details_map_grpc(gax_error)
-      return {} unless @partial_success
       error_details_map = Hash.new { |h, k| h[k] = [] }
       error_details = ensure_array(gax_error.status_details)
       raise JSON::ParserError, 'The error details are empty.' if
@@ -2372,8 +2284,9 @@ module Fluent
       {}
     end
 
-    # Construct monitored resource locally for k8s resources.
-    def construct_k8s_resource_locally(local_resource_id)
+    # Take a locally unique resource id and convert it to the globally unique
+    # monitored resource.
+    def monitored_resource_from_local_resource_id(local_resource_id)
       return unless
         /^
           (?<resource_type>k8s_container)

data/lib/fluent/plugin/statusz.rb

@@ -40,7 +40,6 @@ CONFIG_KEYS = %w(
   coerce_to_utf8
   detect_json
   detect_subservice
-  enable_metadata_agent
   enable_monitoring
   http_request_key
   insert_id_key
@@ -51,11 +50,9 @@ CONFIG_KEYS = %w(
   labels_key
   labels
   logging_api_url
-  metadata_agent_url
   monitoring_type
   non_utf8_replacement_string
   operation_key
-  partial_success
   project_id
   require_valid_tags
   source_location_key

data/test/plugin/base_test.rb

@@ -127,42 +127,6 @@ module BaseTest
     end
   end
 
-  def test_configure_partial_success
-    setup_gce_metadata_stubs
-    {
-      APPLICATION_DEFAULT_CONFIG => true,
-      PARTIAL_SUCCESS_DISABLED_CONFIG => false
-    }.each do |(config, partial_success)|
-      d = create_driver(config)
-      assert_equal partial_success,
-                   d.instance.instance_variable_get(:@partial_success)
-    end
-  end
-
-  def test_metadata_agent_url_customization
-    [
-      # If @metadata_agent_url is set, use that even if the environment
-      # variable is set.
-      [CUSTOM_METADATA_AGENT_URL_CONFIG, true, CUSTOM_METADATA_AGENT_URL],
-      # If @metadata_agent_url is set and the environment variable is
-      # not set, use @metadata_agent_url.
-      [CUSTOM_METADATA_AGENT_URL_CONFIG, false, CUSTOM_METADATA_AGENT_URL],
-      # If @metadata_agent_url is not set and the environment variable is set,
-      # use the env.
-      [APPLICATION_DEFAULT_CONFIG, true, METADATA_AGENT_URL_FROM_ENV],
-      # If @metadata_agent_url is not set and the environment variable is
-      # not set, fall back to the default.
-      [APPLICATION_DEFAULT_CONFIG, false, DEFAULT_METADATA_AGENT_URL]
-    ].each do |(config, url_from_env, expected_url)|
-      ENV[METADATA_AGENT_URL_ENV_VAR] = METADATA_AGENT_URL_FROM_ENV if
-        url_from_env
-      setup_gce_metadata_stubs
-      d = create_driver(ENABLE_METADATA_AGENT_CONFIG + config)
-      assert_equal expected_url, d.instance.metadata_agent_url
-      ENV.delete(METADATA_AGENT_URL_ENV_VAR)
-    end
-  end
-
   def test_configure_ignores_unknown_monitoring_type
     # Verify that driver creation succeeds when monitoring type is not
     # "prometheus" (in which case, we simply don't record metrics),
@@ -1758,176 +1722,48 @@ module BaseTest
     end
   end
 
-  # Metadata Agent related tests.
-
-  # Test enable_metadata_agent not set or set to false.
-  def test_configure_enable_metadata_agent_default_and_false
-    setup_gce_metadata_stubs
-    [create_driver, create_driver(DISABLE_METADATA_AGENT_CONFIG)].each do |d|
-      assert_false d.instance.instance_variable_get(:@enable_metadata_agent)
-    end
-  end
-
-  # Test enable_metadata_agent set to true.
-  def test_configure_enable_metadata_agent_true
-    new_stub_context do
-      setup_gce_metadata_stubs
-      setup_metadata_agent_stubs
-      d = create_driver(ENABLE_METADATA_AGENT_CONFIG)
-      assert_true d.instance.instance_variable_get(:@enable_metadata_agent)
-    end
-  end
-
-  # Docker Container.
-
-  # Test textPayload logs from Docker container stdout / stderr.
-  def test_docker_container_stdout_stderr_logs_text_payload
-    [1, 2, 3, 5, 11, 50].each do |n|
-      new_stub_context do
-        setup_gce_metadata_stubs
-        setup_metadata_agent_stubs
-        setup_logging_stubs do
-          d = create_driver(DOCKER_CONTAINER_CONFIG)
-          n.times do |i|
-            d.emit(docker_container_stdout_stderr_log_entry(log_entry(i)))
-          end
-          d.run
-        end
-        verify_log_entries(n, DOCKER_CONTAINER_PARAMS)
-        assert_requested_metadata_agent_stub("container.#{DOCKER_CONTAINER_ID}")
-      end
-    end
-  end
-
-  # Test jsonPayload logs from Docker container stdout / stderr.
-  def test_docker_container_stdout_stderr_logs_json_payload
-    [1, 2, 3, 5, 11, 50].each do |n|
-      new_stub_context do
-        setup_gce_metadata_stubs
-        setup_metadata_agent_stubs
-        setup_logging_stubs do
-          d = create_driver(DOCKER_CONTAINER_CONFIG)
-          n.times do
-            d.emit(docker_container_stdout_stderr_log_entry(
-                     '{"msg": "test log entry ' \
-                     "#{n}" \
-                     '", "tag2": "test", "data": ' \
-                     '5000, "severity": "WARNING"}'))
-          end
-          d.run
-        end
-        verify_log_entries(n, DOCKER_CONTAINER_PARAMS, 'jsonPayload') do |entry|
-          fields = entry['jsonPayload']
-          assert_equal 3, fields.size, entry
-          assert_equal "test log entry #{n}", fields['msg'], entry
-          assert_equal 'test', fields['tag2'], entry
-          assert_equal 5000, fields['data'], entry
-        end
-        assert_requested_metadata_agent_stub("container.#{DOCKER_CONTAINER_ID}")
-      end
-    end
-  end
-
-  # Test logs from applications running in Docker containers. These logs have
-  # the label "logging.googleapis.com/local_resource_id" set in the format of
-  # "container.<container_name>".
-  def test_docker_container_application_logs
-    new_stub_context do
-      setup_gce_metadata_stubs
-      setup_metadata_agent_stubs
-      setup_logging_stubs do
-        # Metadata Agent is not enabled. Will call Docker Remote API for
-        # container info.
-        d = create_driver(ENABLE_METADATA_AGENT_CONFIG)
-        d.emit(docker_container_application_log_entry(log_entry(0)))
-        d.run
-      end
-      verify_log_entries(1, DOCKER_CONTAINER_PARAMS_NO_STREAM)
-      assert_requested_metadata_agent_stub(
-        "#{DOCKER_CONTAINER_LOCAL_RESOURCE_ID_PREFIX}.#{DOCKER_CONTAINER_NAME}")
-    end
-  end
-
-  # Test k8s_container monitored resource including the fallback when Metadata
-  # Agent restarts.
-  def test_k8s_container_monitored_resource_fallback
+  # Test k8s_container monitored resource.
+  def test_k8s_container_monitored_resource
     [
-      # When enable_metadata_agent is false.
       {
         config: APPLICATION_DEFAULT_CONFIG,
-        setup_metadata_agent_stub: false,
         setup_k8s_stub: false,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: K8S_CONTAINER_PARAMS_FROM_FALLBACK
       },
       {
         config: APPLICATION_DEFAULT_CONFIG,
-        setup_metadata_agent_stub: true,
         setup_k8s_stub: false,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: K8S_CONTAINER_PARAMS_FROM_FALLBACK
       },
       {
         config: APPLICATION_DEFAULT_CONFIG,
-        setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: K8S_CONTAINER_PARAMS_FROM_LOCAL
       },
       {
         config: APPLICATION_DEFAULT_CONFIG,
-        setup_metadata_agent_stub: false,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: K8S_CONTAINER_PARAMS_FROM_LOCAL
       },
-      # When enable_metadata_agent is true.
       {
-        config: ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: false,
-        setup_k8s_stub: false,
-        log_entry: k8s_container_log_entry(log_entry(0)),
-        expected_params: K8S_CONTAINER_PARAMS_FROM_FALLBACK
-      },
-      {
-        config: ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: false,
-        setup_k8s_stub: true,
-        log_entry: k8s_container_log_entry(log_entry(0)),
-        expected_params: K8S_CONTAINER_PARAMS_FROM_LOCAL
-      },
-      {
-        config: CUSTOM_K8S_ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: false,
+        config: CUSTOM_K8S_CONFIG,
         setup_k8s_stub: false,
         log_entry: k8s_container_log_entry(log_entry(0)),
         expected_params: K8S_CONTAINER_PARAMS_CUSTOM
       },
       {
-        config: EMPTY_K8S_ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: true,
-        setup_k8s_stub: true,
-        log_entry: k8s_container_log_entry(log_entry(0)),
-        expected_params: K8S_CONTAINER_PARAMS
-      },
-      {
-        config: ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: true,
-        setup_k8s_stub: false,
-        log_entry: k8s_container_log_entry(log_entry(0)),
-        expected_params: K8S_CONTAINER_PARAMS
-      },
-      {
-        config: ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: true,
+        config: EMPTY_K8S_CONFIG,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(log_entry(0)),
-        expected_params: K8S_CONTAINER_PARAMS
+        expected_params: K8S_CONTAINER_PARAMS_FROM_LOCAL
       }
     ].each do |test_params|
       new_stub_context do
         setup_gce_metadata_stubs
-        setup_metadata_agent_stubs(test_params[:setup_metadata_agent_stub])
         setup_k8s_metadata_stubs(test_params[:setup_k8s_stub])
         setup_logging_stubs do
           d = create_driver(test_params[:config], CONTAINER_TAG)
@@ -1949,16 +1785,14 @@ module BaseTest
     [
       # When local_resource_id is not present or does not match k8s regexes.
       {
-        config: ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: true,
+        config: APPLICATION_DEFAULT_CONFIG,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(
           log_entry(0)).reject { |k, _| k == LOCAL_RESOURCE_ID_KEY },
         expected_params: CONTAINER_FROM_TAG_PARAMS
       },
       {
-        config: ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: true,
+        config: APPLICATION_DEFAULT_CONFIG,
         setup_k8s_stub: true,
         log_entry: k8s_container_log_entry(
           log_entry(0),
@@ -1968,7 +1802,6 @@ module BaseTest
     ].each do |test_params|
       new_stub_context do
         setup_gce_metadata_stubs
-        setup_metadata_agent_stubs(test_params[:setup_metadata_agent_stub])
         setup_k8s_metadata_stubs(test_params[:setup_k8s_stub])
         setup_logging_stubs do
           d = create_driver(test_params[:config], CONTAINER_TAG)
@@ -1982,49 +1815,30 @@ module BaseTest
     end
   end
 
-  # Test k8s_pod monitored resource including the fallback when Metadata Agent
-  # restarts.
-  def test_k8s_pod_monitored_resource_fallback
+  # Test k8s_pod monitored resource.
+  def test_k8s_pod_monitored_resource
     [
       {
         config: APPLICATION_DEFAULT_CONFIG,
-        setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_pod_log_entry(log_entry(0)),
         expected_params: K8S_POD_PARAMS_FROM_LOCAL
       },
       {
-        config: ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: false,
-        setup_k8s_stub: true,
-        log_entry: k8s_pod_log_entry(log_entry(0)),
-        expected_params: K8S_POD_PARAMS_FROM_LOCAL
-      },
-      {
-        config: CUSTOM_K8S_ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: false,
+        config: CUSTOM_K8S_CONFIG,
         setup_k8s_stub: false,
         log_entry: k8s_pod_log_entry(log_entry(0)),
         expected_params: K8S_POD_PARAMS_CUSTOM
       },
       {
-        config: EMPTY_K8S_ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: true,
-        setup_k8s_stub: true,
-        log_entry: k8s_pod_log_entry(log_entry(0)),
-        expected_params: K8S_POD_PARAMS
-      },
-      {
-        config: ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: true,
+        config: EMPTY_K8S_CONFIG,
         setup_k8s_stub: true,
         log_entry: k8s_pod_log_entry(log_entry(0)),
-        expected_params: K8S_POD_PARAMS
+        expected_params: K8S_POD_PARAMS_FROM_LOCAL
       }
     ].each do |test_params|
       new_stub_context do
         setup_gce_metadata_stubs
-        setup_metadata_agent_stubs(test_params[:setup_metadata_agent_stub])
         setup_k8s_metadata_stubs(test_params[:setup_k8s_stub])
         setup_logging_stubs do
           d = create_driver(test_params[:config])
@@ -2042,49 +1856,30 @@ module BaseTest
     end
   end
 
-  # Test k8s_node monitored resource including the fallback when Metadata Agent
-  # restarts.
-  def test_k8s_node_monitored_resource_fallback
+  # Test k8s_node monitored resource.
+  def test_k8s_node_monitored_resource
     [
       {
         config: APPLICATION_DEFAULT_CONFIG,
-        setup_metadata_agent_stub: true,
         setup_k8s_stub: true,
         log_entry: k8s_node_log_entry(log_entry(0)),
         expected_params: K8S_NODE_PARAMS_FROM_LOCAL
       },
       {
-        config: ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: false,
-        setup_k8s_stub: true,
-        log_entry: k8s_node_log_entry(log_entry(0)),
-        expected_params: K8S_NODE_PARAMS_FROM_LOCAL
-      },
-      {
-        config: CUSTOM_K8S_ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: false,
+        config: CUSTOM_K8S_CONFIG,
         setup_k8s_stub: false,
         log_entry: k8s_node_log_entry(log_entry(0)),
         expected_params: K8S_NODE_PARAMS_CUSTOM
       },
       {
-        config: EMPTY_K8S_ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: true,
+        config: EMPTY_K8S_CONFIG,
         setup_k8s_stub: true,
         log_entry: k8s_node_log_entry(log_entry(0)),
-        expected_params: K8S_NODE_PARAMS
-      },
-      {
-        config: ENABLE_METADATA_AGENT_CONFIG,
-        setup_metadata_agent_stub: true,
-        setup_k8s_stub: true,
-        log_entry: k8s_node_log_entry(log_entry(0)),
-        expected_params: K8S_NODE_PARAMS
+        expected_params: K8S_NODE_PARAMS_FROM_LOCAL
       }
     ].each do |test_params|
       new_stub_context do
         setup_gce_metadata_stubs
-        setup_metadata_agent_stubs(test_params[:setup_metadata_agent_stub])
         setup_k8s_metadata_stubs(test_params[:setup_k8s_stub])
         setup_logging_stubs do
           d = create_driver(test_params[:config])
@@ -2102,83 +1897,6 @@ module BaseTest
     end
   end
 
-  # Test that the 'time' field from the json record is extracted and set to
-  # entry.timestamp for Docker container logs.
-  def test_time_field_extraction_for_docker_container_logs
-    new_stub_context do
-      setup_gce_metadata_stubs
-      setup_metadata_agent_stubs
-      setup_logging_stubs do
-        d = create_driver(ENABLE_METADATA_AGENT_CONFIG)
-        d.emit(docker_container_application_log_entry(log_entry(0)))
-        d.run
-      end
-      verify_log_entries(1, DOCKER_CONTAINER_PARAMS_NO_STREAM) do |entry, i|
-        verify_default_log_entry_text(entry['textPayload'], i, entry)
-        # Timestamp in 'time' field from log entry should be set properly.
-        actual_timestamp = timestamp_parse(entry['timestamp'])
-        assert_equal DOCKER_CONTAINER_SECONDS_EPOCH,
-                     actual_timestamp['seconds'], entry
-        assert_equal DOCKER_CONTAINER_NANOS, actual_timestamp['nanos'], entry
-      end
-      assert_requested_metadata_agent_stub(
-        "#{DOCKER_CONTAINER_LOCAL_RESOURCE_ID_PREFIX}.#{DOCKER_CONTAINER_NAME}")
-    end
-  end
-
-  # Test that the 'source' field is properly extracted from the record json and
-  # set as a common label 'stream'.
-  def test_source_for_docker_container_logs
-    {
-      docker_container_stdout_stderr_log_entry(
-        log_entry(0), DOCKER_CONTAINER_STREAM_STDOUT) =>
-        DOCKER_CONTAINER_PARAMS,
-      docker_container_stdout_stderr_log_entry(
-        log_entry(0), DOCKER_CONTAINER_STREAM_STDERR) =>
-        DOCKER_CONTAINER_PARAMS_STREAM_STDERR,
-      docker_container_application_log_entry(log_entry(0)) =>
-        DOCKER_CONTAINER_PARAMS_NO_STREAM,
-      docker_container_application_log_entry(log_entry(0)) \
-        .merge('severity' => 'warning') =>
-        DOCKER_CONTAINER_PARAMS_NO_STREAM
-    }.each do |log_entry, expected_params|
-      new_stub_context do
-        setup_gce_metadata_stubs
-        setup_metadata_agent_stubs
-        setup_logging_stubs do
-          d = create_driver(DOCKER_CONTAINER_CONFIG)
-          d.emit(log_entry)
-          d.run
-        end
-        verify_log_entries(1, expected_params)
-      end
-    end
-  end
-
-  # Test GKE container logs. These logs have the label
-  # "logging.googleapis.com/local_resource_id" set in the format of
-  # "gke_container.<namespace_id>.<pod_name>.<container_name>".
-  def test_gke_container_logs
-    [1, 2, 3, 5, 11, 50].each do |n|
-      new_stub_context do
-        setup_gce_metadata_stubs
-        setup_k8s_metadata_stubs
-        setup_metadata_agent_stubs
-        setup_logging_stubs do
-          d = create_driver(ENABLE_METADATA_AGENT_CONFIG)
-          n.times do |i|
-            d.emit(gke_container_log_entry(log_entry(i)))
-          end
-          d.run
-        end
-        verify_log_entries(n, CONTAINER_FROM_APPLICATION_PARAMS)
-        assert_requested_metadata_agent_stub(
-          "#{CONTAINER_LOCAL_RESOURCE_ID_PREFIX}.#{CONTAINER_NAMESPACE_ID}" \
-          ".#{K8S_POD_NAME}.#{K8S_CONTAINER_NAME}")
-      end
-    end
-  end
-
   def test_uptime_metric
     setup_gce_metadata_stubs
     [
@@ -2315,12 +2033,6 @@ module BaseTest
     OpenCensus::Stats.ensure_recorder.clear_stats
   end
 
-  # Metadata Agent.
-
-  def metadata_request_url(local_resource_id)
-    "#{DEFAULT_METADATA_AGENT_URL}/monitoredResource/#{local_resource_id}"
-  end
-
   # Provide a stub context that initializes @logs_sent, executes the block and
   # resets WebMock at the end.
   def new_stub_context
@@ -2329,26 +2041,6 @@ module BaseTest
     WebMock.reset!
   end
 
-  def setup_metadata_agent_stubs(should_respond = true)
-    if should_respond
-      MONITORED_RESOURCE_STUBS.each do |local_resource_id, resource|
-        stub_request(:get, metadata_request_url(local_resource_id))
-          .to_return(status: 200, body: resource)
-      end
-      stub_request(:get, metadata_request_url(RANDOM_LOCAL_RESOURCE_ID))
-        .to_return(status: 404, body: '')
-    else
-      # Simulate an environment with no metadata agent endpoint present.
-      stub_request(:get,
-                   %r{#{DEFAULT_METADATA_AGENT_URL}\/monitoredResource/.*})
-        .to_raise(Errno::EHOSTUNREACH)
-    end
-  end
-
-  def assert_requested_metadata_agent_stub(local_resource_id)
-    assert_requested :get, metadata_request_url(local_resource_id)
-  end
-
   # GKE Container.
 
   def container_tag_with_container_name(container_name)
@@ -2391,32 +2083,6 @@ module BaseTest
     }
   end
 
-  # Docker Container.
-
-  def docker_container_stdout_stderr_log_entry(
-    log, stream = DOCKER_CONTAINER_STREAM_STDOUT)
-    severity = if stream == DOCKER_CONTAINER_STREAM_STDOUT
-                 'INFO'
-               else
-                 'ERROR'
-               end
-    {
-      log: log,
-      source: stream,
-      severity: severity,
-      LOCAL_RESOURCE_ID_KEY => "container.#{DOCKER_CONTAINER_ID}"
-    }
-  end
-
-  def docker_container_application_log_entry(log)
-    {
-      log: log,
-      time: DOCKER_CONTAINER_TIMESTAMP,
-      LOCAL_RESOURCE_ID_KEY => "#{DOCKER_CONTAINER_LOCAL_RESOURCE_ID_PREFIX}." \
-                               "#{DOCKER_CONTAINER_NAME}"
-    }
-  end
-
   # TODO(qingling128): Temporary fallback for metadata agent restarts.
   # k8s resources.
 

data/test/plugin/constants.rb

@@ -52,8 +52,6 @@ module Constants
   # Generic attributes.
   HOSTNAME = Socket.gethostname
   CUSTOM_LOGGING_API_URL = 'http://localhost:52000'.freeze
-  CUSTOM_METADATA_AGENT_URL = 'http://localhost:12345'.freeze
-  METADATA_AGENT_URL_FROM_ENV = 'http://localhost:54321'.freeze
 
   # TODO(qingling128) Separate constants into different submodules.
   # Attributes used for the GCE metadata service.
@@ -133,18 +131,6 @@ module Constants
     "projects/#{PROJECT_ID}/" \
     "traces/#{INVALID_NON_HEX_STACKDRIVER_TRACE_ID}".freeze
 
-  # Docker Container labels.
-  DOCKER_CONTAINER_ID =
-    '0d0f03ff8d3c42688692536d1af77a28cd135c0a5c531f25a31'.freeze
-  DOCKER_CONTAINER_NAME = 'happy_hippo'.freeze
-  DOCKER_CONTAINER_STREAM_STDOUT = 'stdout'.freeze
-  DOCKER_CONTAINER_STREAM_STDERR = 'stderr'.freeze
-  # Timestamp for 1234567890 seconds and 987654321 nanoseconds since epoch.
-  DOCKER_CONTAINER_TIMESTAMP = '2009-02-13T23:31:30.987654321Z'.freeze
-  DOCKER_CONTAINER_SECONDS_EPOCH = 1_234_567_890
-  DOCKER_CONTAINER_NANOS = 987_654_321
-  DOCKER_CONTAINER_LOCAL_RESOURCE_ID_PREFIX = 'container'.freeze
-
   # New K8s resource constants.
   K8S_LOCATION = 'us-central1-b'.freeze
   K8S_LOCATION2 = 'us-central1-c'.freeze
@@ -238,18 +224,10 @@ module Constants
     logging_api_url #{CUSTOM_LOGGING_API_URL}
   ).freeze
 
-  CUSTOM_METADATA_AGENT_URL_CONFIG = %(
-    metadata_agent_url #{CUSTOM_METADATA_AGENT_URL}
-  ).freeze
-
   DETECT_JSON_CONFIG = %(
     detect_json true
   ).freeze
 
-  PARTIAL_SUCCESS_DISABLED_CONFIG = %(
-    partial_success false
-  ).freeze
-
   # rubocop:disable Metrics/LineLength
   PRIVATE_KEY_CONFIG = %(
      auth_method private_key
@@ -284,14 +262,6 @@ module Constants
     monitoring_type opencensus
   ).freeze
 
-  ENABLE_METADATA_AGENT_CONFIG = %(
-    enable_metadata_agent true
-  ).freeze
-
-  DISABLE_METADATA_AGENT_CONFIG = %(
-    enable_metadata_agent false
-  ).freeze
-
   ENABLE_AUTOFORMAT_STACKDRIVER_TRACE_CONFIG = %(
     autoformat_stackdriver_trace true
   ).freeze
@@ -300,12 +270,6 @@ module Constants
     autoformat_stackdriver_trace false
   ).freeze
 
-  DOCKER_CONTAINER_CONFIG = %(
-    enable_metadata_agent true
-    label_map { "source": "#{DOCKER_CONSTANTS[:service]}/stream" }
-    detect_json true
-  ).freeze
-
   CUSTOM_METADATA_CONFIG = %(
     project_id #{CUSTOM_PROJECT_ID}
     zone #{CUSTOM_ZONE}
@@ -328,14 +292,12 @@ module Constants
   CONFIG_MISSING_METADATA_ALL = %(
   ).freeze
 
-  CUSTOM_K8S_ENABLE_METADATA_AGENT_CONFIG = %(
-    enable_metadata_agent true
+  CUSTOM_K8S_CONFIG = %(
     k8s_cluster_name #{CUSTOM_K8S_CLUSTER_NAME}
     k8s_cluster_location #{CUSTOM_K8S_LOCATION}
   ).freeze
 
-  EMPTY_K8S_ENABLE_METADATA_AGENT_CONFIG = %(
-    enable_metadata_agent true
+  EMPTY_K8S_CONFIG = %(
     k8s_cluster_name ""
     k8s_cluster_location ""
   ).freeze
@@ -480,7 +442,6 @@ module Constants
     coerce_to_utf8                false
     detect_json                   true
     detect_subservice             false
-    enable_metadata_agent         true
     enable_monitoring             true
     http_request_key              test_http_request_key
     insert_id_key                 test_insert_id_key
@@ -491,11 +452,9 @@ module Constants
     labels_key                    test_labels_key
     labels                        { "labels_key": "labels_value" }
     logging_api_url               http://localhost:52000
-    metadata_agent_url            http://localhost:12345
     monitoring_type               not_prometheus
     non_utf8_replacement_string   zzz
     operation_key                 test_operation_key
-    partial_success               false
     project_id                    test-project-id-123
     require_valid_tags            true
     source_location_key           test_source_location_key
@@ -724,29 +683,6 @@ module Constants
     )
   ).freeze
 
-  # Docker Container.
-  DOCKER_CONTAINER_PARAMS = {
-    resource: {
-      type: DOCKER_CONSTANTS[:resource_type],
-      labels: {
-        'container_id' => DOCKER_CONTAINER_ID,
-        'location' => ZONE
-      }
-    },
-    log_name: 'test',
-    project_id: PROJECT_ID,
-    labels: {
-      "#{DOCKER_CONSTANTS[:service]}/stream" => DOCKER_CONTAINER_STREAM_STDOUT
-    }
-  }.freeze
-  DOCKER_CONTAINER_PARAMS_STREAM_STDERR = DOCKER_CONTAINER_PARAMS.merge(
-    labels: DOCKER_CONTAINER_PARAMS[:labels].merge(
-      "#{DOCKER_CONSTANTS[:service]}/stream" => DOCKER_CONTAINER_STREAM_STDERR
-    )
-  ).freeze
-  DOCKER_CONTAINER_PARAMS_NO_STREAM =
-    DOCKER_CONTAINER_PARAMS.merge(labels: {}).freeze
-
   # Cloud Dataflow.
   DATAFLOW_PARAMS = {
     resource: {
@@ -930,24 +866,6 @@ module Constants
   # Stub value for Monitored resources from Metadata Agent.
   # Map from the local_resource_id to the retrieved monitored resource.
   MONITORED_RESOURCE_STUBS = {
-    # Docker container stderr / stdout logs.
-    "#{DOCKER_CONTAINER_LOCAL_RESOURCE_ID_PREFIX}.#{DOCKER_CONTAINER_ID}" =>
-      {
-        'type' => DOCKER_CONSTANTS[:resource_type],
-        'labels' => {
-          'location' => ZONE,
-          'container_id' => DOCKER_CONTAINER_ID
-        }
-      }.to_json,
-    # Docker container application logs.
-    "#{DOCKER_CONTAINER_LOCAL_RESOURCE_ID_PREFIX}.#{DOCKER_CONTAINER_NAME}" =>
-      {
-        'type' => DOCKER_CONSTANTS[:resource_type],
-        'labels' => {
-          'location' => ZONE,
-          'container_id' => DOCKER_CONTAINER_ID
-        }
-      }.to_json,
     # GKE container logs.
     "#{CONTAINER_LOCAL_RESOURCE_ID_PREFIX}.#{CONTAINER_NAMESPACE_ID}" \
     ".#{K8S_POD_NAME}.#{K8S_CONTAINER_NAME}" =>

data/test/plugin/test_out_google_cloud.rb

@@ -353,7 +353,6 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
         '\bcoerce_to_utf8\b.*\bfalse\b',
         '\bdetect_json\b.*\btrue\b',
         '\bdetect_subservice\b.*\bfalse\b',
-        '\benable_metadata_agent\b.*\btrue\b',
         '\benable_monitoring\b.*\btrue\b',
         '\bhttp_request_key\b.*\btest_http_request_key\b',
         '\binsert_id_key\b.*\btest_insert_id_key\b',
@@ -364,11 +363,9 @@ class GoogleCloudOutputTest < Test::Unit::TestCase
         '\blabels_key\b.*\btest_labels_key\b',
         '\blabels\b.*{"labels_key"=>"labels_value"}',
         '\blogging_api_url\b.*\bhttp://localhost:52000\b',
-        '\bmetadata_agent_url\b.*\bhttp://localhost:12345\b',
         '\bmonitoring_type\b.*\bnot_prometheus\b',
         '\bnon_utf8_replacement_string\b.*\bzzz\b',
         '\boperation_key\b.*\btest_operation_key\b',
-        '\bpartial_success\b.*\bfalse\b',
         '\bproject_id\b.*\btest-project-id-123\b',
         '\brequire_valid_tags\b.*\btrue\b',
         '\bsource_location_key\b.*\btest_source_location_key\b',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.7.30
+  version: 0.8.0
 platform: ruby
 authors:
 - Stackdriver Agents Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement