Merge pull request #686 from trade-tariff/HOTT-3958-remove-nr

HOTT-3958: Remove New Relic
trade-tariff · Sep 7, 2023 · 2973aaa · 2973aaa
2 parents daab763 + bae01f9
commit 2973aaa
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 37 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -7,7 +7,6 @@ repos:
       - id: terraform_fmt
       - id: terraform_validate
       - id: terraform_tflint
-      - id: terraform_tfsec
       - id: terraform_docs
         args:
           - --hook-config=--add-to-existing-file=true

diff --git a/Gemfile b/Gemfile
@@ -13,7 +13,6 @@ gem 'govspeak'
 gem 'govuk_design_system_formbuilder'
 gem 'lograge'
 gem 'logstash-event'
-gem 'newrelic_rpm'
 gem 'puma'
 gem 'railties', '~> 7'
 gem 'sentry-rails'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -219,7 +219,6 @@ GEM
       timeout
     net-smtp (0.3.3)
       net-protocol
-    newrelic_rpm (9.4.2)
     nio4r (2.5.9)
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
@@ -610,7 +609,6 @@ DEPENDENCIES
   lograge
   logstash-event
   multipart-post (= 2.3.0)
-  newrelic_rpm
   pry-byebug
   pry-rails
   puma

diff --git a/app/controllers/steps/base_controller.rb b/app/controllers/steps/base_controller.rb
@@ -7,7 +7,6 @@ class BaseController < ::ApplicationController
     rescue_from StandardError, with: :handle_exception
 
     default_form_builder GOVUKDesignSystemFormBuilder::FormBuilder
-    after_action :track_session
     before_action :ensure_session_integrity
     before_action :initialize_commodity_context_service
 
@@ -44,15 +43,6 @@ def commodity_source
       params[:referred_service] || user_session.commodity_source
     end
 
-    def track_session
-      ::NewRelic::Agent.add_custom_attributes({
-        session: user_session.session.to_h.except('_csrf_token'),
-        commodity_code: user_session.commodity_code,
-        commodity_source: user_session.commodity_source,
-        referred_service: user_session.referred_service,
-      })
-    end
-
     def handle_exception(exception)
       with_session_tracking do
         raise exception
@@ -80,7 +70,6 @@ def title
 
     def with_session_tracking
       Sentry.set_user(user_session.session.to_h.except('_csrf_token'))
-      track_session
       yield
     end
   end

diff --git a/spec/controllers/steps/base_controller_spec.rb b/spec/controllers/steps/base_controller_spec.rb
@@ -24,19 +24,13 @@ def create
   end
 
   before do
-    allow(NewRelic::Agent).to receive(:add_custom_attributes).and_call_original
     allow(Sentry).to receive(:set_user)
     allow(Rails.configuration).to receive(:trade_tariff_frontend_url).and_return(trade_tariff_host)
   end
 
   describe 'GET #index' do
     subject(:response) { get :index }
 
-    it 'sends custom attributes to NewRelic' do
-      response
-      expect(NewRelic::Agent).to have_received(:add_custom_attributes).with(expected_tracked_attributes)
-    end
-
     it 'initializes the CommodityContextService' do
       response
       expect(Thread.current[:commodity_context_service]).to be_a(CommodityContextService)
@@ -63,12 +57,6 @@ def create
     rescue ArgumentError
       expect(Sentry).to have_received(:set_user).with(user_session.session.to_h.except('_csrf_token'))
     end
-
-    it 'sends custom attributes to NewRelic' do
-      response
-    rescue ArgumentError
-      expect(NewRelic::Agent).to have_received(:add_custom_attributes).with(expected_tracked_attributes)
-    end
   end
 
   describe '#title' do

diff --git a/terraform/README.md b/terraform/README.md
@@ -30,7 +30,6 @@ Terraform to deploy the service into AWS.
 | [aws_kms_key.secretsmanager_key](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/kms_key) | data source |
 | [aws_lb_target_group.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/lb_target_group) | data source |
 | [aws_secretsmanager_secret.duty_calculator_secret_key_base](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/secretsmanager_secret) | data source |
-| [aws_secretsmanager_secret.newrelic_license_key](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/secretsmanager_secret) | data source |
 | [aws_security_group.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/security_group) | data source |
 | [aws_ssm_parameter.ecr_url](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ssm_parameter) | data source |
 | [aws_subnets.private](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/subnets) | data source |

diff --git a/terraform/data.tf b/terraform/data.tf
@@ -25,10 +25,6 @@ data "aws_secretsmanager_secret" "duty_calculator_secret_key_base" {
   name = "duty-calculator-secret-key-base"
 }
 
-data "aws_secretsmanager_secret" "newrelic_license_key" {
-  name = "newrelic-license-key"
-}
-
 data "aws_kms_key" "secretsmanager_key" {
   key_id = "alias/secretsmanager-key"
 }

diff --git a/terraform/iam.tf b/terraform/iam.tf
@@ -9,7 +9,6 @@ data "aws_iam_policy_document" "secrets" {
     ]
     resources = [
       data.aws_secretsmanager_secret.duty_calculator_secret_key_base.arn,
-      data.aws_secretsmanager_secret.newrelic_license_key.arn
     ]
   }
 

diff --git a/terraform/main.tf b/terraform/main.tf
@@ -80,9 +80,5 @@ module "service" {
       name      = "SECRET_KEY_BASE"
       valueFrom = data.aws_secretsmanager_secret.duty_calculator_secret_key_base.arn
     },
-    {
-      name      = "NEWRELIC_LICENSE_KEY"
-      valueFrom = data.aws_secretsmanager_secret.newrelic_license_key.arn
-    }
   ]
 }