fluent-plugin-google-cloud 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7a29c9e8d247a3ca399605a375529a371856aa2
-  data.tar.gz: 49254ff8d84d7ab097ae2087f830882c7c990f8d
+  metadata.gz: 1dc5ad48b790072401a4ed3d0b48e02e57a2a697
+  data.tar.gz: e11801bebd08a12a47f7e84332fc72db19463772
 SHA512:
-  metadata.gz: 582f2b49c2a5fbbefdeef47e124b6de5ac197028630c8ee2fe784cfa00ae914158c358ac04e88e06bab539c3969b29ba8b700d7048b0d5436a54733cba229808
-  data.tar.gz: 00decd87d0b8b4b4f1d1be8a77ec332d2b276f0c29edb7b0d6e34e0f950eb72e48b32948db3be40edfd8e3483cfe5ff166f5b51fef96128c296e0a867483f418
+  metadata.gz: 2340a5b449123bbb88ba39ac155856f3561820e9a8468593aae5cc81a1b871b4602ce8a0143a7e3c909f10cedcf0515e5b297959da92ab23a3e0046025694026
+  data.tar.gz: b66cc54e2372fbf79c2a2fd20828417a9dfef516e5ff5dce16b9b7af66644c7bf9a283dbcd17c9b1d54cfebaa5eb989695608f429db0f1db6869dfe385b00ec0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-google-cloud (0.6.5)
+    fluent-plugin-google-cloud (0.6.6)
       fluentd (~> 0.10)
       google-api-client (~> 0.9.0)
       google-cloud-logging (= 0.24.1)
@@ -13,8 +13,8 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
@@ -85,7 +85,7 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mocha (1.2.1)
+    mocha (1.3.0)
       metaclass (~> 0.0.1)
     msgpack (1.1.0)
     multi_json (1.12.1)
@@ -97,7 +97,7 @@ GEM
     powerpack (0.1.1)
     prometheus-client (0.7.1)
       quantile (~> 0.2.0)
-    public_suffix (2.0.5)
+    public_suffix (3.0.0)
     quantile (0.2.0)
     rainbow (2.2.2)
       rake

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.6.5'
+  gem.version       = '0.6.6'
   gem.authors       = ['Todd Derr', 'Alex Robinson']
   gem.email         = ['salty@google.com']
   gem.required_ruby_version = Gem::Requirement.new('>= 2.0')

data/lib/fluent/plugin/out_google_cloud.rb

@@ -98,7 +98,6 @@ module Fluent
       # Default values for JSON payload keys to set the "trace",
       # "sourceLocation", "operation" and "labels" fields in the LogEntry.
       DEFAULT_PAYLOAD_KEY_PREFIX = 'logging.googleapis.com'
-      DEFAULT_LABELS_KEY = "#{DEFAULT_PAYLOAD_KEY_PREFIX}/labels"
       DEFAULT_HTTP_REQUEST_KEY = 'httpRequest'
       DEFAULT_OPERATION_KEY = "#{DEFAULT_PAYLOAD_KEY_PREFIX}/operation"
       DEFAULT_SOURCE_LOCATION_KEY =
@@ -161,7 +160,7 @@ module Fluent
     Fluent::Plugin.register_output('google_cloud', self)
 
     PLUGIN_NAME = 'Fluentd Google Cloud Logging plugin'
-    PLUGIN_VERSION = '0.6.5'
+    PLUGIN_VERSION = '0.6.6'
 
     # Name of the the Google cloud logging write scope.
     LOGGING_SCOPE = 'https://www.googleapis.com/auth/logging.write'
@@ -192,7 +191,6 @@ module Fluent
     config_param :vm_name, :string, :default => nil
 
     # Map keys from a JSON payload to corresponding LogEntry fields.
-    config_param :labels_key, :string, :default => DEFAULT_LABELS_KEY
     config_param :http_request_key, :string, :default =>
       DEFAULT_HTTP_REQUEST_KEY
     config_param :operation_key, :string, :default => DEFAULT_OPERATION_KEY
@@ -523,7 +521,6 @@ module Fluent
           entry.trace = fq_trace_id if fq_trace_id
 
           set_log_entry_fields(record, entry)
-          set_labels(record, entry)
 
           if @use_grpc
             set_payload_grpc(entry_resource.type, record, entry, is_json)
@@ -1285,20 +1282,6 @@ module Fluent
       end
     end
 
-    def set_labels(record, entry)
-      record_labels = record[@labels_key]
-      return nil unless record_labels.is_a?(Hash)
-
-      record_labels.each do |key, value|
-        unless entry.labels.key?(key)
-          record_labels.delete(key)
-          entry.labels[key] = value
-        end
-      end
-
-      record.delete(@labels_key) if record_labels.empty?
-    end
-
     # Values permitted by the API for 'severity' (which is an enum).
     VALID_SEVERITIES = Set.new(
       %w(DEFAULT DEBUG INFO NOTICE WARNING ERROR CRITICAL ALERT EMERGENCY))

data/test/plugin/base_test.rb

@@ -952,47 +952,6 @@ module BaseTest
     end
   end
 
-  def test_labels_from_record
-    setup_gce_metadata_stubs
-    setup_logging_stubs do
-      d = create_driver
-      d.emit(DEFAULT_LABELS_KEY => CUSTOM_LABELS_MESSAGE)
-      d.run
-    end
-    labels = COMPUTE_PARAMS[:labels].merge(CUSTOM_LABELS_MESSAGE)
-    params = COMPUTE_PARAMS.merge(labels: labels)
-    verify_log_entries(1, params, 'labels') do |entry|
-      assert_nil get_fields(entry['jsonPayload'])[DEFAULT_LABELS_KEY], entry
-    end
-  end
-
-  def test_labels_from_record_conflict
-    setup_gce_metadata_stubs
-    setup_logging_stubs do
-      d = create_driver
-      d.emit(DEFAULT_LABELS_KEY => { CONFLICTING_LABEL_KEY => 'a_string' })
-      d.run
-    end
-    verify_log_entries(1, COMPUTE_PARAMS, 'jsonPayload') do |entry|
-      fields = get_fields(entry['jsonPayload'])
-      labels = get_fields(get_struct(fields[DEFAULT_LABELS_KEY]))
-      assert_equal('a_string', get_string(labels[CONFLICTING_LABEL_KEY]), entry)
-    end
-  end
-
-  def test_labels_from_record_when_not_hash
-    setup_gce_metadata_stubs
-    setup_logging_stubs do
-      d = create_driver
-      d.emit(DEFAULT_LABELS_KEY => 'a_string')
-      d.run
-    end
-    verify_log_entries(1, COMPUTE_PARAMS, 'jsonPayload') do |entry|
-      fields = get_fields(entry['jsonPayload'])
-      assert_equal 'a_string', get_string(fields[DEFAULT_LABELS_KEY]), entry
-    end
-  end
-
   def test_log_entry_trace_field
     setup_gce_metadata_stubs
     message = log_entry(0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-google-cloud
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Todd Derr
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd