stackify-ruby-apm 1.7.1 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca22a5a75e1ae02e39bea7fa1330da6530c522cf33f3e82f4aec4aec2515ef79
-  data.tar.gz: 3ce816108dfed9e9abdd268b127b5795a41be911da28d16afcc0262e369847f7
+  metadata.gz: 701a5bf72b0d237602bbb07c71923d404565da0161c71a36fd1886bfac0fddc9
+  data.tar.gz: c91c611b46c3747bdf5f2e840a3c88cdd1562beb1a364cb1a80ba06c6d18ffc4
 SHA512:
-  metadata.gz: e9a115fe042f1f9b3021af173ba229ba2bfab15c5685bf57cf851e6292089252f321966c7cf85622942ef853750961641980a38db8452b07e79a17c17a5bc79d
-  data.tar.gz: 2ce4459279a1661b6ef016ccc33ddf5d9b01d9e2a1eea94e732be98101699920e5ba068d226d2711ac0c754014b6c0607c4b5c441ac476aa72edf8ff39c67ea0
+  metadata.gz: 778c0414e397291ee79cfa4a570fa4a85db6f84db87f070591e53102d1b8be76ee46c871518c19fea615d21f9227c3e67b29dd2923468175d5b4a38579fea1e6
+  data.tar.gz: 5576bd8a1932c69c0ee70e157d60ba59f4024ebc7230a941f31051c370d31b43203693171ef8f8bc0555cd0ba5d4ccb0161a55210c5ecd8004a7cb3a11e232f8

data/lib/stackify_apm/config.rb

@@ -20,7 +20,6 @@ module StackifyRubyAPM
       already_instrumented_flag: false,
       rum_auto_injection: false,
       rum_enabled: false,
-      rum_cookie_max_age: 0,
       rum_cookie_path: '/',
       rum_cookie_name: '.Stackify.Rum',
       instrument: true,
@@ -85,10 +84,10 @@ module StackifyRubyAPM
       set_from_args(options)
       set_from_config_file
       set_from_env
-
       yield self if block_given?
       debug_logger
       StackifyRubyAPM::Util.host_os == 'WINDOWS' ? load_stackify_props_windows : load_stackify_props
+      validate_apm_yml
     end
 
     attr_accessor :config_file
@@ -97,7 +96,6 @@ module StackifyRubyAPM
     attr_accessor :rum_script_src
     attr_accessor :rum_auto_injection
     attr_accessor :rum_enabled
-    attr_accessor :rum_cookie_max_age
     attr_accessor :rum_cookie_path
     attr_accessor :rum_cookie_name
     attr_accessor :already_instrumented_flag
@@ -159,10 +157,6 @@ module StackifyRubyAPM
     end
 
     def app_type?(app)
-      # if defined?(::Rails) && app.is_a?(Rails::Application)
-      #   return :rails
-      # end
-
       return :rails if defined?(::Rails) && app.is_a?(Rails::Application)
 
       nil
@@ -339,5 +333,16 @@ module StackifyRubyAPM
     end
     # rubocop:enable Metrics/CyclomaticComplexity
     # rubocop:enable Metrics/PerceivedComplexity
+
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
+    def validate_apm_yml
+      info '[Config] rum_enabled must be Boolean type: true/false.' unless [TrueClass, FalseClass].include?(@rum_enabled.class) && defined?(@rum_enabled)
+      info '[Config] rum_auto_injection must be Boolean type: true/false.' unless [TrueClass, FalseClass].include?(@rum_auto_injection.class) && defined?(@rum_auto_injection)
+      info '[Config] application_name must be String type.' unless @application_name.is_a?(String) && defined?(@application_name)
+      info '[Config] environment_name must be String type.' unless @environment_name.is_a?(String) && defined?(@environment_name)
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
   end
 end

data/lib/stackify_apm/middleware.rb

@@ -50,16 +50,16 @@ module StackifyRubyAPM
 
         if okay_to_modify?
           @configuration.already_instrumented_flag = true
-          if @configuration.rum_auto_injection
+          if @configuration.rum_auto_injection.is_a?(TrueClass)
             response_string = response_manupulate.adjust_pagehtml_response
           end
           if response_string
             response = Rack::Response.new(response_string, @rack_status, @rack_headers)
-            response.set_cookie(@configuration.rum_cookie_name, value: transaction.id, path: @configuration.rum_cookie_path, max_age: @configuration.rum_cookie_max_age) if @configuration.rum_enabled
+            response.set_cookie(@configuration.rum_cookie_name, value: transaction.id, path: @configuration.rum_cookie_path) if @configuration.rum_enabled.is_a?(TrueClass)
             resp = response.finish
-          elsif @configuration.rum_enabled
+          elsif @configuration.rum_enabled.is_a?(TrueClass)
             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, max_age: @configuration.rum_cookie_max_age)
+            response.set_cookie(@configuration.rum_cookie_name, value: transaction.id, path: @configuration.rum_cookie_path)
             resp = response.finish
           else
             resp

data/lib/stackify_apm/root_info.rb

@@ -35,6 +35,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
     end
     # rubocop:enable Metrics/CyclomaticComplexity

data/lib/stackify_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stackify-ruby-apm
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.4
 platform: ruby
 authors:
 - Stackify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler