Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ScoutAPM, no longer used #1232

Merged
merged 1 commit into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,6 @@ gem 'rails-settings-ui'
gem 'rails-settings-cached', '0.7.2'
gem 'dry-validation', '0.12.3'

gem 'scout_apm'

# Respond to ELB healthchecks in /ping and /ping/
gem 'openstax_healthcheck'

Expand Down
3 changes: 0 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -653,8 +653,6 @@ GEM
sassc (2.0.1)
ffi (~> 1.9)
rake
scout_apm (5.1.0)
parser
sd_notify (0.1.1)
selenium-webdriver (4.9.0)
rexml (~> 3.2, >= 3.2.5)
Expand Down Expand Up @@ -836,7 +834,6 @@ DEPENDENCIES
rubocop-rspec
ruby-debug-ide
sass-rails (~> 5.0)
scout_apm
sd_notify
selenium-webdriver
sentry-rails
Expand Down
2 changes: 0 additions & 2 deletions app/controllers/api/v1/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,6 @@ def index
#{json_schema(Api::V1::UserRepresenter, include: :readable)}
EOS
def show
ScoutHelper.ignore!(0.999)

OSU::AccessPolicy.require_action_allowed!(:read, current_api_user, current_human_user)

SetGdprData.call(user: current_human_user,
Expand Down
8 changes: 0 additions & 8 deletions config/delayed_job_worker_pool.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
require 'etc'
require 'sd_notify'
require 'scout_apm'

# Notify systemd that we are the main process
SdNotify.mainpid Process.pid
Expand Down Expand Up @@ -84,10 +83,3 @@ def shutdown(signal)
end
end
end

# Make sure scout_apm doesn't start until we fork
::ScoutApm::BackgroundJobIntegrations::DelayedJob.class_exec do
def forking?
true
end
end
1 change: 0 additions & 1 deletion config/environment.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Load the Rails application
require_relative 'application'

require 'scout_helper'
require 'env_utilities'
require 'token_maker'
require 'markdown_wrapper'
Expand Down
1 change: 0 additions & 1 deletion config/initializers/doorkeeper_models.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ def create_application_user
Doorkeeper::TokensController.class_exec do
alias_method :original_create, :create # before_action not available
def create
ScoutHelper.ignore!(0.99)
original_create
end
end
Expand Down
37 changes: 0 additions & 37 deletions config/scout_apm.yml

This file was deleted.

7 changes: 0 additions & 7 deletions lib/scout_helper.rb

This file was deleted.

Loading