istox 0.1.152.1.test3 → 0.1.152.1.test4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 758fc766dfc65e9d4d0b23738b9b307cdcb236a6c285026b31547c90bfa394df
-  data.tar.gz: 5be8eb757880769faa79f50a946639a5887b665331c67840d7cf7201941b9068
+  metadata.gz: 22172b2aecd51d7190552627a94affb11786127c3a02d0895a36560d5a372380
+  data.tar.gz: 30f072330cb82b023aeb7e17110a0f96d0b419ea4ea6d63f111c4d32a594678d
 SHA512:
-  metadata.gz: 531d98e17c4ed0ab48abbd6117175874ca3a8c8dc13b4bcc065987f2b100a7157f96191dadcee1438851560ae85615b861d2c59c816e849ffdf8f1670d05f36a
-  data.tar.gz: 7f87201248c55674239a2a86b0bd4b195e9ef29e696924ac7abe9d61be7409b9fd93e5d6efea9e6cfd5195e5d6bbb5b5ca86afa9978df0dbdaf93e41ad0a4c1f
+  metadata.gz: e13df624678c8cdb47aee17427564aca8349cde04fdaf209eeb22a0de96cbcca77987738050ba31b32f2fc5b0182aca2506a0f012dffd7b205f4da1893ac5691
+  data.tar.gz: 7e00d3da3058aea3ab84fdf6da015a0fbf867101c66931fb40db0448604081f6c92939c372a18a7cfca34155bfae4cbc3e2b6ae356f395b23dc29ee903e7c461

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    istox (0.1.152)
+    istox (0.1.152.1.test2)
       awesome_print
+      aws-xray-sdk
       binding_of_caller
       bunny (>= 2.12.0)
       graphlient
@@ -65,8 +66,20 @@ GEM
     arel (9.0.0)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
-    aws-sigv4 (1.1.1)
+    aws-partitions (1.318.0)
+    aws-sdk-core (3.96.1)
+      aws-eventstream (~> 1, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
+      jmespath (~> 1.0)
+    aws-sdk-xray (1.4.0)
+      aws-sdk-core (~> 3)
+      aws-sigv4 (~> 1.0)
+    aws-sigv4 (1.1.3)
       aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-xray-sdk (0.11.4)
+      aws-sdk-xray (~> 1.4.0)
+      multi_json (~> 1)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
@@ -98,18 +111,18 @@ GEM
     ffi (1.12.2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.11.4-universal-darwin)
+    google-protobuf (3.12.1)
     googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
     graphlient (0.3.7)
       faraday
       faraday_middleware
       graphql-client
-    graphql (1.10.6)
+    graphql (1.10.10)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.28.0-universal-darwin)
+    grpc (1.28.0)
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.28.0)
@@ -128,6 +141,7 @@ GEM
       grpc (~> 1.10)
       grpc-tools (~> 1.10)
       slop (~> 4.6)
+    jmespath (1.4.0)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -143,12 +157,13 @@ GEM
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
+    multi_json (1.14.1)
     multipart-post (2.1.1)
     nio4r (2.3.1)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     oj (3.10.6)
-    ougai (1.8.3)
+    ougai (1.8.5)
       oj (~> 3.10)
     paranoia (2.4.2)
       activerecord (>= 4.0, < 6.1)
@@ -185,7 +200,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (10.5.0)
-    rb-fsevent (0.10.3)
+    rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redis (4.1.3)
@@ -243,7 +258,7 @@ GEM
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uniform_notifier (1.11.0)
-    vault (0.13.0)
+    vault (0.13.2)
       aws-sigv4
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)

data/istox.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'awesome_print'
+  spec.add_dependency 'aws-xray-sdk'
   spec.add_dependency 'binding_of_caller'
   spec.add_dependency 'bunny', '>= 2.12.0'
   spec.add_dependency 'graphlient'

data/lib/istox/helpers/grpc_client.rb

@@ -3,8 +3,6 @@ require 'istox/helpers/logger'
 module Istox
   class GrpcClient
     class << self
-      attr_accessor :client_metadata_hook
-
       def add_host(host_type, url)
         @@hosts = {} unless defined?(@@hosts)
 
@@ -50,7 +48,7 @@ module Istox
         log.info "Calling method in grpc method: #{method.inspect}, params: #{keyword_args.inspect}"
         t1 = Time.now
 
-        result = get_host(host_type, service).call(method, keyword_args, client_metadata)
+        result = get_host(host_type, service).call(method, keyword_args)
         log.info "Time taken for grpc execution: #{Time.now - t1} seconds"
 
         return_values = ::Istox::CommonHelper.to_open_struct(result.message)
@@ -96,16 +94,6 @@ module Istox
           channel_args: default_channel_options
         }
       end
-
-      def client_metadata
-        return {} if @client_metadata_hook.blank?
-
-        unless @client_metadata_hook.methods.include?(:inject_metadata)
-          raise StandardError, 'Unable to find method .inject_metadata, have you forgotten to define it in your hook?'
-        end
-
-        @client_metadata_hook.inject_metadata
-      end
     end
   end
 end

data/lib/istox/helpers/xray/grpc_client_xray_interceptor.rb

@@ -0,0 +1,18 @@
+require 'istox/helpers/logger'
+require 'aws-xray-sdk'
+
+module Istox
+  module Xray
+    class GrpcClientXrayInterceptor < ::Gruf::Interceptors::ClientInterceptor
+      def call(request_context:)
+        XRay.recorder.begin_subsegment name: "GrpcRequest.#{request_context.method}"
+
+        request_context.metadata[:xray_trace_id] = XRay.recorder.current_segment.trace_id
+
+        yield
+
+        XRay.recorder.end_subsegment
+      end
+    end
+  end
+end

data/lib/istox/helpers/xray/grpc_server_xray_interceptor.rb

@@ -0,0 +1,21 @@
+require 'istox/helpers/logger'
+require 'aws-xray-sdk'
+
+module Istox
+  module Xray
+    class GrpcServerXrayInterceptor < ::Gruf::Interceptors::ServerInterceptor
+      def call
+        meta = request.active_call.metadata
+        trace_id = (meta['xray_trace_id'] if meta.present? && meta.key?('xray_trace_id'))
+
+        XRay.recorder.begin_segment("GrpcHandler.#{request.method_key}", trace_id: trace_id)
+
+        result = yield # this returns the protobuf message
+
+        XRay.recorder.end_segment
+
+        result
+      end
+    end
+  end
+end

data/lib/istox/helpers/xray/rabbitmq_publisher_interceptor.rb

@@ -0,0 +1,10 @@
+require 'istox/helpers/logger'
+require 'aws-xray-sdk'
+
+module Istox
+  module Xray
+    class RabbitmqPublisherInterceptor
+      def call; end
+    end
+  end
+end

data/lib/istox/helpers/xray/rabbitmq_subscriber_interceptor.rb

@@ -0,0 +1,10 @@
+require 'istox/helpers/logger'
+require 'aws-xray-sdk'
+
+module Istox
+  module Xray
+    class RabbitmqSubscriberInterceptor
+      def call; end
+    end
+  end
+end

data/lib/istox/helpers/xray/xray_initializer.rb

@@ -0,0 +1,35 @@
+require 'istox/helpers/logger'
+require 'istox/helpers/xray/grpc_client_xray_interceptor'
+require 'istox/helpers/xray/grpc_server_xray_interceptor'
+require 'istox/helpers/xray/rabbitmq_publisher_interceptor'
+require 'istox/helpers/xray/rabbitmq_subscriber_interceptor'
+require 'istox/helpers/logger'
+require 'aws-xray-sdk'
+
+module Istox
+  module Xray
+    class XrayInitializer
+      class << self
+        ## input gruf config to enable gruf/grpc tracing, eg. Gruf.configure do |config|
+        ## set enable_rabbitmq_trace to enable rabbitmq tracing
+        def init(service_name, gruf_config: nil, enable_rabbitmq_trace: nil)
+          Rails.application.config.xray = {
+            # default segment name generated by XRay middleware
+            daemon_address: ENV['AWS_XRAY_DAEMON_ADDRESS'],
+            name: service_name,
+            patch: %I[net_http aws_sdk],
+            # record db transactions as subsegments
+            active_record: true
+          }
+
+          if gruf_config.present?
+            gruf_config.interceptors.use(::Istox::Xray::GrpcServerXrayInterceptor)
+            ::Istox::GrpcClient.add_interceptors(::Istox::Xray::GrpcClientXrayInterceptor)
+          end
+
+          return unless enable_rabbitmq_trace == true
+        end
+      end
+    end
+  end
+end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.152.1.test3'.freeze
+  VERSION = '0.1.152.1.test4'.freeze
 end

data/lib/istox.rb

@@ -35,6 +35,13 @@ module Istox
   require 'istox/helpers/redis'
   require 'istox/helpers/dlm'
   require 'istox/helpers/remote_model_cache'
+
+  require 'istox/helpers/xray/grpc_client_xray_interceptor'
+  require 'istox/helpers/xray/grpc_server_xray_interceptor'
+  require 'istox/helpers/xray/rabbitmq_publisher_interceptor'
+  require 'istox/helpers/xray/rabbitmq_subscriber_interceptor'
+  require 'istox/helpers/xray/xray_initializer'
+
   require 'istox/models/blockchain_receipt'
   require 'istox/models/concerns/blockchain_receipt_query'
   require 'istox/consumers/blockchain_status_handler'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.152.1.test3
+  version: 0.1.152.1.test4
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-xray-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
@@ -452,6 +466,11 @@ files:
 - lib/istox/helpers/result_handler.rb
 - lib/istox/helpers/subscriber.rb
 - lib/istox/helpers/vault.rb
+- lib/istox/helpers/xray/grpc_client_xray_interceptor.rb
+- lib/istox/helpers/xray/grpc_server_xray_interceptor.rb
+- lib/istox/helpers/xray/rabbitmq_publisher_interceptor.rb
+- lib/istox/helpers/xray/rabbitmq_subscriber_interceptor.rb
+- lib/istox/helpers/xray/xray_initializer.rb
 - lib/istox/interfaces/chainhub/transaction.rb
 - lib/istox/models/blockchain_receipt.rb
 - lib/istox/models/concerns/blockchain_receipt_query.rb