istox 0.1.152.1.test14 → 0.1.152.1.test15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80d9890642a6fafefcb45a0667ac6fc4124f5a90409b5f23aa93bae4657fe6a5
-  data.tar.gz: 9e983de8c1330813c497d11d2430b777e2c8a381bc65b08a1e2812beb54a5708
+  metadata.gz: 5e6b7b281f10081914395204d820554eb676d7f7063766a0f45f3d470ad75ee3
+  data.tar.gz: 128fe251d9c3e76627254fa2d343e3295fa073678897626bf4fafdd3b1e35978
 SHA512:
-  metadata.gz: d41d3523e97c6bd58601fdb924d4826e661f27f7949966bc2489f0573b71df516a93ae787b6b08ef8a64a3db3a676ef1fe7995befd28b53f752d4bd3bc2e7e89
-  data.tar.gz: 03b6a2ae93ae727e5169ecbd13cb3422582493e99be0c1bba8e172fbcc0b60a34739e1ae4780cb407741708527b875ae2ea45eed1886854c0acac95822ad6a91
+  metadata.gz: 5072c8a9f84ce0e3239283a3ceebc3d3585fb0ab29b081383333760dc475716533272c33bb41b0edb4ae6eefdb07ab4b350fd50a76509f92d25d9ea04ff5c78e
+  data.tar.gz: 37c17fbb58fb0c07a51e88afdb953d4bab5b3b60911ee5c3a4991a333b40b6fa43109c6ac646bdc76115bbb9975267e854405d1e5e0e741294545560be64a3bb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.152.1.test12)
+    istox (0.1.152.1.test14)
       awesome_print
       binding_of_caller
       bunny (>= 2.12.0)
@@ -65,8 +65,20 @@ GEM
     arel (9.0.0)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
+    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)
@@ -128,6 +140,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,6 +156,7 @@ 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)
@@ -253,6 +267,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  aws-xray-sdk
   bullet (~> 5.7.5)
   bundler (~> 1.16)
   database_cleaner (~> 1.6.0)

data/istox.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'redis-namespace', '>= 1.0.0'
   spec.add_dependency 'redis-rails', '~> 5.0.2'
   spec.add_dependency 'vault', '~> 0.1'
+  spec.add_development_dependency 'aws-xray-sdk'
   spec.add_development_dependency 'bullet', '~> 5.7.5'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'database_cleaner', '~> 1.6.0'

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

@@ -17,9 +17,9 @@ module Istox
         ## but in some special case we might not have segment initiated
         ## eg. when running from rails console,
         ## in those case we will initiate the segment here manully
-        XRay.recorder.begin_segment('GrpcRequest') if no_segment
+        XRay.recorder.begin_segment('grpc_request') if no_segment
 
-        XRay.recorder.begin_subsegment("GrpcRequest.#{request_context.method}")
+        XRay.recorder.begin_subsegment("grpc_request.#{request_context.method}")
 
         request_context.metadata[:xray_trace_id] = XRay.recorder.current_segment.trace_id
         request_context.metadata[:xray_parent_id] = XRay.recorder.current_segment.id

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

@@ -9,7 +9,8 @@ module Istox
         trace_id = (meta['xray_trace_id'] if meta.present? && meta.key?('xray_trace_id'))
         parent_id = (meta['xray_parent_id'] if meta.present? && meta.key?('xray_parent_id'))
 
-        XRay.recorder.begin_segment("GrpcHandler.#{request.method_key}", trace_id: trace_id, parent_id: parent_id)
+        XRay.recorder.begin_segment("#{::Istox::Xray::XrayInitializer.service_name}.grpc.#{request.method_key}",
+                                    trace_id: trace_id, parent_id: parent_id)
 
         result = yield # this returns the protobuf message
 

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

@@ -10,6 +10,8 @@ module Istox
   module Xray
     class XrayInitializer
       class << self
+        attr_reader :service_name
+
         ## 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)
@@ -23,6 +25,8 @@ module Istox
             context_missing: 'LOG_ERROR'
           }
 
+          @service_name = service_name
+
           if gruf_config.present?
             gruf_config.interceptors.use(::Istox::Xray::GrpcServerXrayInterceptor)
             ::Istox::GrpcClient.add_interceptors(::Istox::Xray::GrpcClientXrayInterceptor.new)

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.152.1.test14'.freeze
+  VERSION = '0.1.152.1.test15'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.152.1.test14
+  version: 0.1.152.1.test15
 platform: ruby
 authors:
 - Siong Leng
@@ -206,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: aws-xray-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bullet
   requirement: !ruby/object:Gem::Requirement