grpc_access_logging_interceptor 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07c146c49b0d0bc4d7dcdb896f2f42d1844cc5fce15ba7502353e31086c648eb
-  data.tar.gz: bfcaec079594df0c5ca50b9ff2f157b96e101584cc4fa9d074247eb7a6147d47
+  metadata.gz: a2ac41e62dbedd2f938035e7a60fa98fd4a04a70fb3850ff3b5c9e8363b11518
+  data.tar.gz: 993cc5f03380eb3740150b2150c07f3ca59287b50b35088b5fca864153e5f706
 SHA512:
-  metadata.gz: 35f7abbfeda2554344b7bbc5822dc8d2f9e5c97fdbfeaac019e5ee378f310cadd92441283f1693f17111222c16b928dc7aeb10611cc3477cb8fbac638365f630
-  data.tar.gz: 1cf87b1a859d3a1bbffa268d364da2334e8222133ef1c3890ca963e2711d0a8f295cc66b32627204f64b5acc09d2c24330192d7488555028ae9dbfc49965033c
+  metadata.gz: 24960dc060169a1b8584ba2be8299ba509f65076619d1b253f50a883f99a20e54164ac165cf984c015de1bbb62860a7dca667b41b9cd0909f13fd03da23762e3
+  data.tar.gz: 5f8362c76c97e95f3361b634be72d225027288ca08cab488e7650819d9259f2a08083a2a8000ed3a0d1169d4ecfedda6f164476d6bf9c652027a5fbb559091db

data/.travis.yml

@@ -4,4 +4,7 @@ language: ruby
 cache: bundler
 rvm:
   - 2.6.2
-before_install: gem install bundler -v 2.0.2
+before_install:
+  - gem install bundler -v 2.0.2
+script:
+  - bundle exec rspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    grpc_access_logging_interceptor (0.0.2)
+    grpc_access_logging_interceptor (0.0.4)
       grpc
 
 GEM
@@ -9,10 +9,10 @@ GEM
   specs:
     coderay (1.1.2)
     diff-lcs (1.3)
-    google-protobuf (3.10.0-universal-darwin)
+    google-protobuf (3.11.1)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
-    grpc (1.24.0)
+    grpc (1.25.0)
       google-protobuf (~> 3.8)
       googleapis-common-protos-types (~> 1.0)
     method_source (0.9.2)

data/lib/grpc_access_logging_interceptor/server_interceptor.rb

@@ -1,3 +1,4 @@
+require "base64"
 require "grpc"
 require "grpc_access_logging_interceptor/default_logger"
 
@@ -22,16 +23,18 @@ module GrpcAccessLoggingInterceptor
     # @param [Method] method
     #
     def request_response(request:, call:, method:)
+      data = {} # Initialize at first to avoid nil
+
       accessed_at = Time.now
 
-      data = {
+      data.merge!({
         remote_addr:   remote_addr(call.peer),
         accessed_at:   accessed_at.utc.strftime('%Y-%m-%d %H:%M:%S.%6N'),
         params:        filter(request.to_h).to_json,
         user_agent:    call.metadata[USER_AGENT_KEY],
         grpc_method:   grpc_method(method),
-        grpc_metadata: call.metadata.to_json,
-      }
+        grpc_metadata: jsonize(call.metadata),
+      })
       data.merge!(custom_data(request: request, call: call, method: method))
 
       yield
@@ -69,6 +72,25 @@ module GrpcAccessLoggingInterceptor
       "/#{method.owner.service_name}/#{camelize(method.name.to_s)}"
     end
 
+    # @param [Hash] metadata
+    # @return [String]
+    def jsonize(metadata)
+      h = {}
+      metadata.each do |k, v|
+        if v.is_a?(String) && v.encoding == Encoding::ASCII_8BIT
+          begin
+            h[k] = v.encode(Encoding::UTF_8)
+          rescue Encoding::UndefinedConversionError
+            # If the value is binary, encode with Base64
+            h[k] = Base64.strict_encode64(v)
+          end
+        else
+          h[k] = v
+        end
+      end
+      h.to_json
+    end
+
     # @param [String] term
     # @return [String]
     def camelize(term)

data/lib/grpc_access_logging_interceptor/version.rb

@@ -1,3 +1,3 @@
 module GrpcAccessLoggingInterceptor
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc_access_logging_interceptor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Nao Minami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler