fluent-plugin-geoip-filter 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1aba0c3bcff83eb258fefad79cb5747a01cf3736
-  data.tar.gz: f53204135786c2a818c3885b4215d3be959ba3ea
+  metadata.gz: 2be5dbe1e9076e891fdbfdc2041755e71b105396
+  data.tar.gz: 2d5127fcf908860c68a4b92b4ea465e966d1cf15
 SHA512:
-  metadata.gz: 040891bdc87ac19ea736d8b0931fc0df543a161b168c8be995c1afb87f4f8f1cca1830e40d8930255fb80acb95a235768cabe04135d6a364dc367f71b6e9c436
-  data.tar.gz: 560753360e05249d4609eaedfef3d9861dc530b5fec31b0a295e942803d6b1cb6c6fc2fd2f25a6888b2c39a0f2f3eabcafee26772fdb936f0f28ce96f62694de
+  metadata.gz: afde714742e31e2d8abb29ed99d7e1a18cab7831aed0d86d197dbaec2c38da0419cb3473acc5a7ffafc97fb773b9052e460171b9ea825443151e093ad3c97c58
+  data.tar.gz: 414414a72e6c48e158a389b4cca7a14419edb0b0b21e5a3c417a7213365aa7453bc896e99127d511d841246ba7c338e6d027445058ca5b6b5a02e3b7e5ca5cf0

data/README.md

@@ -75,6 +75,18 @@ access.nginx: {
     join hashed data by '_'. default false.
 
 
+## VS. 
+[fluent-plugin-geoip](https://github.com/y-ken/fluent-plugin-geoip)
+Fluentd output plugin to geolocate with geoip.
+It is able to customize fields with placeholder.
+
+* Easy to install.
+    * Not require to install Development Tools and geoip-dev library.
+    * ( fluent-plugin-geoip use geoip-c gem but our plugin use geoip. It's conflict. )
+* 5-10 times faster by the LRU cache.
+    * See [benchmark](test/bench_geoip_filter.rb).
+
+
 ## TODO
 
 * patches welcome!

data/fluent-plugin-geoip-filter.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "fluent-plugin-geoip-filter"
-  spec.version       = "0.1.1"
+  spec.version       = "0.2.0"
   spec.authors       = ["Yuri Umezaki"]
   spec.email         = ["bungoume@gmail.com"]
   spec.homepage      = "https://github.com/bungoume/fluent-plugin-geoip-filter"

data/lib/fluent/plugin/filter_geoip.rb

@@ -6,7 +6,7 @@ module Fluent
     Plugin.register_filter('geoip', self)
 
     def initialize
-      @geoip_cache = LruRedux::Cache.new(10000)
+      @geoip_cache = LruRedux::Cache.new(8192)
       super
     end
 

data/test/bench_geoip_filter.rb

@@ -0,0 +1,44 @@
+require_relative 'helper'
+require 'fluent/plugin/filter_geoip'
+
+# setup
+Fluent::Test.setup
+config = %[
+  @type geoip
+  out_key geo
+]
+time = Time.now.to_i
+tag = 'foo.bar'
+driver = Fluent::Test::FilterTestDriver.new(Fluent::GeoipFilter, tag).configure(config, true)
+
+# bench
+require 'benchmark'
+require 'ipaddr'
+n = 100000
+Benchmark.bm(7) do |x|
+  # 8192 random IP
+  x.report { driver.run { n.times { driver.emit({'client_ip' => IPAddr.new(rand(2**13)*2**19,Socket::AF_INET).to_s }, time) } } }
+end
+
+
+# Without LRU cache
+#              user     system      total        real
+#         11.410000   2.730000  14.140000 ( 15.431248)
+# With LRU cache(8192) & random  1024 IP
+#              user     system      total        real
+#          1.250000   0.070000   1.320000 (  1.322339)
+# With LRU cache(8192) & random  8192 IP
+#              user     system      total        real
+#          1.890000   0.210000   2.100000 (  2.102445)
+# With LRU cache(8192) & random 16384 IP
+#              user     system      total        real
+#          8.450000   2.070000  10.520000 ( 12.170379)
+# With LRU cache(8192) & random 65536 IP
+#              user     system      total        real
+#         11.890000   2.820000  14.710000 ( 16.051674)
+
+# fluent-plugin-geoip
+# (https://github.com/y-ken/fluent-plugin-geoip)
+#              user     system      total        real
+#         11.540000   0.270000  11.810000 ( 12.685000)
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-geoip-filter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuri Umezaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-26 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -111,6 +111,7 @@ files:
 - data/GeoLiteCity.dat
 - fluent-plugin-geoip-filter.gemspec
 - lib/fluent/plugin/filter_geoip.rb
+- test/bench_geoip_filter.rb
 - test/helper.rb
 - test/plugin/test_filter_geoip.rb
 homepage: https://github.com/bungoume/fluent-plugin-geoip-filter
@@ -138,5 +139,6 @@ signing_key:
 specification_version: 4
 summary: Fluentd filter plugin to add geoip
 test_files:
+- test/bench_geoip_filter.rb
 - test/helper.rb
 - test/plugin/test_filter_geoip.rb