zuora_connect 1.7.81l → 1.7.81m

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c43e285b6014c8564411634a19a82c72ba4197dcee3a045eb349c9cdfe704fb8
-  data.tar.gz: 917d4c180a84cb55bb349745ab2c92ef59291f2f7be3af1c9b7755179e2f2518
+  metadata.gz: dcd4ab73cc717bce5eac02625dce3b529e47b4e67115b1a021920e92c524a125
+  data.tar.gz: d1b3c9a49d47f3f9e45e1806388f3504d9b085940c0850e82f7966f185272a5e
 SHA512:
-  metadata.gz: c1e9f6b2412914ef452554648a4d5a8af491e64db9b3264c4192b2ba3042e04e9db430b12a29da135022cfee0cd1d4ce59e265ecb771c2ad05985daec1bb4d57
-  data.tar.gz: '0920d9f012d4b02a6675833e1e4e9a33fac216857a52802679f92da74502bbd6b0f588a43d0179e80f28fac5b6f82c132480220361ffdfd722e053cc07a5fcae'
+  metadata.gz: c22ad5afdcaef9bde0f1ad8a37f90dd313a286270e548480520940cc0570517c37309da67285a64f2255985e67796fc76671e8e63d9a8b3e9756463ea19ab655
+  data.tar.gz: a834c3f09e0a698255ed9a1bacf8784175d27e4cf2bc2dd2341ef8f3a87f02a3929d04a767a97ec968624820eaf8882c57da05abf87d68d56003fb69cdf3fab1

data/app/models/zuora_connect/app_instance_base.rb

@@ -27,7 +27,7 @@ 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)
+      if defined?(ElasticAPM) && ElasticAPM.running?
         ElasticAPM.set_user("Backend")
         ElasticAPM.set_tag(:app_instance, self.id) 
       end
@@ -93,7 +93,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) 
+      ElasticAPM.set_user(self.connect_user)   if defined?(ElasticAPM) && ElasticAPM.running?
       recoverable_session = false
 
       ## DEV MODE TASK DATA MOCKUP
@@ -186,7 +186,7 @@ module ZuoraConnect
       Time.zone = self.timezone
       tenants = self.task_data.dig('tenant_ids') || []
       organizations = self.task_data.dig('organizations') || []
-      if defined?(ElasticAPM) 
+      if defined?(ElasticAPM) && ElasticAPM.running?
         ElasticAPM.set_tag(:tenant_id, tenants.first) 
         ElasticAPM.set_tag(:organization, organizations.first) 
       end

data/config/initializers/elastic_apm.rb

@@ -1,6 +1,4 @@
-ElasticAPM::Agent.stop if ENV["ENABLE_APM"].to_s.downcase != "true"
-
-if defined?(ElasticAPM) && !ElasticAPM::Agent.instance.nil?
+if defined?(ElasticAPM) && ElasticAPM.running?
   if !defined?(Rails::Console)
     ElasticAPM.agent.config.disable_send = false
   else

data/lib/zuora_connect/controllers/helpers.rb

@@ -8,7 +8,7 @@ module ZuoraConnect
         #Skip session for api requests
         Thread.current[:appinstance] = nil
         request.session_options[:skip] = true
-        ElasticAPM.set_tag(:trace_id, request.uuid) if defined?(ElasticAPM)
+        ElasticAPM.set_tag(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
 
         start_time = Time.now
         if request.headers["API-Token"].present?
@@ -72,7 +72,7 @@ module ZuoraConnect
       end
 
       def authenticate_connect_app_request
-        ElasticAPM.set_tag(:trace_id, request.uuid) if defined?(ElasticAPM)
+        ElasticAPM.set_tag(:trace_id, request.uuid) if defined?(ElasticAPM) && ElasticAPM.running?
         Thread.current[:appinstance] = nil
         if params[:app_instance_ids].present? && !params[:app_instance_id].present?
           begin
@@ -136,7 +136,7 @@ module ZuoraConnect
           end
         end
         if session["#{@appinstance.id}::user::email"].present? 
-          ElasticAPM.set_user(session["#{@appinstance.id}::user::email"])  if defined?(ElasticAPM) 
+          ElasticAPM.set_user(session["#{@appinstance.id}::user::email"])  if defined?(ElasticAPM) && ElasticAPM.running?
           PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail)
         end
         begin
@@ -250,7 +250,7 @@ module ZuoraConnect
           end
           Thread.current[:appinstance] = @appinstance
           PaperTrail.whodunnit = "API User" if defined?(PaperTrail)
-          ElasticAPM.set_user("API User")  if defined?(ElasticAPM) 
+          ElasticAPM.set_user("API User")  if defined?(ElasticAPM) && ElasticAPM.running?
           return true
         else
           render text: "Access Denied", status: :unauthorized

data/lib/zuora_connect/engine.rb

@@ -3,7 +3,6 @@ require 'zuora_connect'
 require 'apartment'
 require 'httparty'
 require 'zuora_api'
-require 'elastic_apm'
 
 module ZuoraConnect
   class Engine < ::Rails::Engine

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.81l"
+  VERSION = "1.7.81m"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.81l
+  version: 1.7.81m
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -64,20 +64,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.4
-- !ruby/object:Gem::Dependency
-  name: elastic-apm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement