zuora_connect 1.5.40t → 1.5.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f509003888ea6817ab3c9a2a3a81fd14b4b7cdc0
-  data.tar.gz: 1de0e97a460e613c110507a79b6a941daac9001f
+  metadata.gz: 3c7121413b5f1a0613786c3de3c859c9a174c340
+  data.tar.gz: 53249355807a2420ede58402a161828c912da299
 SHA512:
-  metadata.gz: 5b82d2b3ecd3b10f5b623ba75d85acb7e02bf452576179f07b91b810dc9fa93dc500cb2a88858c42ed3b4a08baffdecf433939069a8246c922f999c61dbffcdc
-  data.tar.gz: e04c8bb04fbb1c6634dcdc676028e4cddffc8caef65dce274d6abbe55c85ebac86cb13c055f74fa091e25cbd2dd262e5ca09c8e73a1f5af94643ab23fd164371
+  metadata.gz: 3395cacd984c09bb2dc5f14f28ff1423d79d4e0cf80a05ac70f5934013d205d5efc216754b5b9d2d1c03a0b61c849e9dc4252e9ecfd12371dcb97721db676a12
+  data.tar.gz: 5b030d3b12c511cd5ec14fad87545e2e4fe43019c42c4d353a483aef2a2aa2f1509298f9e5db399b54d385f77b42667725634206d7eec381c969e1bc46b6f721

data/app/controllers/zuora_connect/static_controller.rb

@@ -1,8 +1,7 @@
 module ZuoraConnect
   class StaticController < ApplicationController
-    before_filter :authenticate_connect_app_request, :except => [:metrics, :health, :session_error, :invalid_app_instance_error]
-    after_filter :persist_connect_app_session,  :except => [:metrics, :health, :session_error, :invalid_app_instance_error]
-
+    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
@@ -17,17 +16,11 @@ module ZuoraConnect
       end
     end
 
-    def metrics
-      type = params[:type].present? ? params[:type] : "versions"
-      render json: ZuoraConnect::AppInstanceBase.get_metrics(type), status: 200
-    end
-
     def health
       render json: {
         message: "Alive",
         status: 200
       }, status: 200
     end
-
   end
 end

data/app/models/zuora_connect/app_instance_base.rb

@@ -1,5 +1,4 @@
 module ZuoraConnect
-  require "uri"
   class AppInstanceBase < ActiveRecord::Base
     default_scope {select(ZuoraConnect::AppInstance.column_names.delete_if {|x| ["catalog_mapping", "catalog"].include?(x) }) }
     after_initialize :init
@@ -25,109 +24,6 @@ module ZuoraConnect
       self.apartment_switch(nil, true)
     end
 
-
-    # Methods for writing Telegraf metrics
-
-    # Returns the process type if any
-    def self.get_process_type
-      p_type = nil
-      if ENV['HOSTNAME'] && ENV['DEIS_APP']
-        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, direction: nil, error_type: nil, app_instance: nil, function_name: nil)
-
-      # To avoid writing metrics from rspec tests
-      if ENV['DEIS_APP']
-        # Getting the process type
-        p_type = ZuoraConnect::AppInstanceBase.get_process_type
-
-        if direction == "inbound"
-          Thread.current[:appinstance].present? ? app_instance = Thread.current[:appinstance].id : app_instance = 0
-
-          # Separately handling 200 and non 200 as influx does not accept nil as a value
-          if db_runtime && view_runtime
-            # 200 requests
-            begin
-              ZuoraConnect.configuration.telegraf_client.write(ZuoraConnect.configuration.influxdb_series_name_inbound,
-                  tags: {"app_name": "#{ZuoraConnect.configuration.app_name}", "controller_action": endpoint_name, "content-type": content_type, method: method_name, status: status_code, process_type: p_type, "app_instance": app_instance},
-                  values: {response_time: response_time, db_time: db_runtime, view_time: view_runtime})
-            rescue => e
-              raise e
-            end
-          else
-            # non 200 requests
-            begin
-              ZuoraConnect.configuration.telegraf_client.write(ZuoraConnect.configuration.influxdb_series_name_inbound,
-                  tags: {"app_name": "#{ZuoraConnect.configuration.app_name}", "controller_action": endpoint_name, "content-type": content_type, method: method_name, status: status_code, process_type: p_type, "app_instance": app_instance},
-                  values: {response_time: response_time})
-            rescue=> e
-              raise e
-            end
-          end
-
-        elsif direction == "outbound"
-          # if there is an error
-          if error_type
-            begin
-              ZuoraConnect.configuration.telegraf_client.write(ZuoraConnect.configuration.influxdb_series_name_outbound,
-                  tags: {"app_name": "#{ZuoraConnect.configuration.app_name}", endpoint: endpoint_name, status: status_code, process_type: p_type, "app_instance": app_instance, "function_name": function_name, method: method_name, "error_type": error_type},
-                  values: {response_time: response_time})
-            rescue => e
-              raise e
-            end
-          else
-            begin
-              ZuoraConnect.configuration.telegraf_client.write(ZuoraConnect.configuration.influxdb_series_name_outbound,
-                  tags: {"app_name": "#{ZuoraConnect.configuration.app_name}", endpoint: endpoint_name, status: status_code, process_type: p_type, "app_instance": app_instance, "function_name": function_name, method: method_name},
-                  values: {response_time: response_time})
-            rescue => e
-              raise e
-            end
-          end
-        end
-      end
-    end
-
-    def self.get_metrics(type)
-      namespace = ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}" : "#{Rails.application.class.parent_name}"
-
-      data = {}
-
-      if type == "versions"
-        data = {
-          app_name: namespace,
-          Version_Gem: ZuoraConnect::VERSION,
-          Version_Zuora: ZuoraAPI::VERSION ,
-          Version_Ruby: RUBY_VERSION,
-          Version_Rails: Rails.version,
-          hold: 1
-        }
-      elsif type == "stats"
-        begin
-          Resque.redis.ping
-          data = {
-            app_name: namespace,
-            Resque:{
-              Jobs_Finished: Resque.info[:processed] ,
-              Jobs_Failed: Resque.info[:failed],
-              Jobs_Pending: Resque.info[:pending],
-              Workers_Active: Resque.info[:working],
-              Workers_Total: Resque.info[:workers]
-            }
-          }
-        rescue
-        end
-      end
-      return data.to_json
-    end
-
-
     def apartment_switch(method = nil, migrate = false)
       begin
         Apartment::Tenant.switch!(self.id) if self.persisted?
@@ -221,7 +117,7 @@ module ZuoraConnect
 
     def refresh(session = nil)
       refresh_count ||= 0
-      error_type = ""
+
       start = Time.now
       response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}.json",:body => {:access_token => self.access_token})
       response_time = Time.now - start
@@ -241,7 +137,6 @@ module ZuoraConnect
         Rails.logger.info("[#{self.id}] REFRESH TASK - #{ex.class} Retrying(#{refresh_count})")
         retry
       else
-        error_type = "#{ex.class}"
         Rails.logger.fatal("[#{self.id}] REFRESH TASK - #{ex.class} Failed #{refresh_count}x")
         raise
       end
@@ -253,16 +148,9 @@ module ZuoraConnect
         end
         retry
       else
-        error_type = "#{ex.class}"
         Rails.logger.fatal("[#{self.id}] REFRESH TASK - Failed #{refresh_count}x")
         raise
       end
-    ensure
-      # Writing to telegraf
-      status_code = response.code if response
-      endpoint_name = URI(ZuoraConnect.configuration.url).host
-      Thread.current[:appinstance].present? ? app_instance = Thread.current[:appinstance].id : app_instance = 0
-      ZuoraConnect::AppInstanceBase.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "GET", "app_instance": app_instance)
     end
 
     #### START Task Mathods ####
@@ -302,28 +190,13 @@ module ZuoraConnect
       end
 
       def updateOption(optionId, value)
-        begin
-          start_time = Time.now
-          response = HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/application_options/#{optionId}/edit?value=#{value}",:body => {:access_token => self.username})
-        rescue => e
-          error_type = "#{e.class}"
-        ensure
-          end_time = Time.now
-          response_time = end_time - start_time
-          status_code = response.code if response
-          endpoint_name = URI(ZuoraConnect.configuration.url).host
-          Thread.current[:appinstance].present? ? app_instance = Thread.current[:appinstance].id : app_instance = 0
-          ZuoraConnect::AppInstanceBase.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "GET", "app_instance": app_instance)
-          return response
-        end
+        return HTTParty.get(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/application_options/#{optionId}/edit?value=#{value}",:body => {:access_token => self.username})
       end
 
       #This can update an existing login, add a new login, change to another existing login
       #EXAMPLE: {"name": "ftp_login_14","username": "ftplogin7","tenant_type": "Custom","password": "test2","url": "www.ftp.com","custom_data": {  "path": "/var/usr/test"}}
       def update_logins(options)
         update_login_count ||= 0
-        start_time = Time.now
-        error_type = ""
         response = HTTParty.post(ZuoraConnect.configuration.url + "/api/#{self.api_version}/tools/tasks/#{self.id}/logins",:body => {:access_token => self.username}.merge(options))
         parsed_json =  JSON.parse(response.body)
         if response.code == 200
@@ -338,11 +211,10 @@ module ZuoraConnect
         else
           raise ZuoraConnect::Exceptions::ConnectCommunicationError.new("Error Communicating with Connect", response.body, response.code)
         end
-      rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError => ex
+      rescue Net::ReadTimeout, Net::OpenTimeout, Errno::EPIPE, Errno::ECONNRESET, Errno::ECONNREFUSED, SocketError
         if (update_login_count += 1) < 3
           retry
         else
-          error_type = "#{ex.class}"
           raise
         end
       rescue ZuoraConnect::Exceptions::ConnectCommunicationError => ex
@@ -352,16 +224,8 @@ module ZuoraConnect
           end
           retry
         else
-          error_type = "#{ex.class}"
           raise
         end
-      ensure
-        end_time = Time.now
-        response_time = end_time - start_time
-        status_code = response.code if response
-        endpoint_name = URI(ZuoraConnect.configuration.url).host
-        Thread.current[:appinstance].present? ? app_instance = Thread.current[:appinstance].id : app_instance = 0
-        ZuoraConnect::AppInstanceBase.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "POST", "app_instance": app_instance)
       end
     #### END Task Mathods ####
 
@@ -380,7 +244,7 @@ module ZuoraConnect
 
       def refresh_oauth
         refresh_oauth_count ||= 0
-        error_type = ""
+
         start = Time.now
         params = {
                   :grant_type => "refresh_token",
@@ -407,7 +271,6 @@ module ZuoraConnect
           Rails.logger.info("[#{self.id}] REFRESH OAUTH - #{ex.class} Retrying(#{refresh_oauth_count})")
           retry
         else
-          error_type = "#{ex.class}"
           Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - #{ex.class} Failed #{refresh_oauth_count}x")
           raise
         end
@@ -422,15 +285,9 @@ module ZuoraConnect
           Rails.logger.info("[#{self.id}] REFRESH OAUTH - Failed Retrying(#{refresh_oauth_count})")
           retry
         else
-          error_type = "#{ex.class}"
           Rails.logger.fatal("[#{self.id}] REFRESH OAUTH - Failed #{refresh_oauth_count}x")
           raise
         end
-      ensure
-        status_code = response.code if response
-        endpoint_name = URI(ZuoraConnect.configuration.url).host
-        Thread.current[:appinstance].present? ? app_instance = Thread.current[:appinstance].id : app_instance = 0
-        ZuoraConnect::AppInstanceBase.write_to_telegraf("response_time": response_time, "status_code": status_code, "endpoint_name": endpoint_name, "direction": "outbound", "error_type": error_type, "function_name": "#{self.class}##{__method__}", "method_name": "POST", "app_instance": app_instance)
       end
     #### END Connect OAUTH methods ####
 
@@ -887,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/config/routes.rb

@@ -1,6 +1,5 @@
 ZuoraConnect::Engine.routes.draw do
   get '/health' => 'static#health'
-  get '/internal/data' => 'static#metrics'
   get '/invalid_session' => 'static#session_error', :as => :invalid_session
   get '/invalid_instance' => "static#invalid_app_instance_error", :as => :invalid_instance
   namespace :api do

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, :influxdb_series_name_inbound, :influxdb_series_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,14 +11,6 @@ module ZuoraConnect
       @use_s3 = false
       @private_key = ENV["CONNECT_KEY"]
       @additional_apartment_models = []
-      @telegraf_endpoint = 'udp://telegraf-app-metrics.monitoring.svc.cluster.local:8094'
-      @enable_metrics_flag =  true
-      @telegraf_client = Telegraf::Agent.new @telegraf_endpoint
-
-      # Setting the app name for telegraf write
-      @app_name = ENV['DEIS_APP'].present? ? "#{ENV['DEIS_APP']}" : "#{Rails.application.class.parent_name}"
-      @influxdb_series_name_inbound = "request-inbound"
-      @influxdb_series_name_outbound = "request-outbound"
 
       # OAuth Settings
       @oauth_client_id = ""
@@ -38,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,23 +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.40t"
+  VERSION = "1.5.40"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.5.40t
+  version: 1.5.40
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.12b
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.12b
+        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
@@ -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
@@ -349,9 +319,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8

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,110 +0,0 @@
-module Middleware
-  require 'uri'
-
-  # 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)
-    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
-      content_hash = {:html => "text/html", :js => "application/javascript", :json => "application/json"}
-      content_hash.key?(payload[:format]) ? content_type = content_hash[payload[:format]] : content_type = payload[:format]
-      request_path = "#{payload[:controller]}##{payload[:action]}"
-      response_time = finished-started
-
-      # payloads with 500 requests do not have status as it is not set by the controller
-      # https://github.com/rails/rails/issues/33335
-      status_code = payload[:status] ? payload[:status] : payload[:exception_object].present? ? 500 : ""
-
-      # Write to telegraf
-      ZuoraConnect::AppInstanceBase.write_to_telegraf("endpoint_name": request_path, "method_name": payload[:method], "status_code": status_code, "response_time": response_time, "db_runtime": payload[:db_runtime].to_f, "view_runtime": payload[:view_runtime], "content_type": content_type, "direction": "inbound")
-
-    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)
-      end_time = Time.now
-
-      # 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
-
-
-      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 == 404 || @status == 304
-        # Getting the endpoint and content_type
-        request_path = @status == 404 ? "ActionController#RoutingError" : env["action_controller.instance"].present? ? "#{env["action_controller.instance"].class}##{env["action_controller.instance"].action_name}" : ""
-
-        # Uncomment following block of code for handling engine requests/requests without controller
-        # else
-        #   # Handling requests which do not have controllers (engines)
-        #   if env["SCRIPT_NAME"].present?
-        #     controller_path = "#{env['SCRIPT_NAME'][1..-1]}"
-        #     controller_path = controller_path.sub("/", "::")
-        #     request_path = "#{controller_path}#UnknownAction"
-        #   end
-
-        content_type = @headers['Content-Type'].split(';')[0] if @headers['Content-Type']
-        ZuoraConnect::AppInstanceBase.write_to_telegraf("endpoint_name": request_path, "method_name": env['REQUEST_METHOD'], "status_code": @status, "response_time": response_time,  "content_type": content_type, "direction": "inbound") if request_path.present?
-      end
-
-      [@status, @headers, @response]
-
-    end
-
-  end
-
-end