grpc_interceptors 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4c60a6a961edc3c7fc953ade87a0a77fd447e55f8510e827a622770c4a267ca
-  data.tar.gz: eaff3d4c879c31d62bac9e9d09a1a4199e884639770ffe72dbc99c398fd6bf25
+  metadata.gz: ce6dbf5fa29684368e37b4801f2e6af7b662901cb86437ab3d2f79e1d368ed62
+  data.tar.gz: 457f47fb4eb8a2c2918dac9cade910849b1de2a1a77ab398ee293ac91c4c03f8
 SHA512:
-  metadata.gz: e7296306ecc945d6fcb28161f16f836750f05e77aca7d18dac9ad9a3cd3e2619db3b588852fa3e4b3316c7b892e49ddf44673a9eab8d9f4fa7c24a5de3186811
-  data.tar.gz: d7777879bf82564ae53698c2a64e7ecb6c8daede6eb0be81596f97d78a54db789f3db36ff5ac968dd21c229dd1f508d7dea6aeac696d975f79e39fd30a12f534
+  metadata.gz: 42d8785d23e603269e7adc49b096777a41bef92daac3709069949629f9d7db5617c424c6353d19db6566fbd57b75d796f73f6440030e1ec78a112126ddac8776
+  data.tar.gz: e9ee7ed6d174803126f2bd7c10c4aa98e4e3a55d9d055f821158a424e6006a71706c49d53abe8cb83919af8b9938bf005e28498e9d51a6ee7bcb7fedf85c85be

data/lib/grpc_interceptors/common/logging.rb

@@ -1,8 +1,33 @@
 # frozen_string_literal: true
 
+require 'logger'
+
 module GrpcInterceptors
   module Common
     module Logging
+      SYMBOL_TO_SEVERITY = {
+        trace: ::Logger::Severity::DEBUG,
+        debug: ::Logger::Severity::DEBUG,
+        info: ::Logger::Severity::INFO,
+        warn: ::Logger::Severity::WARN,
+        error: ::Logger::Severity::ERROR,
+        fatal: ::Logger::Severity::FATAL
+      }.freeze
+
+      # Some logger implementations (e.g. SemanticLogger-backed CasinoLogger)
+      # expose #level as a Symbol rather than the ::Logger::Severity Integer
+      # constants this module compares against. Normalize here so any logger
+      # duck-typed with #level/#info/#debug works without a per-service wrapper.
+      def self.normalized_level(logger)
+        raw = logger.respond_to?(:level) ? logger.level : ::Logger::Severity::INFO
+
+        case raw
+        when Integer then raw
+        when Symbol then SYMBOL_TO_SEVERITY.fetch(raw, ::Logger::Severity::INFO)
+        else ::Logger::Severity::INFO
+        end
+      end
+
       def self.yield_and_log(
         logger: nil, request: nil, method: nil, method_type: nil, kind: nil
       )
@@ -21,7 +46,7 @@ module GrpcInterceptors
         extra_fields ||= {}
         extra_fields['grpc.code'] = grpc_code
 
-        if logger.level == ::Logger::Severity::DEBUG && !response.nil? && !response.is_a?(Enumerator)
+        if normalized_level(logger) == ::Logger::Severity::DEBUG && !response.nil? && !response.is_a?(Enumerator)
           extra_fields['response'] = Common::GrpcHelper.proto_to_h(response)
         end
 
@@ -49,9 +74,10 @@ module GrpcInterceptors
         payload = build_payload(method, method_type, kind)
         payload.merge!(extra_fields)
 
-        if logger.level == ::Logger::Severity::INFO
+        level = normalized_level(logger)
+        if level == ::Logger::Severity::INFO
           logger.info(payload)
-        elsif logger.level == ::Logger::Severity::DEBUG
+        elsif level == ::Logger::Severity::DEBUG
           payload['request'] = Common::GrpcHelper.proto_to_h(request) unless request.nil?
           logger.debug(payload)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grpc_interceptors
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - michal-kazmierczak
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -287,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: A collection of Ruby interceptors (middlewares) for gRPC servers and clients.
 test_files: []