fluent-plugin-sentry-rubrik 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8e8165d016b68154e8b81133a00585e0495d416
-  data.tar.gz: 8e716a1d64215b418c396ae70253ea752ade1341
+  metadata.gz: e9d735c9999a2f9e07c45e99ba034ede076f5663
+  data.tar.gz: '0078205ce40f7a2be3ab3991b0bc50f5546b944b'
 SHA512:
-  metadata.gz: 26185c4184d3aa7cd0a0e19aded2cff2c8ee8861095332b33d3b4d98b93eb1267c62f72812c64d66d21b969aa4cb8b35b6cbcbe514b89aa315676d198a59fb31
-  data.tar.gz: e1e17c2620d08f158d35e1799d266ffe703846029ee02bce6cdf2eaaeb6bd3b279d8590da8d27b307ccb9cea93717147226c37ae0ee475718dd4318e6702adb1
+  metadata.gz: a604a680cfa1a20aac1f3d7cc1580c88d2943d00fd5491282e6561d912fcaeab8308ba324daf050bbe5cfb0124f493e296b6d4d6f10265829b0fb79abaa214e4
+  data.tar.gz: 6ff5045f7003416dfb91a40e7ed14333c8f34e47fed412c3505d7524496f1c10dcd4bea1def7aa7d48e49aba92494d014820262ad5f5e606418659187ab815e4

data/README.md

@@ -93,7 +93,7 @@ Note that the default ignores `info` and `debug` logs. And `default_level`
 defaults to `info`. This might ignore more logs than you anticipated.
 
 * tags_key
-[default] ""
+[default] "" (empty array)
 
 Report those items with the given key as tags to Sentry. This makes it possible
 to correlate events via tags. Access to structured tag is supported, for
@@ -114,6 +114,22 @@ example and `\t` instead of a visual tabulation.
 When true (the default) this option will expand the escaped character into the
 original control code. This important for successfully parsing stacktraces.
 
+* userid_key
+[default] "" (empty array)
+
+List of keys to use as for the Sentry user id. Keys are looked up in order a
+log event, first match wins.
+
+Example with `userid_key account, user` and the log
+`{ "msg": "foo", "account": "foo", "user": "babar" }` the Sentry user id will
+be set to "foo".
+
+Composed IDs are supported. Example with
+`userid_key account/user, account, user` and the log as above, the Sentry user
+id will be set to "foo/babar".
+
+Forward slash is used to identify the different keys.
+
 It also support rewriting Tag with SetTagKeyMixin.
 
 * remove_tag_prefix

data/fluent-plugin-sentry.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-sentry-rubrik"
-  spec.version       = "0.0.13"
+  spec.version       = "0.0.14"
   spec.authors       = ["Kentaro Yoshida", "François-Xavier Bourlet"]
   spec.email         = ["y.ken.studio@gmail.com", "fx.bourlet@rubrik.com"]
   spec.summary       = %q{Fluentd output plugin that sends aggregated errors/exception events to Sentry. Sentry is a event logging and aggregation platform.}

data/lib/fluent/plugin/out_sentry.rb

@@ -17,6 +17,7 @@ module Fluent
     config_param :default_logger, :string, :default => 'fluentd'
     config_param :report_levels, :array, value_type: :string, :default => %w(fatal error warn warning)
     config_param :tags_key, :array, value_type: :string, :default => %w()
+    config_param :userid_key, :array, value_type: :string, :default => %w()
     config_param :endpoint_url, :string
     config_param :flush_interval, :time, :default => 0
     config_param :hostname_command, :string, :default => 'hostname'
@@ -42,6 +43,14 @@ module Fluent
 
       @tags_key = @tags_key.to_set()
 
+      @userid_key_patterns = []
+      @userid_key.each do |key_pattern|
+        keys = key_pattern.split("/")
+        @userid_key_patterns.push(keys)
+      end
+
+	  $log.info(@userid_key_patterns)
+
       hostname_command = @hostname_command || DEFAULT_HOSTNAME_COMMAND
       @hostname = `#{hostname_command}`.chomp
 
@@ -106,6 +115,12 @@ module Fluent
 
       event.tags = event.tags.merge(extract_tags(record))
       event.extra = record.reject{ |key| EVENT_KEYS.include?(key) }
+
+      user_id = extract_userid(record)
+      if user_id != nil
+        event.user = {"id": user_id}
+      end
+
       @client.send_event(event)
     end
 
@@ -123,5 +138,14 @@ module Fluent
       }
       return r
     end
+
+    def extract_userid(record)
+      @userid_key_patterns.each do |pattern|
+        values = pattern.each.map do |key| record[key] end
+        if values.all?
+          return values.join("/")
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-sentry-rubrik
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Kentaro Yoshida
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler