From 39543e84e9409e44f3444ff0102cc196d22c3d92 Mon Sep 17 00:00:00 2001
From: Mikkel Malmberg <mikkel@elastic.co>
Date: Wed, 16 Dec 2020 09:41:54 +0100
Subject: [PATCH] [APM] Add sanitize_field_names and transaction_ignore_urls
 config options to Ruby agent (#85646)

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 .../agent_configuration/setting_definitions/general_settings.ts | 2 +-
 .../agent_configuration/setting_definitions/index.test.ts       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
index 90e98e64814a1..bd2e18b66c8e3 100644
--- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts
@@ -235,7 +235,7 @@ export const generalSettings: RawSettingDefinition[] = [
           'Sometimes it is necessary to sanitize, i.e., remove, sensitive data sent to Elastic APM. This config accepts a list of wildcard patterns of field names which should be sanitized. These apply to HTTP headers (including cookies) and `application/x-www-form-urlencoded` data (POST form fields). The query string and the captured request body (such as `application/json` data) will not get sanitized.',
       }
     ),
-    includeAgents: ['java', 'python', 'go', 'dotnet', 'nodejs'],
+    includeAgents: ['java', 'python', 'go', 'dotnet', 'nodejs', 'ruby'],
   },
 
   // Ignore transactions based on URLs
diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
index 88cf3e288abf1..f7209d8b46edb 100644
--- a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
+++ b/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts
@@ -149,6 +149,7 @@ describe('filterByAgent', () => {
         'capture_headers',
         'log_level',
         'recording',
+        'sanitize_field_names',
         'span_frames_min_duration',
         'transaction_ignore_urls',
         'transaction_max_spans',