zuora_connect 1.5.40c → 1.5.40d

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 753cf39fdb1d819cc2bc6e2d4feb9d4cbf147d7a
-  data.tar.gz: 2ea5a6277408d932ee5257cf1726ec4b2c2dd0da
+  metadata.gz: e00ff173a2094215c2333b04afdc4bef45391f40
+  data.tar.gz: b0d443fe6d3f688e31c8bf68ea7ac233301d4421
 SHA512:
-  metadata.gz: f9f4d8c85aa8daa796a330890400252c0505b2b7d0428353fd75169629da93b03f89f1afff409050e7c31866aa40990368c46b9a6e74c73d43880ed310966649
-  data.tar.gz: e3c2678033874dc7403d40f4c661fb7ee4ee66172e6b249d760c584bf2279208a224519e2c21ce91bd4b134c951631bd7c46b8ab2f5a54a17974a8727f57e6ac
+  metadata.gz: 4bf28a84c95743029118cec66b542afb503f3364e28ff195bba51c2a45be0076087db63a997353ebe48b2757f9dcb1743d4b77a917345470fc929f6def7a32fb
+  data.tar.gz: 31676bb71346262a4001b35386dbf2dee2a3ff796806b0792164e5f6a6368193c8a3c5705e55a0f090fd6ec82871a7ba168921e5d55313394a2a6dc14bf7f8a0

data/app/controllers/zuora_connect/static_controller.rb

@@ -2,7 +2,6 @@ module ZuoraConnect
   class StaticController < ApplicationController
     before_filter :authenticate_connect_app_request, :except => [:health, :session_error, :invalid_app_instance_error]
     after_filter :persist_connect_app_session,  :except => [:health, :session_error, :invalid_app_instance_error]
-    
     def session_error
       respond_to do |format|
         format.html
@@ -23,6 +22,5 @@ module ZuoraConnect
         status: 200
       }, status: 200
     end
-
   end
 end

data/app/models/zuora_connect/app_instance_base.rb

@@ -24,21 +24,6 @@ module ZuoraConnect
       self.apartment_switch(nil, true)
     end
 
-
-    # method for writing outbound metrics
-
-    def telegraf_time(endpoint_name: nil, &block)
-
-      response_time = Benchmark.realtime(&block)
-      p_type = Middleware::get_process_type
-
-      ZuoraConnect.configuration.telegraf_client.write(ZuoraConnect.configuration.app_name_outbound,
-          tags: {endpoint: endpoint_name, instance_id: self.id, process_type: p_type},
-          values: {response_time: response_time, caller: block.source_location[0]})
-    end
-
-
-
     def apartment_switch(method = nil, migrate = false)
       begin
         Apartment::Tenant.switch!(self.id) if self.persisted?
@@ -759,7 +744,6 @@ module ZuoraConnect
       super
     end
 
-
     method_hook :refresh, :updateOption, :update_logins, :before => :check_oauth_state
     method_hook :new_session, :refresh, :build_task, :after => :apartment_switch
   end

data/lib/zuora_connect.rb

@@ -4,11 +4,9 @@ require 'zuora_connect/exceptions'
 require 'zuora_connect/controllers/helpers'
 require 'zuora_connect/views/helpers'
 require 'zuora_connect/railtie'
-require 'resque/additions'
+require 'resque/additions' 
 require 'resque/dynamic_queues'
 require 'resque/self_lookup'
-require 'prometheus/client'
-
 
 module ZuoraConnect
   class << self
@@ -37,10 +35,4 @@ module ZuoraConnect
 
     return configuration
   end
-
-
-
-
-
-
 end

data/lib/zuora_connect/configuration.rb

@@ -1,6 +1,6 @@
 module ZuoraConnect
   class Configuration
-    attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri,:use_s3, :default_locale,:dev_mode_appinstance ,:dev_mode_admin, :dev_mode_user, :dev_mode_pass, :default_time_zone,:delayed_job,:url, :private_key, :dev_mode_logins,:dev_mode_mode, :dev_mode_options, :mode, :timeout,:dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :additional_apartment_models, :telegraf_endpoint, :enable_metrics_flag, :telegraf_client, :custom_prometheus_update_block, :app_name_inbound, :app_name_outbound
+    attr_accessor :oauth_client_id, :oauth_client_secret, :oauth_client_redirect_uri,:use_s3, :default_locale,:dev_mode_appinstance ,:dev_mode_admin, :dev_mode_user, :dev_mode_pass, :default_time_zone,:delayed_job,:url, :private_key, :dev_mode_logins,:dev_mode_mode, :dev_mode_options, :mode, :timeout,:dev_mode_secret_access_key,:dev_mode_access_key_id,:aws_region, :s3_bucket_name, :s3_folder_name, :additional_apartment_models
 
     def initialize
       @default_locale = :en
@@ -11,13 +11,6 @@ module ZuoraConnect
       @use_s3 = false
       @private_key = ENV["CONNECT_KEY"]
       @additional_apartment_models = []
-      @telegraf_endpoint = 'udp://telegraf-ds.deis.svc.cluster.local:8094'
-      @enable_metrics_flag =  true
-      @telegraf_client = Telegraf::Agent.new @telegraf_endpoint
-
-      # Setting the app name for telegraf write
-      @app_name_inbound = ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}-inbound" : "#{Rails.application.class.parent_name}-inbound"
-      @app_name_outbound = ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}-outbound" : "#{Rails.application.class.parent_name}-outbound"
 
       # OAuth Settings
       @oauth_client_id = ""
@@ -37,10 +30,6 @@ module ZuoraConnect
       @aws_region = "us-west-2"
       @s3_bucket_name = "rbm-apps"
       @s3_folder_name = Rails.application.class.parent_name
-
-      #Prometheus
-      @custom_prometheus_update_block = nil
-
     end
 
     def private_key

data/lib/zuora_connect/controllers/helpers.rb

@@ -1,6 +1,4 @@
 require 'apartment/migrator'
-require 'benchmark'
-
 module ZuoraConnect
   module Controllers
     module Helpers
@@ -38,14 +36,14 @@ module ZuoraConnect
         else
           setup_instance_via_dev_mode
         end
-        #Call .data_lookup with the current session to retrieve session. In some cases session may be stored/cache in redis
+        #Call .data_lookup with the current session to retrieve session. In some cases session may be stored/cache in redis 
         #so data lookup provides a model method that can be overriden per app.
         if params[:controller] != 'zuora_connect/api/v1/app_instance' && params[:action] != 'drop'
           if @appinstance.new_session_for_ui_requests(:params => params)
             @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?
+        PaperTrail.whodunnit =  session["#{@appinstance.id}::user::email"] if defined?(PaperTrail) && session["#{@appinstance.id}::user::email"].present? 
         begin
           I18n.locale = session["#{@appinstance.id}::user::locale"] ?  session["#{@appinstance.id}::user::locale"] : @appinstance.locale
         rescue I18n::InvalidLocale => ex
@@ -114,7 +112,7 @@ module ZuoraConnect
           else
             raise ZuoraConnect::Exceptions::AccessDenied.new("Authorization mistmatch. Possible tampering")
           end
-        end
+        end     
       end
 
       def setup_instance_via_session

data/lib/zuora_connect/railtie.rb

@@ -1,10 +1,5 @@
-require 'middleware/metrics_middleware'
-
 module ZuoraConnect
   class Railtie < Rails::Railtie
-    require 'prometheus/middleware/exporter'
-
-
     config.before_initialize do
       version = Rails.version
       if version >= "5.0.0"
@@ -17,25 +12,6 @@ module ZuoraConnect
       ::Rails.configuration.action_dispatch.x_sendfile_header = nil
     end
 
-    # Base object not being loaded at this point for some reason
-    if ZuoraConnect::Configuration.new.enable_metrics_flag == true
-
-      initializer "prometheus.configure_rails_initialization" do |app|
-        app.middleware.use Prometheus::Middleware::Exporter,(options ={:path => '/connect/internal/metrics'})
-      end
-
-      initializer "zuora_connect.configure_rails_initialization" do |app|
-        app.middleware.insert_after Rack::Sendfile, Middleware::MetricsMiddleware
-      end
-
-      # hook to process_action
-      ActiveSupport::Notifications.subscribe('process_action.action_controller', Middleware::PageRequest.new)
-
-
-
-    end
-
-
     initializer(:rails_stdout_logging, before: :initialize_logger) do
       if Rails.env != 'development' && !ENV['DEIS_APP'].blank?
         require 'lograge'

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.5.40c"
+  VERSION = "1.5.40d"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.40c
+  version: 1.5.40d
 platform: ruby
 authors:
 - Connect Team
@@ -106,34 +106,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: telegraf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: prometheus-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +238,6 @@ files:
 - app/views/zuora_connect/static/session_error.html.erb
 - config/initializers/apartment.rb
 - config/initializers/object_method_hooks.rb
-- config/initializers/prometheus.rb
 - config/initializers/redis.rb
 - config/initializers/resque.rb
 - config/initializers/to_bool.rb
@@ -281,7 +252,6 @@ files:
 - db/migrate/20110503003603_add_catalog_mappings_to_app_instance.rb
 - db/migrate/20110503003604_catalog_default.rb
 - db/migrate/20180301052853_add_catalog_attempted_at.rb
-- lib/middleware/metrics_middleware.rb
 - lib/resque/additions.rb
 - lib/resque/dynamic_queues.rb
 - lib/resque/self_lookup.rb

data/config/initializers/prometheus.rb

@@ -1,39 +0,0 @@
-module Prometheus
-  require "zuora_connect/version"
-  require "zuora_api/version"
-
-  app_name = ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}" : "#{Rails.application.class.parent_name}"
-  # Create a default Prometheus registry for our metrics.
-  prometheus = Prometheus::Client.registry
-
-  # Create your metrics.
-  ZUORA_VERSION = Prometheus::Client::Gauge.new(:zuora_version, 'The current Zuora Gem version.')
-  CONNECT_VERSION = Prometheus::Client::Gauge.new(:gem_version, 'The current Connect Gem version.')
-  RAILS_VERSION = Prometheus::Client::Gauge.new(:rails_version, 'The current Rails version.')
-  RUBY_V = Prometheus::Client::Gauge.new(:ruby_version, 'The current Ruby version.')
-
-  # Register your metrics with the registry we previously created.
-  prometheus.register(ZUORA_VERSION);ZUORA_VERSION.set({version:ZuoraAPI::VERSION,name:app_name},0)
-  prometheus.register(CONNECT_VERSION);CONNECT_VERSION.set({version:ZuoraConnect::VERSION,name:app_name},0)
-  prometheus.register(RAILS_VERSION);RAILS_VERSION.set({version:Rails.version,name:app_name},0)
-  prometheus.register(RUBY_V);RUBY_V.set({version:RUBY_VERSION,name:app_name},0)
-
-  # Do they have resque jobs?
-  if defined? Resque.redis
-    REDIS_CONNECTION = Prometheus::Client::Gauge.new(:redis_connection, 'The status of the redis connection, 0 or 1')
-    FINISHED_JOBS = Prometheus::Client::Gauge.new(:finished_jobs, 'Done resque jobs')
-    WORKERS = Prometheus::Client::Gauge.new(:workers, 'Total resque workers')
-    ACTIVE_WORKERS = Prometheus::Client::Gauge.new(:active_workers, 'Active resque workers')
-    FAILED_JOBS = Prometheus::Client::Gauge.new(:failed_jobs, 'Failed resque jobs')
-    PENDING_JOBS = Prometheus::Client::Gauge.new(:pending_jobs, 'Pending resque jobs')
-
-    prometheus.register(REDIS_CONNECTION)
-    prometheus.register(FINISHED_JOBS)
-    prometheus.register(ACTIVE_WORKERS)
-    prometheus.register(WORKERS)
-    prometheus.register(FAILED_JOBS)
-    prometheus.register(PENDING_JOBS)
-
-  end
-
-end

data/lib/middleware/metrics_middleware.rb

@@ -1,130 +0,0 @@
-module Middleware
-  require 'uri'
-
-  # Returns the process type if any
-  def self.get_process_type
-    p_type = nil
-    if ENV['HOSTNAME']
-      temp = ENV['HOSTNAME'].split(ENV['DEIS_APP'])[1]
-      temp = temp.split(/(-[0-9a-zA-Z]{5})$/)[0] # remove the 5 char hash
-      p_type = temp[1, temp.rindex("-")-1]
-    end
-    return p_type
-  end
-
-
-  # Write to telegraf
-  def self.write_to_telegraf(endpoint_name: nil, method_name: nil, status_code: nil, response_time: nil, db_runtime: nil, view_runtime: nil, content_type: nil)
-
-    # Getting the process type
-    p_type = Middleware::get_process_type
-
-    # Separately handling 200 and non 200 as influx does not accept nil as a value
-    if db_runtime && view_runtime
-      # 200 requests
-      ZuoraConnect.configuration.telegraf_client.write(ZuoraConnect.configuration.app_name_inbound,
-          tags: {endpoint: endpoint_name, "content-type": content_type, method: method_name, status: status_code, process_type: p_type},
-          values: {response_time: response_time, db_time: db_runtime, view_time: view_runtime})
-    else
-      # non 200 requests
-      ZuoraConnect.configuration.telegraf_client.write(ZuoraConnect.configuration.app_name_inbound,
-          tags: {endpoint: endpoint_name, "content-type": content_type, method: method_name, status: status_code, process_type: p_type},
-          values: {response_time: response_time})
-    end
-    
-  end
-
-
-  # Object of this class is passed to the ActiveSupport::Notification hook
-  class PageRequest
-
-    # This method is triggered when a non error page is loaded (not 404, 500)
-    def call(name, started, finished, unique_id, payload)
-
-      # If the url contains any css or JavaScript files then do not collect metrics for them
-      block_words = ["css", "assets", "jpg", "png", "jpeg", "ico"]
-      if block_words.any? { |word| payload[:path].include?(word) }
-        return nil
-      end
-
-      # Getting the endpoint and the content_type
-      request_path = URI(payload[:headers]['REQUEST_URI']).path.split(".")[0]
-      content_type = ((payload[:headers]["action_controller.instance"].instance_variable_get :@_response).instance_variable_get :@header)["Content-Type"]
-      content_type = content_type.split(";")[0]
-
-      response_time = finished-started
-
-      # Write to telegraf
-      Middleware.write_to_telegraf("endpoint_name": request_path, "method_name": payload[:method], "status_code": payload[:status], "response_time": response_time, "db_runtime": payload[:db_runtime], "view_runtime": payload[:view_runtime], "content_type": content_type)
-
-    end
-  end
-
-
-  class MetricsMiddleware
-
-    require "zuora_connect/version"
-    require "zuora_api/version"
-    require "telegraf"
-
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      start_time = Time.now
-      @status, @headers, @response = @app.call(env)
-
-      # If the url contains any CSS or JavaScript files then do not collect metrics for them
-      block_words = ["css", "assets", "jpg", "png", "jpeg", "ico"]
-      if block_words.any? { |word| env['PATH_INFO'].include?(word) }
-        return [@status, @headers, @response]
-      end
-
-      end_time = Time.now
-      response_time = end_time - start_time
-
-      #Prometheus Stuff
-      if env['PATH_INFO'] == '/connect/internal/metrics'
-
-        #Do something before each scrape
-        if defined? Resque.redis
-
-          app_name = ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}" : "#{Rails.application.class.parent_name}"
-          begin
-
-            Resque.redis.ping
-
-            Prometheus::REDIS_CONNECTION.set({connection:'redis',name:app_name},1)
-            Prometheus::FINISHED_JOBS.set({type:'resque',name:app_name},Resque.info[:processed])
-            Prometheus::PENDING_JOBS.set({type:'resque',name:app_name},Resque.info[:pending])
-            Prometheus::ACTIVE_WORKERS.set({type:'resque',name:app_name},Resque.info[:working])
-            Prometheus::WORKERS.set({type:'resque',name:app_name},Resque.info[:workers])
-            Prometheus::FAILED_JOBS.set({type:'resque',name:app_name},Resque.info[:failed])
-
-          rescue Redis::CannotConnectError
-              Prometheus::REDIS_CONNECTION.set({connection:'redis',name:app_name},0)
-          end
-
-          if ZuoraConnect.configuration.custom_prometheus_update_block != nil
-            ZuoraConnect.configuration.custom_prometheus_update_block.call()
-          end
-        end
-
-      end
-
-      # Writing to telegraf: Handle 404 and 500 requests
-      if @status != 200
-        # Getting the endpoint and content_type
-        request_path = URI(env['REQUEST_URI']).path.split(".")[0]
-        content_type = @headers['Content-Type'].split(';')[0] if @headers['Content-Type']
-        Middleware::write_to_telegraf("endpoint_name": request_path, "method_name": env['REQUEST_METHOD'], "status_code": @status, "response_time": response_time,  "content_type": content_type)
-      end
-
-      [@status, @headers, @response]
-
-    end
-
-  end
-
-end