zuora_connect 1.7.41 → 1.7.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 242b9f6eb9ad2e68cca2ffb8d387a32ff6d6a447
-  data.tar.gz: f32692e367f40cc1b51d292b92609be3ab59671d
+  metadata.gz: 9abaf525d1e36123a8e0cdad0f7b637851ae36e0
+  data.tar.gz: d1d46c60b201c79715a238aec1fd0c91f953b3a3
 SHA512:
-  metadata.gz: e87de356298c31eefd05e8015ad7196aa894b289b27b644ebddbd6b68612a40aa00e3369be3e214b797270088c7d4043baae9d24fe9c1807c9db8b88e862237f
-  data.tar.gz: f48a6c58490d2557420175cc28acd88625a85e690df32ee7f102753073143810ed3397aea68061b610fce763b24386b3e89bd184725bb91084929bc97910e250
+  metadata.gz: 46848f66a1c384e1185a18ffdfffea1bcd967bea19d5bdd4d1423dd948f94f0eb48d3ff39befbd9fed3e22d9193d497605aaa5dcf033e4a2c14ffe468cb46566
+  data.tar.gz: a6b35088ce8b0fcd6487ccc7b50e46cc1cfe90315ccfc7433e07c8c5829103fa1bd0625ddbec49432b0b35f70a0197627e3ae4d7b840ae8a10e0a7b60e13674e

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,7 +1,9 @@
 module ZuoraConnect
   class StaticController < ApplicationController
     before_filter :authenticate_connect_app_request, :except => [:metrics, :health, :session_error, :invalid_app_instance_error, :initialize_app]
-    after_filter :persist_connect_app_session,  :except => [:metrics, :health, :session_error, :invalid_app_instance_error, :initialize_app]
+    before_filter :clear_connect_app_session,        :only =>   [:metrics, :health, :session_error, :invalid_app_instance_error, :initialize_app]
+    after_filter :persist_connect_app_session,       :except => [:metrics, :health, :session_error, :invalid_app_instance_error, :initialize_app]
+    
     skip_before_filter :verify_authenticity_token, :only => [:initialize_app]
 
     def session_error
@@ -45,5 +47,12 @@ module ZuoraConnect
       end
     end
 
+    private
+
+    def clear_connect_app_session
+      Thread.current[:appinstance] = nil
+      request.session_options[:skip] = true
+    end
+
   end
 end

data/app/models/zuora_connect/app_instance_base.rb

@@ -20,6 +20,11 @@ module ZuoraConnect
       self.attr_builder("timezone", ZuoraConnect.configuration.default_time_zone)
       self.attr_builder("locale", ZuoraConnect.configuration.default_locale)
       PaperTrail.whodunnit = "Backend" if defined?(PaperTrail)
+      if defined?(ElasticAPM)
+        ElasticAPM.set_user("Backend")
+        ElasticAPM.set_tag(:app_instance, self.id) 
+      end
+
       if INSTANCE_REFRESH_WINDOW > INSTANCE_REDIS_CACHE_PERIOD
         raise "The instance refresh window cannot be greater than the instance cache period"
       end
@@ -46,6 +51,7 @@ module ZuoraConnect
       self.last_refresh = session["#{self.id}::last_refresh"]
       self.connect_user = session["#{self.id}::user::email"] if session["#{self.id}::user::email"].present?
       PaperTrail.whodunnit = self.connect_user if defined?(PaperTrail)
+      ElasticAPM.set_user(self.connect_user)   if defined?(ElasticAPM) 
       recoverable_session = false
 
       ## DEV MODE TASK DATA MOCKUP

data/lib/zuora_connect/controllers/helpers.rb

@@ -128,7 +128,10 @@ module ZuoraConnect
             @appinstance.new_session(:session => @appinstance.data_lookup(:session => session))
           end
         end
-        PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail) && session["#{@appinstance.id}::user::email"].present? 
+        if session["#{@appinstance.id}::user::email"].present? 
+          ElasticAPM.set_user(session["#{@appinstance.id}::user::email"])  if defined?(ElasticAPM) 
+          PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail)
+        end
         begin
           I18n.locale = session["#{@appinstance.id}::user::locale"] ?  session["#{@appinstance.id}::user::locale"] : @appinstance.locale
         rescue I18n::InvalidLocale => ex
@@ -240,6 +243,7 @@ module ZuoraConnect
           end
           Thread.current[:appinstance] = @appinstance
           PaperTrail.whodunnit = "API User" if defined?(PaperTrail)
+          ElasticAPM.set_user("API User")  if defined?(ElasticAPM) 
           return true
         else
           render text: "Access Denied", status: :unauthorized

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.41"
+  VERSION = "1.7.42"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.41
+  version: 1.7.42
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment