grpc_newrelic_interceptor 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f48d560a64c635ca1a2a5766cdfeca630f653750b42e75155c05f96440ad15e
-  data.tar.gz: 6a3760be8b5e0d6f3661f5ff39b40e8980e91cccf2d24eb976000b9c1629fccc
+  metadata.gz: 52a1fa41d6cca5fe25fb6d01fec2e75323725efb6db4c49e1f14539dbcabe690
+  data.tar.gz: fee4b6bc62c403fc9ade21cb0cfa8f280ec1feb6bbe3d0efb20481c2c52a200a
 SHA512:
-  metadata.gz: e211b44a114ae8f521c8168e48fec436b88fdc8295befc29f8b26b72f239332fcbad2f7ca4e3e65dfc98513ff3840b137a6a582a11caa3cd4f8011a48a11ca4c
-  data.tar.gz: 46ebb1247039200b02bb35a6d39d5282cca0a4f2f14e74b26c317382e1b155ed4b46e9337e69a92a1e7dec4faed9226f6284cf34b5f8749dbf1142f06d11068a
+  metadata.gz: 066d0af34fa9e33a40691169fb3684960f78829e421d6a40d3c12e683f232d274e18be4129d00a02331b3cd0b12a23c23a3b25e3a04490be28959c9a1fb17abf
+  data.tar.gz: 49ba61cd669e60da4b90201fab0f409d66d15ed50ab5c20fc178b6577608ce9918da0f927fb1ed08fae254e720aa198a2c2f70f71516091d6d6b5e1357fa2865

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_newrelic_interceptor (0.0.1)
+    grpc_newrelic_interceptor (0.0.2)
       grpc
       newrelic_rpm (~> 6.0)
 
@@ -10,14 +10,14 @@ GEM
   specs:
     coderay (1.1.2)
     diff-lcs (1.3)
-    google-protobuf (3.10.0-universal-darwin)
+    google-protobuf (3.11.3)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
-    grpc (1.24.0)
-      google-protobuf (~> 3.8)
+    grpc (1.27.0)
+      google-protobuf (~> 3.11)
       googleapis-common-protos-types (~> 1.0)
     method_source (0.9.2)
-    newrelic_rpm (6.7.0.359)
+    newrelic_rpm (6.8.0.360)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)

data/README.md

@@ -19,6 +19,8 @@ Or install it yourself as:
 
 ## Usage
 
+### Server
+
 ```ruby
 require 'grpc'
 require 'grpc_newrelic_interceptor'
@@ -27,13 +29,26 @@ NewRelic::Agent.manual_start  # start newrelic agent
 
 server = GRPC::RpcServer.new(
   interceptors: [
-    GrpcNewrelicInterceptor.new,
+    GrpcNewrelicInterceptor::ServerInterceptor.new,
   ]
 )
 server.handle(MyHandler.new)
 server.run_till_terminated_or_interrupted(['SIGINT'])
 ```
 
+### Client
+
+```ruby
+require 'grpc'
+require 'grpc_newrelic_interceptor'
+
+url = "dns:test-service:80"
+stub = TestService::Stub.new(url, :this_channel_is_insecure, interceptors: [
+  GrpcNewrelicInterceptor::ClientInterceptor.new,
+])
+stub.hello_rpc
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/grpc_newrelic_interceptor.rb

@@ -1,3 +1,4 @@
+require "grpc_newrelic_interceptor/client_interceptor"
 require "grpc_newrelic_interceptor/server_interceptor"
 require "grpc_newrelic_interceptor/version"
 

data/lib/grpc_newrelic_interceptor/client_interceptor.rb

@@ -0,0 +1,79 @@
+require "newrelic_rpm"
+require "grpc"
+
+module GrpcNewrelicInterceptor
+  class ClientInterceptor < GRPC::ClientInterceptor
+    ##
+    # Intercept a unary request response call
+    #
+    # @param [Object] request
+    # @param [GRPC::ActiveCall] call
+    # @param [String] method
+    # @param [Hash] metadata
+    #
+    def request_response(request:, call:, method:, metadata:)
+      return yield if !newrelic_enabled?
+
+      segment = NewRelic::Agent::Tracer.start_external_request_segment(
+        library:   "gRPC".freeze,
+        uri:       dummy_uri(method),
+        procedure: get_method_name(method),
+      )
+
+      begin
+        response = nil
+
+        # TODO(south37) Set metadta as reqeust headers
+        # segment.add_request_headers something
+
+        # RUBY-1244 Disable further tracing in request to avoid double
+        # counting if connection wasn't started (which calls request again).
+        NewRelic::Agent.disable_all_tracing do
+          response = yield
+        end
+
+        # NOTE: Here, we can not get metadata of response.
+        # TODO(south37) Improve ClientInterceptor to get metadata and set it as
+        # response headers
+        # segment.read_response_headers something
+
+        response
+      ensure
+        segment.finish
+      end
+    end
+
+    # NOTE: For now, we don't support server_streamer, client_streamer and bidi_streamer
+
+  private
+
+    # @param [String] method
+    # @return [URI]
+    def dummy_uri(method)
+      # Here, we use service_name as domain name.
+      service_name = get_service_name(method)
+      ::NewRelic::Agent::HTTPClients::URIUtil.parse_and_normalize_url("http://#{service_name}")
+    end
+
+    # @param [String] method
+    # @return [String]
+    def get_service_name(method)
+      # Here, method is a string which represents a full path of gRPC method.
+      # e.g. "/wantedly.users.UserService/GetUser"
+      method.split('/')[1]
+    end
+
+    # @param [String] method
+    # @return [String]
+    def get_method_name(method)
+      # Here, method is a string which represents a full path of gRPC method.
+      # e.g. "/wantedly.users.UserService/GetUser"
+      method.split('/')[2]
+    end
+
+    # @return [bool]
+    def newrelic_enabled?
+      NewRelic::Agent.instance.started?
+    end
+  end
+end

data/lib/grpc_newrelic_interceptor/version.rb

@@ -1,3 +1,3 @@
 module GrpcNewrelicInterceptor
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc_newrelic_interceptor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nao Minami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-28 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,7 @@ files:
 - bin/setup
 - grpc_newrelic_interceptor.gemspec
 - lib/grpc_newrelic_interceptor.rb
+- lib/grpc_newrelic_interceptor/client_interceptor.rb
 - lib/grpc_newrelic_interceptor/server_interceptor.rb
 - lib/grpc_newrelic_interceptor/version.rb
 homepage: https://github.com/south37/grpc_newrelic_interceptor
@@ -164,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: An interceptor for using New Relic with gRPC.