istox 0.1.152.3 → 0.1.153

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ae1c1658b28cacf39ae2e867711f841618737369ec62116f49c3bf443635b06
-  data.tar.gz: 7d120a6c5b570e84f281d82cde6b6e3966ed5cbe80ec7c73bcc73fa491d4cdb7
+  metadata.gz: c276af2b326c38c02ac4ad1de3e348f614e73aaecc3fa165a7e69692336877d0
+  data.tar.gz: b5a763d66966da837df5dbb2c3ca52327125d4b39c9bceb78dda349be6f6a76e
 SHA512:
-  metadata.gz: efc6c53f12a9b790e2645f3d61ef3df973f56290e0332028dd4a9bc0577f254e13b7f69ce5b2e9277e0429204ff342d783e36705aacbb664ade098a169ed81e8
-  data.tar.gz: ea90504c68e7bf96e5b7680f8fc417d6c1474246e5e624bf3f2a1b06ce0d999447ca12cbe80b09b0535bdd80c890875ce07b6093e908e8653ce22024be17b549
+  metadata.gz: f39734e70c7cb2fa068483230c74cedd2c629bb311cada44cc042fb509276cc9d6dee728234f6971cc85d351384c47d35701c84a52a80eb1f2f96bd2a9c6d466
+  data.tar.gz: 0de4256f59e7f8920b79a69d57e42541b911276b78c40b85b0f52e3d1feea5cdc83391d7fb42a6c7e5be3826117e0d050ab00d3ed32e6f565433a6a208ea4638

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.152)
+    istox (0.1.153)
       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-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,14 +110,14 @@ 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-universal-darwin)
     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)
@@ -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,12 +156,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 +199,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 +257,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)
@@ -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.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_consumer_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'

data/lib/istox/helpers/bunny_boot.rb

@@ -5,6 +5,29 @@ require 'istox/helpers/logger'
 module Istox
   class BunnyBoot
     class << self
+      ########################################################
+      ##
+      ##  RABBITMQ interceptors
+      ##
+      ######################################################
+      def add_consumer_interceptor(interceptor)
+        @consumer_interceptors ||= []
+        @consumer_interceptors.push(interceptor)
+      end
+
+      def add_publisher_interceptor(interceptor)
+        @publisher_interceptors ||= []
+        @publisher_interceptors.push(interceptor)
+      end
+
+      def publisher_interceptors
+        @publisher_interceptors || []
+      end
+
+      def consumer_interceptors
+        @consumer_interceptors || []
+      end
+
       # Create physical connection to RabbitMQ
       # During failover of RabbitMQ cluster or temporary failure, there may be error and needs retry in loop
       def connection
@@ -36,16 +59,16 @@ module Istox
       def exchange(eid)
         type = data[:exchanges][eid][:type]
         name = eid
-        settings = { durable: exchange_durable?(eid)  }
+        settings = { durable: exchange_durable?(eid) }
         confirm = data[:exchanges][eid][:confirm] || -1
         [type, name, settings, confirm]
-      rescue
+      rescue StandardError
         nil
       end
 
       def binding_exchange_id(id)
         data[:binding][id][:exchange] || :default
-      rescue
+      rescue StandardError
         nil
       end
 
@@ -56,17 +79,17 @@ module Istox
         else
           data[:queues][queue][:queue_name]
         end
-      rescue
+      rescue StandardError
         nil
       end
 
       def confirm_mode(eid)
         data[:exchanges][eid][:confirm] || -1
-      rescue
+      rescue StandardError
         nil
       end
 
-      def queues_keys_for_subscribe()
+      def queues_keys_for_subscribe
         data['queues'].keys
       end
 
@@ -89,7 +112,7 @@ module Istox
         durable = exchange_config!(exchange_name)['durable']
         durable = true if durable.nil?
         durable
-      rescue => e
+      rescue StandardError => e
         raise e
       end
 
@@ -104,7 +127,7 @@ module Istox
 
       def exchange_name(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['exchange']
-      rescue
+      rescue StandardError
         nil
       end
 
@@ -119,43 +142,43 @@ module Istox
         name = "#{prefix}#{delimiter}#{name}" unless prefix.nil?
         name = "#{name}#{delimiter}#{suffix}" unless suffix.nil?
         name
-      rescue
+      rescue StandardError
         nil
       end
 
       def queue_priority(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['priority']
-      rescue
+      rescue StandardError
         nil
       end
 
       def queue_worker_param(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['worker_param']
-      rescue
+      rescue StandardError
         nil
       end
 
       def queue_worker_param_format(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['worker_param_format'] || 'open_struct'
-      rescue
+      rescue StandardError
         nil
       end
 
       def queue_routing_key(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['routing_key'] || (queue_name consumer_key)
-      rescue
+      rescue StandardError
         nil
       end
 
       def queue_exclusive(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['exclusive'] || false
-      rescue
+      rescue StandardError
         nil
       end
 
       def ruby_class(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['ruby_class']
-      rescue
+      rescue StandardError
         nil
       end
 
@@ -175,7 +198,7 @@ module Istox
         end
 
         durable
-      rescue
+      rescue StandardError
         nil
       end
 
@@ -230,7 +253,7 @@ module Istox
         persistent = e.durable?
         mandatory = false
         # Set Mandatory & Persistent flag for non-DLX and non-manual msg
-        unless ['dlx', 'manual'].include? options[:type]
+        unless %w[dlx manual].include? options[:type]
           if options[:routing_key].present?
             v1 = data['publish'][eid]
             v1 = v1[options[:routing_key]] unless v1.nil?
@@ -240,10 +263,15 @@ module Istox
         end
         options.merge!(persistent: persistent)
         options.merge!(mandatory: mandatory)
-
         # message.merge!(locale: I18n.locale)
-        message = JSON.dump message
 
+        raise 'Rabbitmq publishing message must be a hash' unless message.is_a? Hash
+
+        publisher_interceptors.each do |interceptor|
+          interceptor.call(message, options)
+        end
+
+        message = JSON.dump message
         log.debug "Publish options are: #{options}"
         log.debug "Publish message payload #{message}"
         e.publish(message, options)
@@ -277,7 +305,7 @@ module Istox
         # combination of channel_id:delivery_tag can uniquely identify a msg
         # For each retry of msg, channel_id and delivery_tag is unchanged
         # But each retry, there is new delivery_tag that should be updated
-        id = "#{channel_id.to_s}:#{delivery_tag.to_s}"
+        id = "#{channel_id}:#{delivery_tag}"
 
         ::Istox::RedisBoot.sets("#{id}:payload", JSON.dump(payload), 4)
         ::Istox::RedisBoot.sets("#{id}:eid", eid.to_s, 4)
@@ -285,7 +313,7 @@ module Istox
       end
 
       def find_tracker_on_channel(channel_id, delivery_tag, key)
-        pattern = "#{channel_id.to_s}:#{delivery_tag.to_s}:#{key}"
+        pattern = "#{channel_id}:#{delivery_tag}:#{key}"
         keys = find_trackers pattern
         get_tracker(keys.first)
       end
@@ -307,9 +335,7 @@ module Istox
 
       def eid(ex)
         eid = ex.name
-        if eid.empty?
-          eid = :default
-        end
+        eid = :default if eid.empty?
 
         eid
       end
@@ -327,9 +353,9 @@ module Istox
       def data
         Hashie.logger.level = 'ERROR'
         @data = Hashie::Mash.new(
-            YAML.safe_load(
-                ERB.new(File.read(ENV['AMQP_CONFIG'] || 'config/amqp.yml')).result
-            )
+          YAML.safe_load(
+            ERB.new(File.read(ENV['AMQP_CONFIG'] || 'config/amqp.yml')).result
+          )
         )
       end
 
@@ -356,11 +382,11 @@ module Istox
       def find_trackers(pattern)
         cursor = 0
         all_keys = []
-        loop {
-          cursor, keys = ::Istox::RedisBoot.scan(cursor, {:match => pattern, :count => 500}, 4)
+        loop do
+          cursor, keys = ::Istox::RedisBoot.scan(cursor, { match: pattern, count: 500 }, 4)
           all_keys += keys
-          break if cursor == "0"
-        }
+          break if cursor == '0'
+        end
         all_keys.uniq
       end
 

data/lib/istox/helpers/grpc_client.rb

@@ -9,6 +9,12 @@ module Istox
         @@hosts[host_type] = url
       end
 
+      def add_interceptors(interceptor)
+        @interceptors = [] unless defined?(@interceptors)
+
+        @interceptors.push(interceptor)
+      end
+
       def call(host_type, service, method, grpc_retries_count: 1, **keyword_args)
         execute(host_type, service, method, **keyword_args)
       rescue Gruf::Client::Errors::Unavailable => e
@@ -72,7 +78,7 @@ module Istox
 
         log.info 'Reinitiating to grpc host at ' + host_url
         t1 = Time.now
-        @@services[get_key(host_type, service)] = ::Gruf::Client.new(service: service, options: { hostname: host_url }, client_options: channel_options)
+        @@services[get_key(host_type, service)] = ::Gruf::Client.new(service: service, options: { hostname: host_url }, client_options: client_options)
         log.info "Time taken for reinitiating grpc host: #{Time.now - t1} seconds"
       end
 
@@ -80,8 +86,11 @@ module Istox
         host_type.to_s + service.to_s
       end
 
-      def channel_options
+      def client_options
+        @interceptors = [] unless defined?(@interceptors)
+
         {
+          interceptors: @interceptors,
           channel_args: default_channel_options
         }
       end

data/lib/istox/helpers/publisher.rb

@@ -78,9 +78,6 @@ module Istox
                     @channel[t]['confirm-1'].close
                     @channel[t]['noconfirm'].close
                     @channel.delete t
-
-                    # Remove exchange from @exchange
-                    @exchanges.delete t
                   end
                 end
               end.join
@@ -236,16 +233,7 @@ module Istox
         sleep 1
         do_publish(ex,options,message)
       rescue => e
-        log.debug "Error happens: #{e.message}"
-
-        # If the error indicates that the channel is already closed
-        # then clear hash @channel and @exchange
-        if e.message.include? "cannot use a closed channel"
-          @channel.delete Thread.current.object_id
-          @exchanges.delete Thread.current.object_id
-          ex = exchange(eid)
-          do_publish(ex, options, message)
-        end
+        log.debug "Error happens: #{e}"
       end
     end
   end

data/lib/istox/helpers/remote_model_cache.rb

@@ -15,9 +15,9 @@ module Istox
         log.debug "Writing data to cache, key: #{key}, fields: #{fields.inspect}"
         log.debug "Cache data: #{data.inspect}"
 
-        data = data.to_json unless data.instance_of?(String)
-
         Thread.new do
+          data = data.to_json unless data.instance_of?(String)
+
           results = fields.map do |f|
             redis.hset(key, f.to_s, data)
           end

data/lib/istox/helpers/subscriber.rb

@@ -4,7 +4,6 @@ module Istox
   # Publisher is relying on BunnyBoot to publish message, please make sure BunnyBoot is initalised properly first during runtime.
   class Subscriber
     class << self
-
       # optionally can pass in consumer_key for single subscription / consumer_keys for multiple subcriptions
       # consumer_key must be defined in amqp.yml
       # if nothing pass in it will auto subscribe to all available consumers defined in amqp.yml queues key
@@ -81,22 +80,22 @@ module Istox
         end
 
         if manual_ack
-          if exchange.nil?
-            letter_exchange = active_channel.default_exchange.name
-          else
-            letter_exchange = exchange.name
-          end
+          letter_exchange = if exchange.nil?
+                              active_channel.default_exchange.name
+                            else
+                              exchange.name
+                            end
           retry_queue = active_channel.queue("#{queue_name}.retry", arguments: {
-              'x-dead-letter-exchange': letter_exchange,
-              'x-dead-letter-routing-key': "#{queue_name}",
-              'x-message-ttl': (::Istox::BunnyBoot.queue_retry_gap consumer_key)
-          })
-          unless exchange_name.nil?
+                                               'x-dead-letter-exchange': letter_exchange,
+                                               'x-dead-letter-routing-key': queue_name.to_s,
+                                               'x-message-ttl': (::Istox::BunnyBoot.queue_retry_gap consumer_key)
+                                             })
+          if exchange_name.nil?
+            exchange_retry = active_channel.default_exchange
+          else
             exchange_retry_name = "#{exchange_name}.retry"
             exchange_retry = active_channel.send exchange_type, exchange_retry_name, durable: exchange_durable
             retry_queue.bind exchange_retry, routing_key: "#{queue_name}.retry" if manual_ack
-          else
-            exchange_retry = active_channel.default_exchange
           end
         end
 
@@ -117,14 +116,14 @@ module Istox
         @workers = {} if @workers.nil?
         unless block || @workers[ruby_class]
           klass = Object.const_get(
-              '::' + (ruby_class).camelize
+            '::' + ruby_class.camelize
           )
           param = ::Istox::BunnyBoot.queue_worker_param consumer_key
-          if param.nil?
-            @workers[ruby_class] = klass.new
-          else
-            @workers[ruby_class] = klass.new param
-          end
+          @workers[ruby_class] = if param.nil?
+                                   klass.new
+                                 else
+                                   klass.new param
+                                 end
         end
         # Subscribe queue
         priority = ::Istox::BunnyBoot.queue_priority consumer_key
@@ -150,16 +149,23 @@ module Istox
 
           if process
             processing_payload = JSON.parse(payload)
-            processing_payload = ::Istox::CommonHelper.to_open_struct(processing_payload) if ::Istox::BunnyBoot.queue_worker_param_format(consumer_key) == 'open_struct'
+            if ::Istox::BunnyBoot.queue_worker_param_format(consumer_key) == 'open_struct'
+              processing_payload = ::Istox::CommonHelper.to_open_struct(processing_payload)
+            end
             log.info "Processing in consumer: #{klass}, payload: #{processing_payload.to_h.inspect}"
-            if @workers[ruby_class].nil?
-              result = block.call(processing_payload, metadata, delivery_info) unless block.nil?
-            else
-              result = @workers[ruby_class].process(processing_payload, metadata, delivery_info)
+
+            interceptors = ::Istox::BunnyBoot.consumer_interceptors.dup
+
+            intercept(interceptors, processing_payload, metadata, delivery_info) do
+              if @workers[ruby_class].nil?
+                block&.call(processing_payload, metadata, delivery_info)
+              else
+                @workers[ruby_class].process(processing_payload, metadata, delivery_info)
+              end
             end
           else
             # Instead of cache msg, print log
-            log.fatal "Drop msg at #{Time.now.to_s} for queue #{queue.name}, payload is #{JSON.dump(payload)}" if store
+            log.fatal "Drop msg at #{Time.now} for queue #{queue.name}, payload is #{JSON.dump(payload)}" if store
           end
           # active_channel.ack(delivery_info.delivery_tag) if manual_ack
         rescue StandardError => e
@@ -175,29 +181,44 @@ module Istox
             # here we adopt the unused priority as remaining retry_count
             if process
               processing_payload = JSON.parse(payload)
-              processing_payload = ::Istox::CommonHelper.to_open_struct(processing_payload) if ::Istox::BunnyBoot.queue_worker_param_format(consumer_key) == 'open_struct'
+              if ::Istox::BunnyBoot.queue_worker_param_format(consumer_key) == 'open_struct'
+                processing_payload = ::Istox::CommonHelper.to_open_struct(processing_payload)
+              end
               ::Istox::BunnyBoot.publish(exchange_retry, processing_payload, routing_key: "#{queue_name}.retry", priority: retry_count, type: 'dlx')
             end
           end
-=begin
-          # For redelivered message, call 'reject' not 'nack' in order to reschedule message to tail not head of queue
-          if delivery_info.redelivered
-            active_channel.reject(delivery_info.delivery_tag, true)
-          else
-            active_channel.nack(delivery_info.delivery_tag, false, true)
-          end
-=end
+        #           # For redelivered message, call 'reject' not 'nack' in order to reschedule message to tail not head of queue
+        #           if delivery_info.redelivered
+        #             active_channel.reject(delivery_info.delivery_tag, true)
+        #           else
+        #             active_channel.nack(delivery_info.delivery_tag, false, true)
+        #           end
         ensure
           if manual_ack
-            if !multiple.nil? && !result && result == multiple
-              multiple = true
-            else
-              multiple = false
-            end
+            multiple = if !multiple.nil? && !result && result == multiple
+                         true
+                       else
+                         false
+                       end
             active_channel.ack(delivery_info.delivery_tag, multiple)
           end
         end
       end
+
+      def intercept(interceptors, payload, metadata, delivery_info)
+        return yield if interceptors.none?
+
+        i = interceptors.pop
+        return yield unless i
+
+        i.call(payload, metadata, delivery_info) do
+          if interceptors.any?
+            intercept(interceptors, payload, metadata, delivery_info) { yield }
+          else
+            yield
+          end
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,40 @@
+require 'istox/helpers/logger'
+require 'aws-xray-sdk'
+
+module Istox
+  module Xray
+    class GrpcClientXrayInterceptor < ::Gruf::Interceptors::ClientInterceptor
+      def call(request_context:)
+        no_segment = false
+
+        begin
+          no_segment = XRay.recorder.current_segment.blank?
+        rescue XRay::ContextMissingError
+          no_segment = true
+        end
+
+        ## usually we have active segment for client interceptor
+        ## 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('grpc_request') if no_segment
+
+        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
+
+        result = yield
+
+        XRay.recorder.end_subsegment
+
+        XRay.recorder.end_segment if no_segment
+
+        result
+      rescue StandardError => e
+        log.error e
+        raise e
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+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'))
+        parent_id = (meta['xray_parent_id'] if meta.present? && meta.key?('xray_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
+
+        XRay.recorder.end_segment
+
+        result
+      rescue StandardError => e
+        log.error e
+        raise e
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+require 'istox/helpers/logger'
+require 'aws-xray-sdk'
+
+module Istox
+  module Xray
+    class RabbitmqConsumerInterceptor
+      def call(payload, _metadata, delivery_info)
+        payload_hash = payload.to_h
+
+        trace_id = (payload_hash[:xray_trace_id] if payload_hash.key?(:xray_trace_id))
+        parent_id = (payload_hash[:xray_parent_id] if payload_hash.key?(:xray_parent_id))
+
+        arr = [delivery_info[:exchange]&.downcase, delivery_info[:routing_key]&.downcase, payload_hash[:type]&.downcase].compact
+
+        XRay.recorder.begin_segment("#{::Istox::Xray::XrayInitializer.service_name}.rabbitmq.#{arr.join('.')}",
+                                    trace_id: trace_id, parent_id: parent_id)
+
+        result = yield # this returns consumer handler message
+
+        XRay.recorder.end_segment
+
+        result
+      rescue StandardError => e
+        log.error e
+        raise e
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'istox/helpers/logger'
+require 'aws-xray-sdk'
+
+module Istox
+  module Xray
+    class RabbitmqPublisherInterceptor
+      def call(message, options)
+        no_segment = false
+
+        begin
+          no_segment = XRay.recorder.current_segment.blank?
+        rescue XRay::ContextMissingError
+          no_segment = true
+        end
+
+        ## usually we have active segment for client interceptor
+        ## 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('rabbitmq_publish') if no_segment
+
+        XRay.recorder.begin_subsegment("rabbitmq_publish.#{options[:routing_key]}")
+
+        message[:xray_trace_id] = XRay.recorder.current_segment.trace_id
+        message[:xray_parent_id] = XRay.recorder.current_segment.id
+
+        XRay.recorder.end_subsegment
+
+        XRay.recorder.end_segment if no_segment
+      rescue StandardError => e
+        log.error e
+        raise e
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+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_consumer_interceptor'
+require 'istox/helpers/logger'
+require 'aws-xray-sdk'
+
+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)
+          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,
+            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)
+          end
+
+          return unless enable_rabbitmq_trace == true
+
+          ::Istox::BunnyBoot.add_publisher_interceptor(::Istox::Xray::RabbitmqPublisherInterceptor.new)
+          ::Istox::BunnyBoot.add_consumer_interceptor(::Istox::Xray::RabbitmqConsumerInterceptor.new)
+        end
+      end
+    end
+  end
+end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.152.3'.freeze
+  VERSION = '0.1.153'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.152.3
+  version: 0.1.153
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-07 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -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
@@ -427,7 +441,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- bulk-update-version.py
 - istox.gemspec
 - lib/istox.rb
 - lib/istox/constants/error.rb
@@ -453,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_consumer_interceptor.rb
+- lib/istox/helpers/xray/rabbitmq_publisher_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

data/bulk-update-version.py

@@ -1,93 +0,0 @@
-import sys
-import re
-from tempfile import mkstemp
-from shutil import move, copymode
-from os import fdopen, remove
-import os
-
-# HOW TO RUN: python bulk-update-version.py <version updating to, eg. 0.1.150.2>
-
-SERVICES = ["client-api", "admin-api", "message-api", "auth", "admin-auth"]
-
-
-def replace(file_path, pattern, subst):
-    # Create temp file
-    fh, abs_path = mkstemp()
-    with fdopen(fh, 'w') as new_file:
-        dirname = os.path.dirname(__file__)
-        file_path = os.path.join(dirname, file_path)
-        if os.path.exists(file_path) == False:
-            return
-        with open(file_path) as old_file:
-            for line in old_file:
-                new_file.write(re.sub(pattern, subst, line))
-    # Copy the file permissions from the old file to the new file
-    copymode(file_path, abs_path)
-    # Remove original file
-    remove(file_path)
-    # Move new file
-    move(abs_path, file_path)
-
-
-def push_service(file_path, version, hotfix):
-    dirname = os.path.dirname(__file__)
-    file_path = os.path.join(dirname, file_path)
-
-    if os.path.exists(file_path) == False:
-        return
-
-    if hotfix == True:
-        branch_name = "hotfix"
-    else:
-        branch_name = "FIX/update-istox-gem-" + version
-
-    os.chdir(file_path)
-    os.system(
-        "git branch -D %s &>/dev/null" % (branch_name))
-    os.system("echo 'Deleted local branch'")
-    os.system(
-        "git push origin --delete %s &>/dev/null" % (branch_name))
-    os.system("echo 'Deleted remote branch'")
-    os.system("git fetch -a")
-    os.system("git checkout -b %s" % (branch_name))
-    os.system("git add Gemfile")
-    os.system("git commit -m 'Update istox-gem version to %s'" % (version))
-    os.system("git push --set-upstream origin %s" % (branch_name))
-#     os.system("cd " + file_path + " && git branch -D " +
-#               branch_name + " &>/dev/null || echo 'Deleted local branch' || git push origin --delete hotfix &>/dev/null || echo 'Deleted remote branch' || git fetch -a || git checkout -b " +
-#               branch_name + " && git add Gemfile && git commit -m 'Update istox-gem version to "
-#               + version + "' && git push --set-upstream origin " + branch_name)
-
-
-arguments = sys.argv
-arguments.pop(0)
-
-new_version = arguments[0]
-
-hotfix = False
-
-while True:
-    result = raw_input("Is this a hotix? Y/N \n")
-
-    if result.lower() == 'y':
-        hotfix = True
-        break
-    elif result.lower() == 'n':
-        hotfix = False
-        break
-    else:
-        print("Please input only Y or N.")
-
-
-print("Updating services " + str(SERVICES) +
-      " to istox-gem version " + new_version)
-
-for service in SERVICES:
-    replace("../" + service + "/Gemfile", r"gem 'istox'.+",
-            "gem 'istox', '" + new_version + "'")
-
-for service in SERVICES:
-    push_service("../" + service, new_version, hotfix)
-
-print("Services " + str(SERVICES) +
-      " has been updated to istox-gem version " + new_version)