only remove if defined

DataDog · Apr 17, 2019 · 7eb728e · 7eb728e
1 parent 323c004
commit 7eb728e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/ddtrace/analytics.rb b/lib/ddtrace/analytics.rb
@@ -29,7 +29,8 @@ module InstanceMethodsCompatibility
         def self.included(base)
           base.class_eval do
             alias_method :set_tag_without_analytics, :set_tag
-            remove_method :set_tag
+            # DEV: When we stack multiple extensions the method might already be removed
+            remove_method :set_tag if method_defined?(:set_tag)
           end
         end
 

diff --git a/lib/ddtrace/forced_tracing.rb b/lib/ddtrace/forced_tracing.rb
@@ -35,7 +35,8 @@ module InstanceMethodsCompatibility
         def self.included(base)
           base.class_eval do
             alias_method :set_tag_without_forced_tracing, :set_tag
-            remove_method :set_tag
+            # DEV: When we stack multiple extensions the method might already be removed
+            remove_method :set_tag if method_defined?(:set_tag)
           end
         end