stackify-ruby-apm 1.14.5 → 1.15.3.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81a16e2527e1237952803d7082cd0869b932e2af04dd3263490e5bd6538debbd
-  data.tar.gz: 3df0659ad3e96984f67c9850e69f38c20fae65ced83948b2791a2a9fe63012af
+  metadata.gz: 014b8a770c78acfd3eba5a9f75e1a4c76eeb2c4d28635d80834e53f985807ed8
+  data.tar.gz: 1f82c3bb6394992ffe325182d32b76b5a7cf665923ec93842461186cf9594c90
 SHA512:
-  metadata.gz: d6a34b33a19b3a59c69fdfa105255b234a77b3be6b81a0bbdac68bc39bdc92eb327c33d236d49beb064dafe87b6f4e882df53fb29365b2152572f4d9cf7fdf08
-  data.tar.gz: e05ee709696f67a2bb4c7780a2b762393f5be5507c3af5b327c825e500fd3a18786827f2ba2e8d98df8e926af6cc2d4a5dc79fd380f8392fdd8443e04a998c5c
+  metadata.gz: d0e4223d7f5b01adc3ba840ed02aaced9509fe5277ad112d02a0c4febdabfddcac6f2a456866bdd76027486b14f296256b1515399b41eef78672549d02b7bcc5
+  data.tar.gz: 42ab0ae25cda2ee2d6aae7ff7b54888db652d80c6f72006befc61317d4871068b59986eb92fc5766ca8ff8d96dac8969a69065d08bab661232452dda322481e1

data/lib/stackify_apm/config.rb

@@ -26,7 +26,7 @@ module StackifyRubyAPM
       environment_name: ENV['RAILS_ENV'] || ENV['RACK_ENV'],
       already_instrumented_flag: false,
       rum_auto_injection: false,
-      rum_enabled: true,
+      rum_enabled: false,
       rum_cookie_path: '/',
       rum_cookie_name: '.Stackify.Rum',
       transport: StackifyRubyAPM::TRACE_LOG,
@@ -71,14 +71,17 @@ module StackifyRubyAPM
 
       queue: true,
       lambda_handler: '',
-      prefix_enabled: false
+      prefix_enabled: false,
+
+      rum_script_url: 'https://stckjs.stackify.com/stckjs.js',
+      rum_key: ''
     }.freeze
 
     ENV_TO_KEY = {
       'STACKIFY_DEBUG' => [:bool, 'debug_logging'],
       'STACKIFY_APPLICATION_NAME' => 'application_name',
       'STACKIFY_ENVIRONMENT_NAME' => 'environment_name',
-      'STACKIFY_RUM' => [:bool, 'rum_enabled'],
+      'RETRACE_RUMV2_ENABLED' => [:bool, 'rum_enabled'],
       'STACKIFY_RUM_AUTO_INJECT' => [:bool, 'rum_auto_injection'],
       'STACKIFY_RUM_SCRIPT_SRC' => 'rum_script_src',
       'STACKIFY_TRANSPORT' => 'transport',
@@ -99,7 +102,9 @@ module StackifyRubyAPM
       'STACKIFY_DISABLED_SPIES' => [:list, 'disabled_spies'],
       'STACKIFY_QUEUE' => [:bool, 'queue'],
       'STACKIFY_LAMBDA_HANDLER' => 'lambda_handler',
-      'STACKIFY_PREFIX_ENABLED' => [:bool, 'prefix_enabled']
+      'STACKIFY_PREFIX_ENABLED' => [:bool, 'prefix_enabled'],
+      'RETRACE_RUM_SCRIPT_URL' => 'rum_script_url',
+      'RETRACE_RUM_KEY' => 'rum_key'
     }.freeze
 
     def initialize(options = {})
@@ -180,6 +185,9 @@ module StackifyRubyAPM
     attr_reader :apm_disabled_in_rake
     attr_reader :client_run_domain
 
+    attr_accessor :rum_script_url
+    attr_accessor :rum_key
+
     def app=(app)
       case app_type?(app)
       when :rails
@@ -412,6 +420,25 @@ module StackifyRubyAPM
       info '[Config] transport must be String type.' unless @transport.is_a?(String) && defined?(@transport)
       info '[Config] Transport should be one of these values: [agent_socket, default, agent_http]. Should be a String.' if defined?(@transport) && !%w[agent_socket default agent_http].include?(@transport.downcase)
       info '[Config] prefix_enabled must be Boolean type: true/false.' unless [TrueClass, FalseClass].include?(@prefix_enabled.class) && defined?(@prefix_enabled)
+
+      valid_rum_script_url = false
+      if defined?(@rum_script_url) && @rum_script_url.is_a?(String)
+        valid_rum_script_url = @rum_script_url =~ /^((((https?|ftps?|gopher|telnet|nntp):\/\/)|(mailto:|news:))(%[0-9A-Fa-f]{2}|[\-\(\)_\.!~*';\/?:@&=+$,A-Za-z0-9])+)([\)\.!';\/?:,][\[:blank:|:blank:\]])?$/
+      end
+
+      if !valid_rum_script_url
+        @rum_script_url = 'https://stckjs.stackify.com/stckjs.js'
+      end
+
+      valid_rum_key = false
+      if defined?(@rum_key) && @rum_key.is_a?(String)
+        valid_rum_key = @rum_key =~ %r{^[A-Za-z0-9_-]+$}
+      end
+
+      if !valid_rum_key
+        @rum_key = ''
+      end
+
     end
     # rubocop:enable Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/PerceivedComplexity

data/lib/stackify_apm/context.rb

@@ -14,13 +14,14 @@ module StackifyRubyAPM
   class Context
     include NaivelyHashable
 
-    attr_accessor :request, :response, :aws, :category, :prefix
+    attr_accessor :request, :response, :aws, :category, :prefix, :rum
     attr_reader :custom, :tags
 
     def initialize
       @custom = {}
       @tags = {}
       @prefix = Context::Prefix.new
+      @rum = false
     end
 
     # add aws context to context instance

data/lib/stackify_apm/helper/database_helper.rb

@@ -19,6 +19,8 @@ module DatabaseHelper
       'db2'
     elsif driver.include? 'sqlite'
       'sqlite'
+    else
+      'generic'
     end
   end
   # rubocop:enable Metrics/CyclomaticComplexity

data/lib/stackify_apm/instrumenter_helper.rb

@@ -35,6 +35,8 @@ module StackifyRubyAPM
       classspyitem = "#{current_class}Spy"
       module_consget_spy = Module.const_get(current_class)
       current_method_without = "_without_apm_#{current_method}"
+      is_private_method = options[:is_private_method] || false
+      is_protected_method = options[:is_protected_method] || false
 
       unless @custom_instrumented[current_class.to_s]
         @custom_instrumented[current_class.to_s] = {}
@@ -63,7 +65,14 @@ module StackifyRubyAPM
           def install
             #{current_class}.class_eval do
               alias_method "#{current_method_without}", "#{current_method}"
-
+              
+              #{
+                if is_private_method
+                  then "private"
+                elsif is_protected_method
+                  then "protected"
+                end
+              }
               def #{current_method}(*args, &block)
                 if StackifyRubyAPM.current_transaction.nil? && #{!transaction.nil?}
                   t = StackifyRubyAPM.transaction("custom.#{current_class}.#{current_method}", TRACETYPE)

data/lib/stackify_apm/middleware.rb

@@ -28,6 +28,7 @@ module StackifyRubyAPM
     CONTENT_TYPE_REGEX = %r{text\/html|application\/xhtml\+xml/}
     CONTENT_DISPOSITION = 'Content-Disposition'.freeze
     ATTACHMENT = 'attachment'.freeze
+    CONTENT_LENGTH = 'Content-Length'.freeze
 
     def initialize(app)
       @app = app
@@ -53,17 +54,15 @@ module StackifyRubyAPM
         if okay_to_modify?
           @configuration.already_instrumented_flag = true
           if @configuration.rum_enabled.is_a?(TrueClass)
-            # close old response body proxy to close all db connections
-            @rack_body.close if @rack_body.respond_to?(:close)
-            response = Rack::Response.new @rack_body, @rack_status, @rack_headers
-            response.set_cookie(@configuration.rum_cookie_name, value: transaction.id, path: @configuration.rum_cookie_path)
-            resp = response.finish
-          end
-          if @configuration.rum_auto_injection.is_a?(TrueClass)
-            response_manupulate = StackifyRubyAPM::ResponseManipulator.new(env, resp, @configuration)
-            response_string = response_manupulate.adjust_pagehtml_response
+            response_manipulated = StackifyRubyAPM::ResponseManipulator.new(env, resp, @configuration)
+            response_string = response_manipulated.adjust_pagehtml_response
             if response_string
-              response = Rack::Response.new(response_string, resp[0].to_i, resp[1])
+              if @rack_headers.key?(CONTENT_LENGTH)
+                content_length = response_string ? response_string.bytesize : 0
+                @rack_headers[CONTENT_LENGTH] = content_length.to_s
+              end
+
+              response = Rack::Response.new(response_string, @rack_status, @rack_headers)
               resp = response.finish
             else
               resp

data/lib/stackify_apm/normalizers/active_record.rb

@@ -14,8 +14,6 @@ module StackifyRubyAPM
 
         def initialize(*args)
           super(*args)
-
-          @type = format('db.%s.sql', lookup_adapter || 'unknown').freeze
         end
 
         def normalize(_transaction, _name, payload)
@@ -25,7 +23,9 @@ module StackifyRubyAPM
           check_prepared_stmt(statement, payload)
           name = payload[:sql] || payload[:name] || 'Default'
           context = Span::Context.new(statement)
-          [name, @type, context]
+
+          type = format('db.%s.sql', lookup_adapter(payload) || 'unknown').freeze
+          [name, type, context]
         end
 
         private
@@ -33,7 +33,7 @@ module StackifyRubyAPM
         def query_variables(payload)
           adapter_config = lookup_adapter_config
           props = get_common_db_properties
-          props[:PROVIDER] = get_profiler(lookup_adapter)
+          props[:PROVIDER] = get_profiler(lookup_adapter(payload))
           props[:SQL] = payload[:sql]
           if adapter_config
             props[:URL] = "#{adapter_config[:host]}:#{adapter_config[:port]}"
@@ -41,18 +41,66 @@ module StackifyRubyAPM
           props
         end
 
-        def lookup_adapter
-          ::ActiveRecord::Base.connection.adapter_name.downcase
+        # Ideally the application doesn't connect to the database during boot,
+        # but sometimes it does. In case it did, we want to empty out the
+        # connection pools so that a non-database-using process (e.g. a master
+        # process in a forking server model) doesn't retain a needless
+        # connection. If it was needed, the incremental cost of reestablishing
+        # this connection is trivial: the rest of the pool would need to be
+        # populated anyway.
+        #
+        # Reference: https://github.com/rails/rails/blob/main/activerecord/lib/active_record/railtie.rb#L253
+        #
+        # Miko: Considering we are getting the connection method, it is retrieving connection from the connection pool
+        # Connection Method: lib/active_record/connection_handling.rb#L264
+        # Retrieve Connection: lib/active_record/connection_handling.rb#L309
+        # Handler Retrieve Connection: lib/active_record/connection_adapters/abstract/connection_pool.rb#L1111
+        
+        def lookup_adapter(payload)
+          connection = nil
+          if (payload.key?(:connection))
+            connection = payload[:connection]
+          elsif ::ActiveRecord::Base.connection_pool.instance_variable_defined?(:@reserved_connections) and payload.key?(:connection_id)
+            connection_id = payload[:connection_id] # Connection ID here is the object_id of the connection object
+            connections = ::ActiveRecord::Base.connection_pool.instance_variable_get(:@reserved_connections) # Lets check the reserved connections
+
+            if (
+                (connections.class != nil and connections.respond_to?(:class) and
+                  (connections.class.to_s == 'ThreadSafe::Cache' or connections.class.to_s == 'Hash')
+                ) and connections.size()
+            )
+              connections.each_value do |val|
+                if val.object_id == connection_id
+                  connection = val
+                  break
+                end
+              end
+            end
+          end
+
+          if (connection.nil?)
+            return 'generic'
+          end
+
+          if (connection.respond_to?(:adapter_name) && connection.adapter_name.nil?)
+            return 'generic'
+          end
+
+          connection.adapter_name.downcase
         rescue StandardError => error
           debug '[SqlNormalizer] lookup_adapter err: ' + error.inspect.to_s
           nil
         end
 
         def lookup_adapter_config
+          config = nil
           if Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new('6.1')
-            ::ActiveRecord::Base.connection_db_config.to_h
+            config = ::ActiveRecord::Base.connection_db_config
           else
-            ::ActiveRecord::Base.connection_config.to_h
+            config = ::ActiveRecord::Base.connection_config
+          end
+          if (config != nil && config.respond_to(:to_h))
+            config.to_h
           end
         rescue StandardError => error
           debug '[SqlNormalizer] lookup_adapter_config err: ' + error.inspect.to_s
@@ -61,7 +109,7 @@ module StackifyRubyAPM
 
         def check_prepared_stmt(statement, payload)
           if StackifyRubyAPM.agent.config.prefix_enabled
-            case get_profiler(lookup_adapter)
+            case get_profiler(lookup_adapter(payload))
             when 'generic', 'mysql', 'sqlite', 'oracle', 'db2'
               check_prepared_stmt_by_placeholder(payload[:sql].include?('?'), statement, payload)
             when 'postgresql'

data/lib/stackify_apm/response_manipulator.rb

@@ -22,6 +22,7 @@ module StackifyRubyAPM
     GT = '>'.freeze
     CHARSET_RE = /<\s*meta[^>]+charset\s*=[^>]*>/
     X_UA_COMPATIBLE_RE = /<\s*meta[^>]+http-equiv\s*=\s*['"]x-ua-compatible['"][^>]*>/
+    STACKIFY_SETTING_TAG = '<script type="text/javascript">(window.StackifySettings ||'
 
     def initialize(env, rack_response, config)
       @env = env
@@ -46,27 +47,23 @@ module StackifyRubyAPM
       close_old_response(response)
       return nil unless source
 
-      client_id = @config.client_id
-      device_id = @config.device_id
-      client_rundomain = @config.client_run_domain
+      transaction_id = defined?(StackifyRubyAPM.current_transaction.id) ? StackifyRubyAPM.current_transaction.id : nil
       inject_flag = false
 
-      if client_id && device_id
-        if StackifyRubyAPM.check_isdomain(client_rundomain)
-          inject_flag = true
-        else
-          info 'RUM Injection Error: Client RUM Domain is invalid.'
-        end
+      if transaction_id
+        inject_flag = true
       else
-        info 'RUM Injection Error: No Device ID and/or Client ID found.'
+        info 'RUM Injection Error: No Transaction ID found.'
       end
 
       return unless inject_flag
 
+      return if has_stackify_tag(source[0..SCAN_LIMIT])
+
       # Only scan the first 50k (roughly) then give up.
       insertion_index = find_end_of_head_open(source[0..SCAN_LIMIT])
 
-      if insertion_index && inject_flag
+      if insertion_index
         source = source[0...insertion_index] <<
                  StackifyRubyAPM.inject_rum_script <<
                  source[insertion_index..-1]
@@ -77,13 +74,21 @@ module StackifyRubyAPM
     # rubocop:enable Metrics/PerceivedComplexity
 
     def find_end_of_head_open(beginning_of_source)
-      head_open = beginning_of_source.index(HEAD_END)
-      beginning_of_source.index(GT, head_open) - 6 if head_open
+      head_open = beginning_of_source.index(HEAD_START)
+      beginning_of_source.index(GT, head_open) + 1 if head_open
+    end
+
+    def has_stackify_tag(beginning_of_source)
+      !!beginning_of_source.index(STACKIFY_SETTING_TAG)
     end
 
     def gather_source(response)
       source = nil
-      response.each { |fragment| source ? (source << fragment.to_s) : (source = fragment.to_s) }
+      if response.respond_to?(:each)
+        response.each { |fragment| source ? (source << fragment.to_s) : (source = fragment.to_s) }
+      else
+        source << response
+      end
       source
     end
 

data/lib/stackify_apm/root_info.rb

@@ -31,7 +31,7 @@ module StackifyRubyAPM
         APPLICATION_FILESYSTEM_PATH: @config.root_path,
         APPLICATION_NAME: @config.application_name.strip,
         APPLICATION_ENV: @config.environment_name || 'Development',
-        REPORTING_URL: @transaction.name,
+        REPORTING_URL: @transaction.name || '/',
         TRACE_ID: @transaction.id,
         THREAD_ID: Thread.current.object_id,
         TRACE_SOURCE: 'RUBY',
@@ -45,7 +45,7 @@ module StackifyRubyAPM
       hash[:METHOD] = @transaction.context.request.method if @transaction.context && @transaction.context.request && @transaction.context.request.method
       hash[:STATUS] = @transaction.context.response.status_code if @transaction.context && @transaction.context.response && @transaction.context.response.status_code
       hash[:URL] = @transaction.context.request.url[:full] if @transaction.context && @transaction.context.request && @transaction.context.request.url[:full]
-      hash[:RUM] = true if @config.rum_enabled.is_a?(TrueClass)
+      hash[:ISRUM] = 'TRUE' if @transaction.context && @transaction.context.rum
       hash[:AWS_LAMBDA_ARN] = @transaction.context.aws[:arn] if @transaction.context && @transaction.context.aws && @transaction.context.aws[:arn]
       hash[:PREFIX_RESPONSE_BODY] = @transaction.context.prefix.response_body.to_s if @transaction.context.prefix && @transaction.context.prefix.response_body
       hash[:PREFIX_RESPONSE_SIZE_BYTES] = @transaction.context.prefix.response_body.length.to_s if @transaction.context.prefix && @transaction.context.prefix.response_body

data/lib/stackify_apm/spies/custom_instrumenter.rb

@@ -70,6 +70,8 @@ module StackifyRubyAPM
           mod_constant = Module.const_get(current_class.to_s)
           klass_method_flag = mod_constant.method_defined?(current_method.to_s)
           singleton_method_flag = mod_constant.respond_to?(current_method.to_s)
+          klass_private_method_flag = mod_constant.private_method_defined?(current_method.to_s)
+          klass_protected_method_flag = mod_constant.protected_method_defined?(current_method.to_s)
 
           class_location = mod_constant.instance_methods(false).map do |m|
             mod_constant.instance_method(m).source_location.first
@@ -77,8 +79,17 @@ module StackifyRubyAPM
 
           class_path = class_location.last
 
-          if klass_method_flag
-            StackifyRubyAPM::InstrumenterHelper.m_class(tracked_func, current_class, class_path, current_method: current_method, tracked_function_name: tracked_function_name, is_transaction: transaction)
+          if klass_method_flag || klass_private_method_flag
+            StackifyRubyAPM::InstrumenterHelper.m_class(
+              tracked_func,
+              current_class,
+              class_path,
+              current_method: current_method,
+              tracked_function_name: tracked_function_name,
+              is_transaction: transaction,
+              is_private_method: klass_private_method_flag,
+              is_protected_method: klass_protected_method_flag
+            )
           elsif singleton_method_flag
             StackifyRubyAPM::InstrumenterHelper.m_singleton(tracked_func, current_class, class_path, current_method: current_method, tracked_function_name: tracked_function_name, is_transaction: transaction)
           end

data/lib/stackify_apm/spies/faraday.rb

@@ -36,7 +36,7 @@ module StackifyRubyAPM
               ctx = Span::Context.new(
                 CATEGORY: 'Web External',
                 SUBCATEGORY: 'Execute',
-                URL: uri,
+                URL: uri.to_s,
                 STATUS: '',
                 METHOD: method_upcase
               )

data/lib/stackify_apm/spies/sinatra.rb

@@ -11,6 +11,7 @@ module StackifyRubyAPM
         ::Sinatra::Base.class_eval do
           alias_method 'dispatch_without_apm!', 'dispatch!'
           alias_method 'compile_template_without_apm', 'compile_template'
+          alias_method 'route_eval_without_apm', 'route_eval'
 
           # Sets transaction name from Sinatra env's route name
           #
@@ -34,6 +35,15 @@ module StackifyRubyAPM
 
             compile_template_without_apm(engine, data, opts, *args, &block)
           end
+
+          def route_eval(*args, &block)
+            if defined?(StackifyRubyAPM.current_transaction)
+              if env.key?('sinatra.route')
+                StackifyRubyAPM.current_transaction.name = env['sinatra.route']
+              end
+            end
+            route_eval_without_apm(*args, &block)
+          end
         end
       end
     end

data/lib/stackify_apm/transport/agent_http_client.rb

@@ -42,7 +42,7 @@ module StackifyRubyAPM
         message = get_json_message(transactions)
         conn = Faraday.new(ssl: { verify: false })
         response = conn.post do |req|
-          req.url URI(@config.transport_http_endpoint + @config.agent_traces_url)
+          req.url URI(@config.transport_http_endpoint + @config.agent_traces_url).to_s
           req.headers = get_json_headers
           req.body = message
         end

data/lib/stackify_apm/util.rb

@@ -35,6 +35,58 @@ module StackifyRubyAPM
       obj[i] = val.to_s
       ary.push(obj)
     end
+
+    URL_ID_REGEX = /^(\d+)$/
+    URL_GUID_REGEX = /^(?i)(\b[A-F0-9]{8}(?:-[A-F0-9]{4}){3}-[A-F0-9]{12}\b)$/
+    URL_EMAIL_REGEX = /^((([!#$%&'*+\-\/=?^_`{|}~\w])|([!#$%&'*+\-\/=?^_`{|}~\w][!#$%&'*+\-\/=?^_`{|}~\.\w]{0,}[!#$%&'*+\-\/=?^_`{|}~\w]))[@]\w+([-.]\w+)*\.\w+([-.]\w+)*)$/
+    URL_IP_REGEX = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/
+
+    def self.maskReportingUrl(url)
+      parts = url.split('/', -1)
+
+      if (!parts.length)
+        return '/'
+      end
+
+      maskedParts = []
+      parts.each do |part|
+        maskedParts.push(maskString(part))
+      end
+
+      maskedUrl = maskedParts.join('/')
+
+      if (maskedUrl.length == 1)
+        return maskedUrl
+      end
+
+      if maskedUrl.end_with?('/')
+        trimmedUrl = maskedUrl.slice(0, maskedUrl.length-1)
+        if (!trimmedUrl.length)
+          return '/'
+        end
+
+        return trimmedUrl
+      end
+
+      maskedUrl
+    end
+
+    def self.maskString(string)
+      return '{id}' if string =~ URL_ID_REGEX
+      return '{guid}' if string =~ URL_GUID_REGEX
+      return '{email}' if string =~ URL_EMAIL_REGEX
+      return '{ip}' if string =~ URL_IP_REGEX
+
+      if string.include? ';'
+        string_index = string.index(';');
+        return '' if (string_index <= 0)
+        return string[0..string.index(';')-1]  if (string_index)
+      end
+
+      # Default
+      string
+    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.14.5'.freeze
+  VERSION = '1.15.3.beta1'.freeze
 end

data/lib/stackify_ruby_apm.rb

@@ -50,22 +50,67 @@ module StackifyRubyAPM
   end
 
   def self.inject_rum_script
-    config = StackifyRubyAPM::Config.new
-    client_id = config.client_id
-    device_id = config.device_id
-    client_rundomain = config.client_run_domain
-    transaction_id = defined?(StackifyRubyAPM.current_transaction.id) ? StackifyRubyAPM.current_transaction.id : nil
+    transaction = defined?(StackifyRubyAPM.current_transaction) ? StackifyRubyAPM.current_transaction : nil
+    return '' unless transaction
+
+    transaction_id = defined?(transaction.id) ? transaction.id : nil
     inject_flag = false
 
-    if client_id && device_id
-      inject_flag = true if check_isdomain(client_rundomain)
+    config = nil
+    if defined?(agent.config)
+      config = agent.config
+    end
+
+    return '' unless config
+
+    if transaction_id
+      inject_flag = true
+    end
+
+    return '' unless inject_flag
+
+    return '' if config.rum_script_url.to_s.empty? || config.rum_key.to_s.empty?
+
+    rum_settings = {
+      "ID" => transaction_id
+    }
+
+    if defined?(config.environment_name)
+      environment_name = 'Development'
+      if !config.environment_name.to_s.empty?
+        environment_name = config.environment_name
+      end
+
+      rum_settings["Env"] = Base64.strict_encode64(environment_name.encode('utf-8'))
+    end
+
+    application_name = config.application_name
+    return '' if application_name.to_s.empty?
+
+    rum_settings["Name"] = Base64.strict_encode64(application_name.strip.encode('utf-8'))
+
+    if defined?(transaction.name) && !transaction.name.to_s.empty?
+      reporting_url = Util.maskReportingUrl(transaction.name)
+
+      if defined?(transaction.context.request.method) && !transaction.context.request.nil? && !transaction.context.request.method.nil?
+        reporting_url = "#{transaction.context.request.method}-#{reporting_url}"
+      end
+
+      rum_settings["Trans"] = Base64.strict_encode64(reporting_url.encode('utf-8'))
     end
 
-    return unless inject_flag
-    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>"
+
+    if defined?(transaction.context)
+      transaction.context.rum = true
+    end
+
+    rum_content = "<script type=\"text/javascript\">(window.StackifySettings || (window.StackifySettings = #{rum_settings.to_json}))</script><script src=\"#{config.rum_script_url}\" data-key=\"#{config.rum_key}\" async></script>"
+    if rum_content.respond_to?(:html_safe)
+      rum_content.html_safe
+    else
+      rum_content
+    end
   end
 
   # Run the custom instrument

data/stackify-ruby-apm.gemspec

@@ -32,16 +32,22 @@ Gem::Specification.new do |spec|
   if RUBY_VERSION > '2.5'
     spec.add_development_dependency  'bigdecimal'
   end
+  
+  if RUBY_PLATFORM == 'i386-mingw32'
+    spec.add_development_dependency 'tzinfo-data'
+  else
+    spec.add_development_dependency 'mongo'
+    spec.add_development_dependency 'curb', '0.9.8'
+  end
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'activerecord'
-  spec.add_development_dependency 'curb', '0.9.8'
+  
   spec.add_development_dependency 'fakeredis'
   spec.add_development_dependency 'http'
   spec.add_development_dependency 'httpclient'
-  spec.add_development_dependency 'mongo'
   spec.add_development_dependency 'mysql2'
   spec.add_development_dependency 'pg', '~> 0.20'
   spec.add_development_dependency 'rack-test'
@@ -55,9 +61,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'to_bool'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'delayed_job'
+  spec.add_development_dependency('delegate_matcher', '~> 0.4') # for testing
 
   spec.add_dependency('concurrent-ruby', '~> 1.0')
-  spec.add_dependency('delegate_matcher', '~> 0.4')
   spec.add_dependency('faraday', '~> 0.8')
   spec.add_dependency('net_http_unix', '~> 0.2')
   spec.add_dependency('rufus-scheduler', '~> 3.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.14.5
+  version: 1.15.3.beta1
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -39,77 +39,77 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: mongo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.9.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: fakeredis
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: http
+  name: fakeredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mongo
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -347,33 +347,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: concurrent-ruby
+  name: delegate_matcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '0.4'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: delegate_matcher
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -533,9 +533,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.1
 signing_key: