Rename AppSec::Event.add_tags to AppSec::Event.tag_and_keep! and move…

… trace.keep in it

lib/datadog/appsec/contrib/graphql/gateway/watcher.rb

@@ -38,9 +38,7 @@ def watch_multiplex(gateway = Instrumentation.gateway)
  actions: result.actions
  }
 
- # We want to keep the trace in case of security event
- scope.trace.keep! if scope.trace
- Datadog::AppSec::Event.add_tags(scope, result)
+ Datadog::AppSec::Event.tag_and_keep!(scope, result)
  scope.processor_context.events << event
  end
 

lib/datadog/appsec/contrib/rack/gateway/watcher.rb

@@ -43,7 +43,7 @@ def watch_request(gateway = Instrumentation.gateway)
 
  # We want to keep the trace in case of security event
  scope.trace.keep! if scope.trace
- Datadog::AppSec::Event.add_tags(scope, result)
+ Datadog::AppSec::Event.tag_and_keep!(scope, result)
  scope.processor_context.events << event
  end
  end
@@ -85,7 +85,7 @@ def watch_response(gateway = Instrumentation.gateway)
 
  # We want to keep the trace in case of security event
  scope.trace.keep! if scope.trace
- Datadog::AppSec::Event.add_tags(scope, result)
+ Datadog::AppSec::Event.tag_and_keep!(scope, result)
  scope.processor_context.events << event
  end
  end
@@ -127,7 +127,7 @@ def watch_request_body(gateway = Instrumentation.gateway)
 
  # We want to keep the trace in case of security event
  scope.trace.keep! if scope.trace
- Datadog::AppSec::Event.add_tags(scope, result)
+ Datadog::AppSec::Event.tag_and_keep!(scope, result)
  scope.processor_context.events << event
  end
  end

lib/datadog/appsec/contrib/rails/gateway/watcher.rb

@@ -40,7 +40,7 @@ def watch_request_action(gateway = Instrumentation.gateway)
 
  # We want to keep the trace in case of security event
  scope.trace.keep! if scope.trace
- Datadog::AppSec::Event.add_tags(scope, result)
+ Datadog::AppSec::Event.tag_and_keep!(scope, result)
  scope.processor_context.events << event
  end
  end

lib/datadog/appsec/contrib/sinatra/gateway/watcher.rb

@@ -42,7 +42,7 @@ def watch_request_dispatch(gateway = Instrumentation.gateway)
 
  # We want to keep the trace in case of security event
  scope.trace.keep! if scope.trace
- Datadog::AppSec::Event.add_tags(scope, result)
+ Datadog::AppSec::Event.tag_and_keep!(scope, result)
  scope.processor_context.events << event
  end
  end
@@ -84,7 +84,7 @@ def watch_request_routed(gateway = Instrumentation.gateway)
 
  # We want to keep the trace in case of security event
  scope.trace.keep! if scope.trace
- Datadog::AppSec::Event.add_tags(scope, result)
+ Datadog::AppSec::Event.tag_and_keep!(scope, result)
  scope.processor_context.events << event
  end
  end

lib/datadog/appsec/event.rb

@@ -137,7 +137,10 @@ def build_service_entry_tags(event_group)
  end
  # rubocop:enable Metrics/MethodLength
 
- def add_tags(scope, waf_result)
+ def tag_and_keep!(scope, waf_result)
+ # We want to keep the trace in case of security event
+ scope.trace.keep! if scope.trace
+
  if scope.service_entry_span
  scope.service_entry_span.set_tag('appsec.blocked', 'true') if waf_result.actions.include?('block')
  scope.service_entry_span.set_tag('appsec.event', 'true')

lib/datadog/appsec/monitor/gateway/watcher.rb

@@ -37,7 +37,7 @@ def watch_user_id(gateway = Instrumentation.gateway)
 
  # We want to keep the trace in case of security event
  scope.trace.keep! if scope.trace
- Datadog::AppSec::Event.add_tags(scope, result)
+ Datadog::AppSec::Event.tag_and_keep!(scope, result)
  scope.processor_context.events << event
  end
  end

sig/datadog/appsec/event.rbs

@@ -14,7 +14,7 @@ module Datadog
 
  def self.build_service_entry_tags: (Array[Hash[::Symbol, untyped]] event_group) -> Hash[::String, untyped]
 
- def self.add_tags: (Datadog::AppSec::Scope scope, Datadog::AppSec::WAF::Result waf_result) -> void
+ def self.tag_and_keep!: (Datadog::AppSec::Scope scope, Datadog::AppSec::WAF::Result waf_result) -> void
 
  private
 

spec/datadog/appsec/event_spec.rb

@@ -362,7 +362,7 @@
  end
  end
 
- describe '.add_tags' do
+ describe '.tag_and_keep!' do
  let(:with_trace) { true }
  let(:with_span) { true }
 
@@ -397,7 +397,7 @@
  # prevent rate limiter to bias tests
  Datadog::AppSec::RateLimiter.reset!
 
- described_class.add_tags(scope, waf_result)
+ described_class.tag_and_keep!(scope, waf_result)
  end
 
  context 'with no actions' do