stackify-ruby-apm 1.2.4 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c797df00561661da936aeef53e4064ac64a7742156b7c83c6ba770880202f53f
-  data.tar.gz: 32f9a06b9f3b0ab131c552d7cbfa3e22dd074b5689e67ed5d42cb3edd99c43a0
+  metadata.gz: e69ba17aa5e795974868a28d69a053d1e40a1991a9894d7b76e38fc147cdbc15
+  data.tar.gz: d556ea3ecff8621cb3024f33a82d396fa74a5582a5d86f34077cda9cf79ca60b
 SHA512:
-  metadata.gz: 8ca79814064746539fb96db7d3e5ff5241c8213973a9fba444fc69507756e60d138e4335202bc73d0ca5a6e2df1984afeeb6836b98681f64bf06f7337523b28f
-  data.tar.gz: 824820eb08bd65189a0292d3c0f6d8138923aff31552828bc788a072ad781d7bb660c51fe7439eb00891a8a9597713ed92178f7133fe9a13fb7d86a0becf6952
+  metadata.gz: ab0cc4910e4b1004e7d78074df65000a6d3c23d47f4b1cab36a5613418e9a4752c216bd0c1cfd2b476be6716eb877a36a1e3dc0e66b85d480f0f10f27994ab35
+  data.tar.gz: 199c9b05f7d9abbbddf4dce9aefd25b58edb61ee4aee28cd43ad88b225b5edc6b4e129f97dff2c7bfb3300b0bdb8330b1e3dd2202c611d49ef6d405f2693d7b7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stackify-ruby-apm (1.1.1)
+    stackify-ruby-apm (1.3.0)
       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.1.7)
+    et-orbi (1.2.1)
       tzinfo
     fakeredis (0.7.0)
       redis (>= 3.2, < 5.0)
@@ -68,8 +68,8 @@ GEM
       multipart-post (>= 1.2, < 3)
     file-tail (1.2.0)
       tins (~> 1.0)
-    fugit (1.1.8)
-      et-orbi (~> 1.1, >= 1.1.7)
+    fugit (1.2.1)
+      et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -163,16 +163,16 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.10.0)
-    ruby2ruby (2.4.1)
+    ruby2ruby (2.4.2)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.6)
-    ruby_parser (3.12.0)
+    ruby_parser (3.13.1)
       sexp_processor (~> 4.9)
-    rufus-scheduler (3.5.2)
-      fugit (~> 1.1, >= 1.1.5)
+    rufus-scheduler (3.6.0)
+      fugit (~> 1.1, >= 1.1.6)
     safe_yaml (1.0.5)
     sequel (5.18.0)
-    sexp_processor (4.11.0)
+    sexp_processor (4.12.0)
     sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)

data/lib/stackify_apm/config.rb

@@ -285,13 +285,14 @@ module StackifyRubyAPM
             @client_run_domain = line.split('=')[1].strip
           end
         end
-        info "stackify.properties: clientId=#{@client_id}, deviceId=#{@device_id}"
+        info "stackify.properties: clientId=#{@client_id}, deviceId=#{@device_id}, client_rum_domain=#{@client_run_domain}"
       rescue StandardError => e
         info 'Error occured while reading the stackify.properties file.'
         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?
     end
     # rubocop:enable Metrics/CyclomaticComplexity
   end

data/lib/stackify_apm/response_manipulator.rb

@@ -65,21 +65,16 @@ module StackifyRubyAPM
       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
-      data_request_id = 'V2|' + transaction_id + '|C' + client_id + '|' + device_id
       inject_flag = false
 
-      if client_rundomain != '' && StackifyRubyAPM.check_isdomain(client_rundomain)
+      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.'
       end
 
-      jsfile_to_inject = '<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.to_s + '" type="text/javascript" async></script>'
+      return unless inject_flag
+      jsfile_to_inject = StackifyRubyAPM.inject_rum_script
 
       # Only scan the first 50k (roughly) then give up.
       beginning_of_source = source[0..SCAN_LIMIT]

data/lib/stackify_apm/version.rb

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

data/lib/stackify_ruby_apm.rb

@@ -40,22 +40,25 @@ 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
     device_id = config.device_id
     client_rundomain = config.client_run_domain
     transaction_id = defined?(StackifyRubyAPM.current_transaction.id) ? StackifyRubyAPM.current_transaction.id : nil
-    data_request_id = 'V2|' + transaction_id + '|C' + client_id + '|' + device_id
+
     inject_flag = false
 
-    if client_rundomain != '' && check_isdomain(client_rundomain)
+    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.'
     end
 
     return unless inject_flag
+    data_request_id = 'V2|' + transaction_id + '|C' + client_id + '|CD' + 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.2.4
+  version: 1.3.1
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler