PR comments

packages/kbn-apm-config-loader/src/config.ts

@@ -30,10 +30,12 @@ const getDefaultConfig = (isDistributable: boolean): ApmAgentConfig => {
     return {
       active: false,
       globalLabels: {},
+      // Do not use a centralized controlled config
       centralConfig: false,
-      captureHeaders: false,
-      captureBody: false,
+      // Capture all exceptions that are not caught
       logUncaughtExceptions: true,
+      // Can be performance intensive, disabling by default
+      breakdownMetrics: false,
     };
   }
 
@@ -81,7 +83,8 @@ export class ApmConfiguration {
       const apmConfig = merge(
         getDefaultConfig(this.isDistributable),
         this.getConfigFromKibanaConfig(),
-        this.getDevConfig()
+        this.getDevConfig(),
+        this.getDistConfig()
       );
 
       const rev = this.getGitRev();
@@ -130,6 +133,19 @@ export class ApmConfiguration {
     }
   }
 
+  /** Config keys that cannot be overridden in production builds */
+  private getDistConfig(): ApmAgentConfig {
+    if (!this.isDistributable) {
+      return {};
+    }
+
+    return {
+      // Headers & body may contain sensitive info
+      captureHeaders: false,
+      captureBody: 'off',
+    };
+  }
+
   private getGitRev() {
     if (this.isDistributable) {
       return this.pkgBuild.sha;

src/apm.js

@@ -38,13 +38,17 @@ module.exports = function (serviceName = name) {
   const conf = apmConfig.getConfig(serviceName);
   const apm = require('elastic-apm-node');
 
-  // Filter out username PII
+  // Filter out all user PII
   apm.addFilter((payload) => {
-    if (payload.context && payload.context.user && payload.context.user.username) {
-      delete payload.context.user.username;
+    try {
+      if (payload.context && payload.context.user && typeof payload.context.user === 'object') {
+        Object.keys(payload.context.user).forEach((key) => {
+          payload.context.user[key] = '[REDACTED]';
+        });
+      }
+    } finally {
+      return payload;
     }
-
-    return payload;
   });
 
   apm.start(conf);