stackify-ruby-apm 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e69ba17aa5e795974868a28d69a053d1e40a1991a9894d7b76e38fc147cdbc15
-  data.tar.gz: d556ea3ecff8621cb3024f33a82d396fa74a5582a5d86f34077cda9cf79ca60b
+  metadata.gz: 37b3e9d03e3a48f658ac93e0c7fb2bde7ff1bbe4b477d8db6307288182da1218
+  data.tar.gz: d85d9a3ebefa5f9fa86b232887087634c7fa3a464b8a430da6f43ec1e2a76973
 SHA512:
-  metadata.gz: ab0cc4910e4b1004e7d78074df65000a6d3c23d47f4b1cab36a5613418e9a4752c216bd0c1cfd2b476be6716eb877a36a1e3dc0e66b85d480f0f10f27994ab35
-  data.tar.gz: 199c9b05f7d9abbbddf4dce9aefd25b58edb61ee4aee28cd43ad88b225b5edc6b4e129f97dff2c7bfb3300b0bdb8330b1e3dd2202c611d49ef6d405f2693d7b7
+  metadata.gz: 6d7ad0838dc3db4eedb0f1dd9dfdc7ad7987952fcbdb8a5b1e852ecd2451b4193cf6f7e3df70046db7b9766834a23313e059bb5ea9752b965bba79c5332330d0
+  data.tar.gz: e5bddb17c802ee238fb73ad50b4208ff91b5072b6057726977478d61189cab9812eaef7df8153688722118fb7fbd5e69869c963d35c17a4084a33e1f16e7420b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stackify-ruby-apm (1.3.0)
+    stackify-ruby-apm (1.3.1)
       concurrent-ruby (~> 1.0)
       delegate_matcher (~> 0.4)
       rufus-scheduler (~> 3.5)
@@ -60,7 +60,7 @@ GEM
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    et-orbi (1.2.1)
+    et-orbi (1.2.0)
       tzinfo
     fakeredis (0.7.0)
       redis (>= 3.2, < 5.0)
@@ -68,7 +68,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     file-tail (1.2.0)
       tins (~> 1.0)
-    fugit (1.2.1)
+    fugit (1.2.0)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
     globalid (0.4.2)
@@ -98,12 +98,16 @@ GEM
       bson (>= 4.4.2, < 5.0.0)
     multipart-post (2.0.0)
     mysql2 (0.5.2)
+    mysql2 (0.5.2-x64-mingw32)
     nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
+    nokogiri (1.6.8.1-x64-mingw32)
+      mini_portile2 (~> 2.1.0)
     parallel (1.13.0)
     parser (2.6.0.0)
       ast (~> 2.4.0)
     pg (0.21.0)
+    pg (0.21.0-x64-mingw32)
     powerpack (0.1.2)
     proc_extensions (0.2)
       sourcify (~> 0.5)
@@ -193,6 +197,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
+    sqlite3 (1.3.13-x64-mingw32)
     stackify-api-ruby (1.0.13)
       faraday (~> 0.8)
     thor (0.20.3)
@@ -206,6 +211,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
+    unf_ext (0.0.7.5-x64-mingw32)
     unicode-display_width (1.5.0)
     webmock (3.5.1)
       addressable (>= 2.3.6)
@@ -214,6 +220,7 @@ GEM
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   activerecord

data/lib/stackify_apm/agent.rb

@@ -33,10 +33,11 @@ module StackifyRubyAPM
       pid = $PID || Process.pid
       host_name = config.hostname || `hostname`
       date_now = Time.now
-      current_trace_file = config.log_trace_path + squish(host_name) + '#' + squish(pid.to_s) + '.log'
+      current_trace_file = config.log_trace_path + squish(host_name) + '#' + squish(pid.to_s)
 
       if ENV['STACKIFY_RUBY_ENV'] != 'rspec'
         config.tracer_logger = StackifyLogger.new(current_trace_file, config.filenum_rotate, config.logger_byte_size)
+        config.debug_logger
         config.logtime_created = date_now.strftime('%H:%M')
         Util::TraceLogWatcher.delete_trace_logs(config)
       end
@@ -102,7 +103,7 @@ module StackifyRubyAPM
         require "stackify_apm/spies/#{lib}"
       end
 
-      debug '[Agent] Loaded spies:' + spies_name
+      debug '[Agent] Loaded spies: ' + spies_name if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
       self
     end
 
@@ -177,17 +178,17 @@ module StackifyRubyAPM
     # This method will strip and remove garbage character and multiple spaces.
 
     def self.squish(str)
-      str = str.gsub(/\A[[:space:]]+/, '')
-      str = str.gsub(/[[:space:]]+\z/, '')
-      str = str.gsub(/[[:space:]]+/, ' ')
-      str = str.strip.gsub(/\s+/, '')
+      str = str.sub(/\A[[:space:]]+/, '')
+      str = str.sub(/[[:space:]]+\z/, '')
+      str = str.sub(/[[:space:]]+/, ' ')
+      str = str.strip.sub(/\s+/, '')
       str
     end
 
     private
 
     def boot_worker
-      debug '[Agent] Booting worker'
+      debug '[Agent] Booting worker' if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
 
       @worker_thread = Thread.new do
         Worker.new(

data/lib/stackify_apm/config.rb

@@ -21,9 +21,9 @@ module StackifyRubyAPM
       rum_auto_injection: false,
       instrument: true,
       debug_logging: false,
-      log_path: '/usr/local/stackify/stackify-ruby-apm/log/stackify-ruby-apm.log',
+      log_path: StackifyRubyAPM::Util.host_os == 'WINDOWS' ? 'C:\ProgramData\Stackify\Ruby\log\stackify-ruby-apm-1.log' : '/usr/local/stackify/stackify-ruby-apm/log/stackify-ruby-apm-1.log',
       log_level: Logger::INFO,
-      log_trace_path: '/usr/local/stackify/stackify-ruby-apm/log/',
+      log_trace_path: StackifyRubyAPM::Util.host_os == 'WINDOWS' ? 'C:\ProgramData\Stackify\Ruby\log\\' : '/usr/local/stackify/stackify-ruby-apm/log/',
 
       max_queue_size: 500, # Maximum queue length of transactions before sending transactions to the APM.
       flush_interval: 1, # interval with which transactions should be sent to the APM. Default value: 10 seconds
@@ -83,9 +83,8 @@ module StackifyRubyAPM
       set_from_env
 
       yield self if block_given?
-
-      build_logger if logger.nil? || log_path
-      load_stackify_props
+      build_logger if ENV['STACKIFY_RUBY_ENV'] == 'rspec'
+      StackifyRubyAPM::Util.host_os == 'WINDOWS' ? load_stackify_props_windows : load_stackify_props
     end
 
     attr_accessor :config_file
@@ -202,6 +201,13 @@ module StackifyRubyAPM
       new_available_spies - disabled_spies
     end
 
+    def debug_logger
+      debuger_logpath = log_path == '-' ? $stdout : log_path
+      logger = StackifyLogger.new(debuger_logpath, debugger_filenum_rotate, debugger_byte_size)
+      logger.level = log_level
+      self.logger = logger
+    end
+
     private
 
     def assign(options)
@@ -274,26 +280,55 @@ module StackifyRubyAPM
       @device_id = nil
       @client_run_domain = nil
       begin
-        info 'Reading the stackify.properties file'
+        info '[Config] Reading the stackify.properties file'
         IO.foreach(@stackify_properties_file) do |line|
           case line.downcase
           when /clientid=\d+/
-            @client_id = line.split('=')[1].strip
+            cid = line.split('=')[1].strip
+            @client_id = "C#{cid}"
           when /deviceid=\d+/
-            @device_id = line.split('=')[1].strip
+            devid = line.split('=')[1].strip
+            @device_id = "CD#{devid}"
           when /clientrumdomain=([\w\s\d\"\']+)+/i
             @client_run_domain = line.split('=')[1].strip
           end
         end
-        info "stackify.properties: clientId=#{@client_id}, deviceId=#{@device_id}, client_rum_domain=#{@client_run_domain}"
+        info "[Config] stackify.properties: clientId=#{@client_id}, deviceId=#{@device_id}, client_rum_domain=#{@client_run_domain}"
+      rescue StandardError => e
+        info '[Config] Error occured while reading the stackify.properties file.'
+        info e.inspect
+      end
+      info '[Config] No clientId found from stackify.properties file.' if @client_id.nil?
+      info '[Config] No deviceId found from stackify.properties file.' if @device_id.nil?
+      info '[Config] No client RUM domain found from stackify.properties file.' if @client_run_domain.nil?
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
+    def load_stackify_props_windows
+      require 'win32ole'
+      @client_id = nil
+      @device_id = nil
+      @client_run_domain = nil
+      begin
+        info 'Reading the Stackify props in Environment variables'
+        @client_run_domain = ENV['STACKIFY_RUM_DOMAIN'] || nil
+        if ENV['STACKIFY_ENV']
+          props = ENV['STACKIFY_ENV'].split('|')
+          @client_id = props[0].to_s if props[0]
+          @device_id = props[1].to_s if props[1]
+          info "stackify.properties: clientId=#{@client_id}, deviceId=#{@device_id}, client_rum_domain=#{@client_run_domain}"
+        end
       rescue StandardError => e
-        info 'Error occured while reading the stackify.properties file.'
+        info 'Error occured while reading the Stackify props in Environment variables.'
         info e.inspect
       end
-      info 'No clientId found from stackify.properties file.' if @client_id.nil?
-      info 'No deviceId found from stackify.properties file.' if @device_id.nil?
-      info 'No client RUM domain found from stackify.properties file.' if @client_run_domain.nil?
+      info 'No clientId found in environment variables.' if @client_id.nil?
+      info 'No deviceId found in environment variables.' if @device_id.nil?
+      info 'No client RUM domain found in environment variables.' if @client_run_domain.nil?
     end
     # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
   end
 end

data/lib/stackify_apm/context/response.rb

@@ -26,7 +26,7 @@ module StackifyRubyAPM
         transaction_id = StackifyRubyAPM.agent.current_transaction.id
         client_id = StackifyRubyAPM.agent.config.client_id
         device_id = StackifyRubyAPM.agent.config.device_id
-        headers['X-StackifyID'] = "V1|#{transaction_id}|C#{client_id}|CD#{device_id}" if client_id && device_id
+        headers['X-StackifyID'] = "V1|#{transaction_id}|#{client_id}|#{device_id}" if client_id && device_id
       end
     end
   end

data/lib/stackify_apm/context_builder.rb

@@ -24,11 +24,8 @@ module StackifyRubyAPM
       req = rails_req?(rack_env) ? rack_env : Rack::Request.new(rack_env)
       context.request = Context::Request.new unless context.request
       request = context.request
-      request.socket = Context::Request::Socket.new(req).to_h
-      request.http_version = build_http_version rack_env
       request.method = req.request_method
       request.url = Context::Request::Url.new(req).to_h
-      request.headers, request.env = get_headers_and_env(rack_env)
       request.body = get_body(req)
 
       context
@@ -46,31 +43,5 @@ module StackifyRubyAPM
       defined?(ActionDispatch::Request) &&
         env.is_a?(ActionDispatch::Request)
     end
-
-    def get_headers_and_env(rack_env)
-      # In Rails < 5 ActionDispatch::Request inherits from Hash
-      headers =
-        rack_env.respond_to?(:headers) ? rack_env.headers : rack_env
-
-      headers.each_with_object([{}, {}]) do |(key, value), (http, env)|
-        next unless key == key.upcase
-
-        if key.start_with?('HTTP_')
-          http[camel_key(key)] = value
-        else
-          env[key] = value
-        end
-      end
-    end
-
-    def camel_key(key)
-      key.gsub(/^HTTP_/, '').split('_').map(&:capitalize).join('-')
-    end
-
-    def build_http_version(rack_env)
-      return unless (http_version = rack_env['HTTP_VERSION'])
-
-      http_version.gsub(%r{HTTP/}, '')
-    end
   end
 end

data/lib/stackify_apm/instrumenter.rb

@@ -27,7 +27,7 @@ module StackifyRubyAPM
     end
 
     def initialize(agent)
-      debug '[Instrumenter] initialize()'
+      debug '[Instrumenter] initialize()' if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
       @agent = agent
       @config = agent.config
 
@@ -57,7 +57,6 @@ module StackifyRubyAPM
     # Creates a new transaction or return the currently running
     #
     def transaction(*args)
-      debug '[Instrumenter] transaction(*args)'
       unless config.instrument
         yield if block_given?
         return
@@ -96,8 +95,8 @@ module StackifyRubyAPM
     # Once the transaction is submitted it will be stored temporarily in queue
     #
     def submit_transaction(transaction)
-      debug '[Instrumenter] submit_transaction(transaction):'
-      debug transaction.inspect
+      debug '[Instrumenter] submit_transaction(transaction)' if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
+      debug '[Instrumenter] submit_transaction(transaction) transaction: ' + transaction.inspect.to_s if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
       agent.enqueue_transaction transaction
       return unless config.debug_transactions
     end

data/lib/stackify_apm/logger/log_device.rb

@@ -33,9 +33,9 @@ module StackifyRubyAPM
     # Newly created file example <file>-2.log is the latest appended log
     def shift_log_age
       # set a temporary filename that doesn't have the increment prefix and .log format.
-      temp_filename = @filename.gsub(/\-(d*\.?\d*).log/, '')
+      temp_filename = @filename.to_s.sub(/\-(d*\.?\d*).log/, '')
       # set a temporary file increment while stripping the current filename and retain the number
-      txttemp_fileincrement = @filename.gsub(temp_filename, '').delete('^0-9')
+      txttemp_fileincrement = @filename.to_s.sub(temp_filename, '').delete('^0-9')
       # convert the string value to integer
       current_fileprefix = txttemp_fileincrement.to_i
       # assign as filename counter

data/lib/stackify_apm/logger/logger_high_version.rb

@@ -12,23 +12,25 @@ module StackifyRubyAPM
     # rubocop:disable Style/GuardClause
     # rubocop:disable Metrics/ParameterLists
     # rubocop:disable Lint/UnusedMethodArgument
-    def initialize(logdev, shift_age = 0, shift_size = 1048576, level: DEBUG,
-                   progname: nil, formatter: nil, datetime_format: nil,
+    def initialize(logdev,
+                   shift_age = 0,
+                   shift_size = 1048576,
+                   level: DEBUG,
+                   progname: nil,
+                   formatter: nil,
+                   datetime_format: nil,
                    shift_period_suffix: '%Y%m%d')
       super(nil) # this prevents it from initializing a LogDevice
       @logdev = nil
       if logdev
         new_logdev = logdev
         if logdev.instance_of? String
-          temp_filename = logdev.gsub('.log', '')
+          temp_filename = logdev.gsub('-1.log', '')
           new_logdev = temp_filename + '-1.log'
         end
-        @logdev = LogDevice.new(new_logdev, shift_age: shift_age,
-                                            shift_size: shift_size,
-                                            shift_period_suffix: shift_period_suffix)
+        @logdev = LogDevice.new(new_logdev, shift_size: shift_size)
       end
     end
-
     require 'stackify_apm/logger/log_device'
   end
 end

data/lib/stackify_apm/logger/logger_lower_version.rb

@@ -10,17 +10,16 @@ module StackifyRubyAPM
   class StackifyLogger < Logger
     # rubocop:disable Style/NumericLiterals
     # rubocop:disable Style/GuardClause
-    def initialize(logdev, shift_age = 0, shift_size = 1048576)
+    def initialize(logdev, _shift_age = 0, shift_size = 1048576)
       super(nil) # this prevents it from initializing a LogDevice
       @logdev = nil
       if logdev
         new_logdev = logdev
         if logdev.instance_of? String
-          temp_filename = logdev.gsub('.log', '')
+          temp_filename = logdev.gsub('-1.log', '')
           new_logdev = temp_filename + '-1.log'
         end
-        @logdev = LogDevice.new(new_logdev, shift_age: shift_age,
-                                            shift_size: shift_size)
+        @logdev = LogDevice.new(new_logdev, shift_size: shift_size)
       end
     end
 

data/lib/stackify_apm/normalizers.rb

@@ -47,7 +47,10 @@ module StackifyRubyAPM # :nodoc:
       end
 
       def for(name)
-        @normalizers.fetch(name, @default)
+        # Performance suggestion by fasterer
+        # Hash#fetch with second argument is slower than Hash#fetch with block.
+        # @normalizers.fetch(name, @default)
+        @normalizers.fetch(name) { @default }
       end
 
       def keys

data/lib/stackify_apm/normalizers/active_record.rb

@@ -28,8 +28,6 @@ module StackifyRubyAPM
         private
 
         def query_variables(payload)
-          debug '[SqlNormalizer] query_variables payload:'
-          debug payload.inspect
           {
             CATEGORY: 'Database',
             SUBCATEGORY: 'Execute',
@@ -42,7 +40,8 @@ module StackifyRubyAPM
 
         def lookup_adapter
           ::ActiveRecord::Base.connection.adapter_name.downcase
-        rescue StandardError
+        rescue StandardError => error
+          debug '[SqlNormalizer] lookup_adapter err: ' + error.inspect.to_s
           nil
         end
       end

data/lib/stackify_apm/response_manipulator.rb

@@ -67,10 +67,12 @@ module StackifyRubyAPM
       client_rundomain = @config.client_run_domain
       inject_flag = false
 
-      if client_rundomain != '' && StackifyRubyAPM.check_isdomain(client_rundomain) && client_id && device_id
-        inject_flag = true
-      else
-        warn 'ClientRumDomain might be empty or Invalid URL stackify.properties.'
+      if client_id && device_id
+        if StackifyRubyAPM.check_isdomain(client_rundomain)
+          inject_flag = true
+        else
+          info 'Error: Stackify Client RUM Domain is invalid.'
+        end
       end
 
       return unless inject_flag
@@ -94,7 +96,7 @@ module StackifyRubyAPM
         source = source[0...insertion_index] <<
                  jsfile_to_inject <<
                  source[insertion_index..-1]
-        source = source.gsub('[RUM_SCRIPT_VARIABLE]', '') if rum_variable_script
+        source = source.sub('[RUM_SCRIPT_VARIABLE]', '') if rum_variable_script
       end
       source
     end

data/lib/stackify_apm/root_info.rb

@@ -27,10 +27,10 @@ module StackifyRubyAPM
         TRACETYPE: 'WEBAPP',
         TRACE_ID: @transaction.id,
         THREAD_ID: Thread.current.object_id,
-        TRACE_SOURCE: 'Ruby',
+        TRACE_SOURCE: 'RUBY',
         TRACE_TARGET: 'RETRACE',
         HOST_NAME: @config.hostname || `hostname`,
-        OS_TYPE: 'LINUX',
+        OS_TYPE: StackifyRubyAPM::Util.host_os,
         PROCESS_ID: pid,
         TRACE_VERSION: '2.0'
       }

data/lib/stackify_apm/spies.rb

@@ -69,8 +69,9 @@ module StackifyRubyAPM
     def self.parse_json_config(file)
       jsondata = {}
       if ENV['STACKIFY_RUBY_ENV'] == 'rspec'
-        file = 'spec/integration/stackify.json'
+        file = 'spec/integration/stackify_spec.json'
       end
+
       return unless File.exist?(file)
 
       File.open(file) do |f|

data/lib/stackify_apm/spies/curb.rb

@@ -24,7 +24,7 @@ module StackifyRubyAPM
             req = http_without_apm(verb, url, _post_body = nil, _put_data = nil, &block)
             # Builds span context
             #
-            status_code = req.status.gsub(/^0-9/, '').to_i
+            status_code = req.status.sub(/^0-9/, '').to_i
 
             ctx = Span::Context.new(
               CATEGORY: 'Web External',

data/lib/stackify_apm/spies/curb/easy.rb

@@ -30,7 +30,7 @@ module StackifyRubyAPM
             req = perform_without_apm(*args)
             # Builds span context
             #
-            status_code = req.status.gsub(/^0-9/, '').to_i
+            status_code = req.status.sub(/^0-9/, '').to_i
             ctx = Span::Context.new(
               CATEGORY: 'Web External',
               SUBCATEGORY: 'Execute',
@@ -55,7 +55,7 @@ module StackifyRubyAPM
             name = "#{method} #{uri}"
             type = "ext.Curb.Easy.#{method}"
             req = http_post_without_apm(*args)
-            status_code = req.status.gsub(/^0-9/, '').to_i
+            status_code = req.status.sub(/^0-9/, '').to_i
 
             ctx = Span::Context.new(
               CATEGORY: 'Web External',
@@ -81,7 +81,7 @@ module StackifyRubyAPM
             name = "#{method} #{uri}"
             type = "ext.Curb.Easy.#{method}"
             req = http_put_without_apm(url, data)
-            status_code = req.status.gsub(/^0-9/, '').to_i
+            status_code = req.status.sub(/^0-9/, '').to_i
 
             ctx = Span::Context.new(
               CATEGORY: 'Web External',
@@ -107,7 +107,7 @@ module StackifyRubyAPM
             name = "#{method} #{uri}"
             type = "ext.Curb.Easy.#{method}"
             req = http_get_without_apm(*args)
-            status_code = req.status.gsub(/^0-9/, '').to_i
+            status_code = req.status.sub(/^0-9/, '').to_i
 
             ctx = Span::Context.new(
               CATEGORY: 'Web External',
@@ -133,7 +133,7 @@ module StackifyRubyAPM
             name = "#{method} #{uri}"
             type = "ext.Curb.Easy.#{method}"
             req = http_delete_without_apm(*args)
-            status_code = req.status.gsub(/^0-9/, '').to_i
+            status_code = req.status.sub(/^0-9/, '').to_i
 
             ctx = Span::Context.new(
               CATEGORY: 'Web External',

data/lib/stackify_apm/spies/custom_instrumenter.rb

@@ -87,8 +87,8 @@ module StackifyRubyAPM
                                  tracked_func_name
                                end
 
-        tracked_function_name = tracked_function_tpl.gsub '{{ClassName}}', current_class
-        tracked_function_name = tracked_function_name.gsub '{{MethodName}}', current_method
+        tracked_function_name = tracked_function_tpl.sub '{{ClassName}}', current_class
+        tracked_function_name = tracked_function_name.sub '{{MethodName}}', current_method
 
         # rubocop:disable Style/Next
         if class_exists?(current_class)

data/lib/stackify_apm/subscriber.rb

@@ -12,8 +12,7 @@ module StackifyRubyAPM
     include Log
 
     def initialize(agent)
-      debug '[Subscriber] initialize()'
-      debug agent.inspect
+      debug '[Subscriber] initialize(agent)' if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
       @agent = agent
       @normalizers = Normalizers.build(agent.config)
     end
@@ -40,11 +39,6 @@ module StackifyRubyAPM
     def call(name, started, finished, id, payload)
       return unless (transaction = @agent.current_transaction)
 
-      debug '[Subscriber] call():'
-      debug id
-      debug name
-      debug transaction
-
       normalized = @normalizers.normalize(transaction, name, payload)
 
       if started
@@ -77,10 +71,6 @@ module StackifyRubyAPM
     def start(name, id, payload)
       return unless (transaction = @agent.current_transaction)
 
-      debug '[Subscriber] start():'
-      debug id
-      debug name
-      debug transaction
       normalized = @normalizers.normalize(transaction, name, payload)
 
       span =
@@ -96,8 +86,6 @@ module StackifyRubyAPM
 
     # [finish] Called when the rails version is NOT 3.x
     def finish(_name, id, _payload)
-      # debug "AS::Notification#finish:#{name}:#{id}"
-      debug '[Subscriber] finish():'
       return unless (transaction = @agent.current_transaction)
 
       while (notification = transaction.notifications.pop)

data/lib/stackify_apm/trace_logger.rb

@@ -19,6 +19,7 @@ module StackifyRubyAPM
     attr_accessor :trace_file_counter
 
     def post(transactions = [])
+      debug '[TraceLogger] post()' if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
       # convert transactions to json
       json_traces = []
       transactions.each  do |transaction|
@@ -29,14 +30,12 @@ module StackifyRubyAPM
         json_traces.push(json_transaction)
       end
 
-      date_now = Time.now
-      current_datetime = date_now.strftime('%Y-%m-%d, %H:%M:%S.%6N')
+      current_datetime = Time.now.utc.strftime('%Y-%m-%d, %H:%M:%S.%6N')
 
       return unless ENV['STACKIFY_RUBY_ENV'] != 'rspec'
 
       json_traces.each do |json_trace|
-        update_json = current_datetime + ' > ' + json_trace + "\n"
-        @config.tracer_logger.<<(update_json)
+        @config.tracer_logger.<<("#{current_datetime} > #{json_trace} \n")
       end
     end
   end

data/lib/stackify_apm/transaction.rb

@@ -116,7 +116,17 @@ module StackifyRubyAPM
     end
 
     def build_and_start_span(name, type, context, backtrace)
-      span = next_span(name, type, context)
+      span = Span.new(
+        self,
+        next_span_id,
+        name,
+        type,
+        parent_id: current_span.nil? ? -1 : current_span.id,
+        context: context,
+        http_status: @http_status
+      )
+
+      # span = next_span(name, type, context)
       spans << span
 
       span.original_backtrace = backtrace if backtrace && span_frames_min_duration?

data/lib/stackify_apm/util.rb

@@ -16,6 +16,24 @@ module StackifyRubyAPM
       cmd_rake = ($PROGRAM_NAME =~ /rake$/)
       StackifyRubyAPM.agent.config.instrument = false if cmd_rake
     end
+
+    def self.host_os
+      host_os = RbConfig::CONFIG['host_os']
+      case host_os
+      when /cygwin|mswin|mingw|bccwin|wince|emx/i
+        'WINDOWS'
+      when /linux|arch/i
+        'LINUX'
+      when /sunos|solaris/i
+        'SOLARIS'
+      when /bsd/i
+        'BSD'
+      when /darwin/i
+        'MAC OS X'
+      else
+        "UNKNOWN #{host_os}"
+      end
+    end
   end
 end
 require 'stackify_apm/util/inspector'

data/lib/stackify_apm/version.rb

@@ -2,5 +2,5 @@
 
 # Sets the version of the APM
 module StackifyRubyAPM
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/lib/stackify_apm/worker.rb

@@ -81,7 +81,7 @@ module StackifyRubyAPM
     def collect_and_send_transactions
       return if pending_transactions.empty?
       transactions = collect_batched_transactions
-      debug '[Worker] Successfully collect and send transaction to the to trace logger.'
+      debug '[Worker] collect_and_send_transactions() transactions : ' + transactions.inspect.to_s if ENV['STACKIFY_APM_LOG_LEVEL'] == '0'
       begin
         @trace_logger.post(transactions)
       rescue ::Exception => e
@@ -97,7 +97,6 @@ module StackifyRubyAPM
       return if pending_transactions.empty?
       # transactions = collect_batched_transactions
       # payload = @serializers.errors.build_all([msg.error])
-      debug '[Worker] post_error()'
       # @trace_logger.post(payload, transactions[0])
     end
 

data/lib/stackify_ruby_apm.rb

@@ -20,11 +20,12 @@ require 'stackify_apm/agent'
 # Checks ruby version
 require RUBY_VERSION.to_f >= 2.4 ? 'stackify_apm/logger/logger_high_version' : 'stackify_apm/logger/logger_lower_version'
 require 'stackify_apm/helper/database_helper'
+require 'stackify_apm/util'
 require 'stackify_apm/config'
 require 'stackify_apm/context'
 require 'stackify_apm/instrumenter'
 require 'stackify_apm/internal_error'
-require 'stackify_apm/util'
+# require 'stackify_apm/util'
 require 'stackify_apm/middleware'
 
 # Checks if the framework using is Rails
@@ -40,8 +41,6 @@ module StackifyRubyAPM
     Agent.start config
   end
 
-  # rubocop:disable Metrics/CyclomaticComplexity
-  # rubocop:disable Metrics/PerceivedComplexity
   def self.inject_rum_script
     config = StackifyRubyAPM::Config.new
     client_id = config.client_id
@@ -51,14 +50,16 @@ module StackifyRubyAPM
 
     inject_flag = false
 
-    if client_rundomain != '' && check_isdomain(client_rundomain) && client_id && device_id
-      inject_flag = true
-    else
-      warn 'ClientRumDomain might be empty or Invalid URL stackify.properties.'
+    if client_id && device_id
+      if check_isdomain(client_rundomain)
+        inject_flag = true
+      else
+        info 'Error: Stackify Client RUM Domain is invalid.'
+      end
     end
 
     return unless inject_flag
-    data_request_id = 'V2|' + transaction_id + '|C' + client_id + '|CD' + device_id
+    data_request_id = "V2|#{transaction_id}|#{client_id}|#{device_id}"
     @rum_script_injected = true
     "<script src=\"#{config.rum_script_src}\" data-host=\"#{client_rundomain}\" data-requestId=\"#{data_request_id}\"
     data-a=\"#{config.application_name}\" data-e=\"#{config.environment_name}\" data-enableInternalLogging=\"#{config.debug_logging}\" type=\"text/javascript\" async></script>"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-16 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler