Skip capturing cookie header when it's set separately (#1405)

elastic · Dec 5, 2023 · 5467b31 · 5467b31
1 parent 7641bf7
commit 5467b31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/elastic_apm/context_builder.rb b/lib/elastic_apm/context_builder.rb
@@ -55,6 +55,9 @@ def apply_to_request(context, rack_env:, for_type:)
       request.env = env if config.capture_env?
 
       request.cookies = req.cookies.dup
+      unless request.cookies.empty?
+        request.headers['Cookie'] = SKIPPED if request.headers.has_key?('Cookie')
+      end
 
       context
     end

diff --git a/spec/elastic_apm/context_builder_spec.rb b/spec/elastic_apm/context_builder_spec.rb
@@ -54,7 +54,7 @@ module ElasticAPM
 
         expect(request.headers).to eq(
           'Content-Type' => 'application/json',
-          'Cookie' => 'things=1'
+          'Cookie' => '[SKIPPED]'
         )
       end