kumonos 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c137d928413251dd625fb879bb9fadceaec8b67
-  data.tar.gz: 94760987d06167ca471708e592e27fb0163704b8
+  metadata.gz: e8bce93ae7e9f596bc9be6c4095b9e743536ff10
+  data.tar.gz: e3d0d47a86b65f3434e5b10757e543105ead5385
 SHA512:
-  metadata.gz: 3d7e6457d9cfaa4bce356fbf282fea7c5467628d5766d3d1f6044059807dcd2f608605d1e8c60ce76e0ece3ce85a548056ae3c2e5cfb56613dc19078b4f47305
-  data.tar.gz: fa2dee968425d4eb53f57a9bd6d7f27d24a157c0dd932ad7bb69883293a380574c22cf5ad08656f1f3262fe917d09cc113d2c78433d7f43e56c9dae103fa6d33
+  metadata.gz: cc1a11c5f9762e9eb7463447ed8c4b4b30127c9185e5cad69ba5fe5d73839a67a4d54d8729511b66d68a1f34026261eaf84b74ba9c40bbda9309bb1836ad4324
+  data.tar.gz: 2384a77f383f890ffdc67c1f1c8a24ac6b36303a4a50a242e87c4251f7b9011b47ee91c5a8510df55312038b31bcd9affd584b2d6311d3e8e0236a6dd9f7a0ab

data/.travis.yml

@@ -5,3 +5,5 @@ rvm:
 before_install:
   - gem update --system # https://github.com/rubygems/rubygems/pull/1819
   - gem install bundler
+branches:
+  - master

data/Rakefile

@@ -15,5 +15,14 @@ task :integration_test do
   end
 end
 
+desc 'Run full integration test'
+task :full_integration_test do
+  ENV['TEST_WITH_RELAY'] = '1'
+  Rake::Task['integration_test'].invoke
+end
+
 desc 'Run all tests'
 task all: %i[spec rubocop integration_test]
+
+desc 'Run all tests including slow ones'
+task full: %i[spec rubocop full_integration_test]

data/exe/kumonos-relay

@@ -10,18 +10,18 @@ class StatConvertor
   end
 
   def call(line)
-    convert_cluster(add_default_tag(line)) + "\n"
+    convert_listener(convert_cluster(add_default_tag(line))) + "\n"
   end
 
   private
 
-  # envoy.cluster.ab-testing.external.upstream_rq_200
-  PATTERN = /\Aenvoy\.cluster\.([^.]+)\./
+  # envoy.cluster.ab-testing.external.upstream_rq_200:1|c
+  CLUSTER_PATTERN = /\Aenvoy\.cluster\.([^.]+)\./
   def convert_cluster(line)
-    if line.match(PATTERN)
+    if line.match(CLUSTER_PATTERN)
       name = Regexp.last_match(1)
       [
-        line.gsub(PATTERN, 'envoy.cluster.'),
+        line.gsub(CLUSTER_PATTERN, 'envoy.cluster.'),
         ",cluster:#{name}"
       ].join
     else
@@ -29,6 +29,21 @@ class StatConvertor
     end
   end
 
+  # XXX: ipv4 only
+  # envoy.listener.0.0.0.0_9211.http.ingress_http.downstream_rq_5xx:0|c
+  LISTENER_PATTERN = /\Aenvoy\.listener\.(\d+\.\d+\.\d+.\d+_\d+)./
+  def convert_listener(line)
+    if line.match(LISTENER_PATTERN)
+      listener = Regexp.last_match(1)
+      [
+        line.gsub(LISTENER_PATTERN, 'envoy.listener.'),
+        ",listener:#{listener}"
+      ].join
+    else
+      line
+    end
+  end
+
   def add_default_tag(line)
     [
       "#{line.chomp}|#",

data/lib/kumonos/version.rb

@@ -1,3 +1,3 @@
 module Kumonos
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.8.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumonos
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Taiki Ono