zuora_connect 3.0.0.pre.p → 3.0.0.pre.q

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48c5c6950c9bae664c28fa538b8e5893fc2e477d2d0f1cb609076fe7d465ad76
-  data.tar.gz: 00dabe2bc4bfe823c9c17cd85e335b802c543b84b04b7ced36f9492277d45c18
+  metadata.gz: 9348d7aa606a5c6a3100f94afd22efdb2ad2c8405342708420e0e15753cb4816
+  data.tar.gz: ea4ece99e78a056adb90fd21c4308e374365f0c64036e118fc78e83bdea441b2
 SHA512:
-  metadata.gz: f0a69fc47ca4a1835e8712cc4d88c32d4208407a7bbd7e89df37d2f4bd8915b1a0665d5bf780313b40777c1b4c3c35438e908fcdeabefcca5109e8de7e2dedb6
-  data.tar.gz: 55e492a0fb4cc472ce7fe3f09978032ea48a4eda2f2890efeb3b681b7b55b170b7ed3867d9fab5ba44777c0437d6d4329dd060b0fb24fc959546a0e149ef61fa
+  metadata.gz: ec5539d89ee66fa7d02dc64add2073c5281cd138342e28600f54085d2664bc7db7df2f9995617f5fd79607a80eb3c28e09dd0893b68d22a6355f8965a8333ff3
+  data.tar.gz: a3c30217361264f6c934484e550e26d9183cb7aeec362abd2da73be352dba20564f0b2dc6252af15355d307ff64440b7d9c619eab380e8ce2d0b95116a35cc3f

data/config/initializers/zuora_observability.rb

@@ -0,0 +1,21 @@
+ZuoraObservability.configure do |config|
+  config.zecs_service_hook = lambda do |controller|
+    custom_payload = {}
+    if controller.instance_variable_defined?(:@appinstance)
+      appinstance = controller.instance_variable_get(:@appinstance)
+      if appinstance.logitems.present? && appinstance.logitems.class == Hash
+        ActiveSupport::Deprecation.warn("logitems is deprecated, please use zecs_service_hook. See 'https://gitlab.zeta.tools/extension-products/incubating-projects/zuora_observability/-/blob/master/doc/logging.md' for more details.")
+        custom_payload.merge!(appinstance.logitems)
+      end
+    end
+    custom_payload
+  end
+  config.add_custom_payload_hook do |controller|
+    custom_payload = {}
+    if controller.instance_variable_defined?(:@appinstance)
+      appinstance = controller.instance_variable_get(:@appinstance)
+      custom_payload.merge!({ email: appinstance.connect_user })
+    end
+    custom_payload
+  end
+end

data/lib/zuora_connect.rb

@@ -11,7 +11,6 @@ require 'resque/plugins/custom_logger'
 require 'resque/plugins/app_instance_job'
 require 'metrics/influx/point_value'
 require 'metrics/net'
-require 'mono_logger'
 require 'zuora_connect/zuora_audit'
 require 'active_record'
 require 'zuora_observability'
@@ -88,7 +87,7 @@ module ZuoraConnect
       verify_server_cert: false,
       log_level: Logger::INFO,
       service_name: ENV['DEIS_APP'].present? ? ENV['DEIS_APP'] : Rails.application.class.parent_name,
-      logger: ZuoraObservability::Logger.custom_logger(name: "ElasticAPM", level: MonoLogger::WARN)
+      logger: ZuoraObservability::Logger.custom_logger(name: "ElasticAPM", level: Logger::WARN)
     })
     defaults.merge!({disable_send: true}) if defined?(Rails::Console)
 

data/lib/zuora_connect/configuration.rb

@@ -7,7 +7,7 @@ module ZuoraConnect
 
     attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri
 
-    attr_accessor :dev_mode_logins, :dev_mode_options, :dev_mode_mode, :dev_mode_appinstance, :dev_mode_user, :dev_mode_pass, :dev_mode_admin, :dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :json_logging, :insert_migrations, :skip_connect
+    attr_accessor :dev_mode_logins, :dev_mode_options, :dev_mode_mode, :dev_mode_appinstance, :dev_mode_user, :dev_mode_pass, :dev_mode_admin, :dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :insert_migrations, :skip_connect
 
     def initialize
       @default_locale = :en
@@ -44,7 +44,6 @@ module ZuoraConnect
       @aws_region = "us-west-2"
       @s3_bucket_name = "rbm-apps"
       @s3_folder_name = Rails.application.class.parent_name
-      @json_logging = Rails.env.development? || Rails.env.test? ? false : true
     end
 
     def private_key

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "3.0.0-p"
+  VERSION = "3.0.0-q"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.p
+  version: 3.0.0.pre.q
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-13 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -38,40 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ougai-formatters-customizable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: zuora_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.00
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.00
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.00
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.00
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -92,20 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.16.4
-- !ruby/object:Gem::Dependency
-  name: lograge
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -134,20 +100,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mono_logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -186,16 +138,16 @@ dependencies:
   name: zuora_observability
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre.d
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre.d
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -336,6 +288,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Description of Connect.
 email:
 - connect@zuora.com
@@ -379,6 +373,7 @@ files:
 - config/initializers/resque.rb
 - config/initializers/to_bool.rb
 - config/initializers/unicorn.rb
+- config/initializers/zuora_observability.rb
 - config/routes.rb
 - db/migrate/20100718151733_create_connect_app_instances.rb
 - db/migrate/20101024162319_add_tokens_to_app_instance.rb