istox 0.1.152.1.test19 → 0.1.152.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3121f203e888fefa923c473d95a6b438cf723029e96028affe70afd1f57050d
-  data.tar.gz: 4a731badab936778cf93de2e8fd6c61c8e7174046e69b9d71182170bf32b59ab
+  metadata.gz: 747b9e284b653c5ec060ef2f97cd7cd868f2561334557eff4d847f669f1f8851
+  data.tar.gz: f3475aed8b8f13c8b06572d67b2914f7828fde78cf58240981bb88e3cee8d623
 SHA512:
-  metadata.gz: 66e67233af87d3e4af062137bc15cc34b330968a8e30382c95a36652ee0506681eb492594226aacf893ab56ad4dcece1bb4546fc2686d7fdf50547c611811202
-  data.tar.gz: 1fdd91108a7df9a83e1a5007b045ebd0d4bd196fdb4f109edb3812a688dbd48b51d369939899cd4a0fd164bcdfd7e586e58597d7ecc67eb6a446389b8c9e3158
+  metadata.gz: a75a9a8ad205ae3c8f9e6ecbbeff41acc8cbcde4bbbf8fde457c8eb2139993240964e06c94d756444e4398758c750d9ee4ade74138d66b44d4567724cbc17590
+  data.tar.gz: 19cfccb0159c8587c49ee8158e965142b48ce7ae94fcdf970dc811d0a7a4d088cb969d3b896d5f54b0cdb1035d854cfd28a0df3a9356b5ba7207824a69976187

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.152.1.test14)
+    istox (0.1.152)
       awesome_print
       binding_of_caller
       bunny (>= 2.12.0)
@@ -65,20 +65,8 @@ 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-sigv4 (1.1.1)
       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)
@@ -110,18 +98,18 @@ GEM
     ffi (1.12.2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.12.1)
+    google-protobuf (3.11.4-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.10)
+    graphql (1.10.6)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.28.0)
+    grpc (1.28.0-universal-darwin)
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.28.0)
@@ -140,7 +128,6 @@ 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)
@@ -156,13 +143,12 @@ 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.5)
+    ougai (1.8.3)
       oj (~> 3.10)
     paranoia (2.4.2)
       activerecord (>= 4.0, < 6.1)
@@ -199,7 +185,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rake (10.5.0)
-    rb-fsevent (0.10.4)
+    rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redis (4.1.3)
@@ -257,7 +243,7 @@ GEM
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uniform_notifier (1.11.0)
-    vault (0.13.2)
+    vault (0.13.0)
       aws-sigv4
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
@@ -267,7 +253,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  aws-xray-sdk
   bullet (~> 5.7.5)
   bundler (~> 1.16)
   database_cleaner (~> 1.6.0)

data/istox.gemspec

@@ -44,7 +44,6 @@ 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,13 +35,6 @@ 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,29 +5,6 @@ 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
@@ -59,16 +36,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 StandardError
+      rescue
         nil
       end
 
       def binding_exchange_id(id)
         data[:binding][id][:exchange] || :default
-      rescue StandardError
+      rescue
         nil
       end
 
@@ -79,17 +56,17 @@ module Istox
         else
           data[:queues][queue][:queue_name]
         end
-      rescue StandardError
+      rescue
         nil
       end
 
       def confirm_mode(eid)
         data[:exchanges][eid][:confirm] || -1
-      rescue StandardError
+      rescue
         nil
       end
 
-      def queues_keys_for_subscribe
+      def queues_keys_for_subscribe()
         data['queues'].keys
       end
 
@@ -112,7 +89,7 @@ module Istox
         durable = exchange_config!(exchange_name)['durable']
         durable = true if durable.nil?
         durable
-      rescue StandardError => e
+      rescue => e
         raise e
       end
 
@@ -127,7 +104,7 @@ module Istox
 
       def exchange_name(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['exchange']
-      rescue StandardError
+      rescue
         nil
       end
 
@@ -142,43 +119,43 @@ module Istox
         name = "#{prefix}#{delimiter}#{name}" unless prefix.nil?
         name = "#{name}#{delimiter}#{suffix}" unless suffix.nil?
         name
-      rescue StandardError
+      rescue
         nil
       end
 
       def queue_priority(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['priority']
-      rescue StandardError
+      rescue
         nil
       end
 
       def queue_worker_param(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['worker_param']
-      rescue StandardError
+      rescue
         nil
       end
 
       def queue_worker_param_format(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['worker_param_format'] || 'open_struct'
-      rescue StandardError
+      rescue
         nil
       end
 
       def queue_routing_key(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['routing_key'] || (queue_name consumer_key)
-      rescue StandardError
+      rescue
         nil
       end
 
       def queue_exclusive(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['exclusive'] || false
-      rescue StandardError
+      rescue
         nil
       end
 
       def ruby_class(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['ruby_class']
-      rescue StandardError
+      rescue
         nil
       end
 
@@ -198,7 +175,7 @@ module Istox
         end
 
         durable
-      rescue StandardError
+      rescue
         nil
       end
 
@@ -253,7 +230,7 @@ module Istox
         persistent = e.durable?
         mandatory = false
         # Set Mandatory & Persistent flag for non-DLX and non-manual msg
-        unless %w[dlx manual].include? options[:type]
+        unless ['dlx', 'manual'].include? options[:type]
           if options[:routing_key].present?
             v1 = data['publish'][eid]
             v1 = v1[options[:routing_key]] unless v1.nil?
@@ -263,15 +240,10 @@ module Istox
         end
         options.merge!(persistent: persistent)
         options.merge!(mandatory: mandatory)
-        # message.merge!(locale: I18n.locale)
-
-        raise 'Rabbitmq publishing message must be a hash' unless message.is_a? Hash
-
-        publisher_interceptors.each do |interceptor|
-          interceptor.call(message, options)
-        end
 
+        # message.merge!(locale: I18n.locale)
         message = JSON.dump message
+
         log.debug "Publish options are: #{options}"
         log.debug "Publish message payload #{message}"
         e.publish(message, options)
@@ -305,7 +277,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}:#{delivery_tag}"
+        id = "#{channel_id.to_s}:#{delivery_tag.to_s}"
 
         ::Istox::RedisBoot.sets("#{id}:payload", JSON.dump(payload), 4)
         ::Istox::RedisBoot.sets("#{id}:eid", eid.to_s, 4)
@@ -313,7 +285,7 @@ module Istox
       end
 
       def find_tracker_on_channel(channel_id, delivery_tag, key)
-        pattern = "#{channel_id}:#{delivery_tag}:#{key}"
+        pattern = "#{channel_id.to_s}:#{delivery_tag.to_s}:#{key}"
         keys = find_trackers pattern
         get_tracker(keys.first)
       end
@@ -335,7 +307,9 @@ module Istox
 
       def eid(ex)
         eid = ex.name
-        eid = :default if eid.empty?
+        if eid.empty?
+          eid = :default
+        end
 
         eid
       end
@@ -353,9 +327,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
 
@@ -382,11 +356,11 @@ module Istox
       def find_trackers(pattern)
         cursor = 0
         all_keys = []
-        loop do
-          cursor, keys = ::Istox::RedisBoot.scan(cursor, { match: pattern, count: 500 }, 4)
+        loop {
+          cursor, keys = ::Istox::RedisBoot.scan(cursor, {:match => pattern, :count => 500}, 4)
           all_keys += keys
-          break if cursor == '0'
-        end
+          break if cursor == "0"
+        }
         all_keys.uniq
       end
 

data/lib/istox/helpers/grpc_client.rb

@@ -9,12 +9,6 @@ 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
@@ -78,7 +72,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: client_options)
+        @@services[get_key(host_type, service)] = ::Gruf::Client.new(service: service, options: { hostname: host_url }, client_options: channel_options)
         log.info "Time taken for reinitiating grpc host: #{Time.now - t1} seconds"
       end
 
@@ -86,11 +80,8 @@ module Istox
         host_type.to_s + service.to_s
       end
 
-      def client_options
-        @interceptors = [] unless defined?(@interceptors)
-
+      def channel_options
         {
-          interceptors: @interceptors,
           channel_args: default_channel_options
         }
       end

data/lib/istox/helpers/subscriber.rb

@@ -4,6 +4,7 @@ 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
@@ -80,22 +81,22 @@ module Istox
         end
 
         if manual_ack
-          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.to_s,
-                                               'x-message-ttl': (::Istox::BunnyBoot.queue_retry_gap consumer_key)
-                                             })
-          if exchange_name.nil?
-            exchange_retry = active_channel.default_exchange
+          if exchange.nil?
+            letter_exchange = active_channel.default_exchange.name
           else
+            letter_exchange = 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?
             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
 
@@ -116,14 +117,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
-          @workers[ruby_class] = if param.nil?
-                                   klass.new
-                                 else
-                                   klass.new param
-                                 end
+          if param.nil?
+            @workers[ruby_class] = klass.new
+          else
+            @workers[ruby_class] = klass.new param
+          end
         end
         # Subscribe queue
         priority = ::Istox::BunnyBoot.queue_priority consumer_key
@@ -149,23 +150,16 @@ module Istox
 
           if process
             processing_payload = JSON.parse(payload)
-            if ::Istox::BunnyBoot.queue_worker_param_format(consumer_key) == 'open_struct'
-              processing_payload = ::Istox::CommonHelper.to_open_struct(processing_payload)
-            end
+            processing_payload = ::Istox::CommonHelper.to_open_struct(processing_payload) if ::Istox::BunnyBoot.queue_worker_param_format(consumer_key) == 'open_struct'
             log.info "Processing in consumer: #{klass}, payload: #{processing_payload.to_h.inspect}"
-
-            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
+            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)
             end
           else
             # Instead of cache msg, print log
-            log.fatal "Drop msg at #{Time.now} for queue #{queue.name}, payload is #{JSON.dump(payload)}" if store
+            log.fatal "Drop msg at #{Time.now.to_s} 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
@@ -181,44 +175,29 @@ module Istox
             # here we adopt the unused priority as remaining retry_count
             if process
               processing_payload = JSON.parse(payload)
-              if ::Istox::BunnyBoot.queue_worker_param_format(consumer_key) == 'open_struct'
-                processing_payload = ::Istox::CommonHelper.to_open_struct(processing_payload)
-              end
+              processing_payload = ::Istox::CommonHelper.to_open_struct(processing_payload) if ::Istox::BunnyBoot.queue_worker_param_format(consumer_key) == 'open_struct'
               ::Istox::BunnyBoot.publish(exchange_retry, processing_payload, routing_key: "#{queue_name}.retry", priority: retry_count, type: 'dlx')
             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
+=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
         ensure
           if manual_ack
-            multiple = if !multiple.nil? && !result && result == multiple
-                         true
-                       else
-                         false
-                       end
+            if !multiple.nil? && !result && result == multiple
+              multiple = true
+            else
+              multiple = 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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.152.1.test19
+  version: 0.1.152.1
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-22 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -206,20 +206,6 @@ 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
@@ -466,11 +452,6 @@ 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
@@ -490,9 +471,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.6
 signing_key: 

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

@@ -1,40 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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

@@ -1,29 +0,0 @@
-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], delivery_info[:routing_key], payload_hash[:type]].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

@@ -1,36 +0,0 @@
-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

@@ -1,43 +0,0 @@
-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