From 4abaf03cdb8f297d9421be10656a3d9449d8e205 Mon Sep 17 00:00:00 2001 From: Jason Penny Date: Tue, 29 Dec 2020 16:37:56 -0500 Subject: [PATCH] Back out 'error_for_4xx' covered by 'error_statuses' now --- .../contrib/grape/configuration/settings.rb | 1 - lib/ddtrace/contrib/grape/endpoint.rb | 14 -------------- 2 files changed, 15 deletions(-) diff --git a/lib/ddtrace/contrib/grape/configuration/settings.rb b/lib/ddtrace/contrib/grape/configuration/settings.rb index b452d97b966..e9b9e5964c2 100644 --- a/lib/ddtrace/contrib/grape/configuration/settings.rb +++ b/lib/ddtrace/contrib/grape/configuration/settings.rb @@ -25,7 +25,6 @@ class Settings < Contrib::Configuration::Settings end option :service_name, default: Ext::SERVICE_NAME - option :error_for_4xx, default: true option :error_statuses, default: nil do |o| o.setter do |new_value, _old_value| diff --git a/lib/ddtrace/contrib/grape/endpoint.rb b/lib/ddtrace/contrib/grape/endpoint.rb index 178e0dd391c..ea8be580706 100644 --- a/lib/ddtrace/contrib/grape/endpoint.rb +++ b/lib/ddtrace/contrib/grape/endpoint.rb @@ -202,10 +202,6 @@ def service_name datadog_configuration[:service_name] end - def error_for_4xx? - datadog_configuration[:error_for_4xx] - end - def analytics_enabled? Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled]) end @@ -229,16 +225,6 @@ def enabled? def datadog_configuration Datadog.configuration[:grape] end - - def exception_is_error?(exception) - return false unless exception - - if !error_for_4xx? && defined?(::Grape::Exceptions::Base) && exception.class < ::Grape::Exceptions::Base - status = exception.status - end - - status.nil? || status > 499 - end end end end