Merge remote-tracking branch 'upstream/main' into kbn-107678-fail-sta…

…rt-on-unknown-so-types

.buildkite/scripts/common/env.sh

@@ -38,8 +38,10 @@ export ELASTIC_APM_TRANSACTION_SAMPLE_RATE=0.1
 if is_pr; then
   if [[ "${GITHUB_PR_LABELS:-}" == *"ci:collect-apm"* ]]; then
     export ELASTIC_APM_ACTIVE=true
+    export ELASTIC_APM_CONTEXT_PROPAGATION_ONLY=false
   else
-    export ELASTIC_APM_ACTIVE=false
+    export ELASTIC_APM_ACTIVE=true
+    export ELASTIC_APM_CONTEXT_PROPAGATION_ONLY=true
   fi
 
   if [[ "${GITHUB_STEP_COMMIT_STATUS_ENABLED:-}" != "true" ]]; then
@@ -61,6 +63,7 @@ if is_pr; then
   export PR_TARGET_BRANCH="$GITHUB_PR_TARGET_BRANCH"
 else
   export ELASTIC_APM_ACTIVE=true
+  export ELASTIC_APM_CONTEXT_PROPAGATION_ONLY=false
   export CHECKS_REPORTER_ACTIVE=false
 fi
 

.github/CODEOWNERS

@@ -59,6 +59,7 @@
 /examples/url_generators_explorer/ @elastic/kibana-app-services
 /examples/field_formats_example/ @elastic/kibana-app-services
 /examples/partial_results_example/ @elastic/kibana-app-services
+/examples/search_examples/ @elastic/kibana-app-services
 /packages/elastic-datemath/ @elastic/kibana-app-services
 /packages/kbn-interpreter/ @elastic/kibana-app-services
 /packages/kbn-react-field/ @elastic/kibana-app-services
@@ -78,18 +79,15 @@
 /src/plugins/ui_actions/ @elastic/kibana-app-services
 /src/plugins/index_pattern_field_editor @elastic/kibana-app-services
 /src/plugins/screenshot_mode @elastic/kibana-app-services
+/src/plugins/bfetch/ @elastic/kibana-app-services
+/src/plugins/index_pattern_management/ @elastic/kibana-app-services
+/src/plugins/inspector/ @elastic/kibana-app-services
 /x-pack/examples/ui_actions_enhanced_examples/ @elastic/kibana-app-services
 /x-pack/plugins/data_enhanced/ @elastic/kibana-app-services
 /x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-services
 /x-pack/plugins/ui_actions_enhanced/ @elastic/kibana-app-services
 /x-pack/plugins/runtime_fields @elastic/kibana-app-services
 /x-pack/test/search_sessions_integration/ @elastic/kibana-app-services
-#CC# /src/plugins/bfetch/ @elastic/kibana-app-services
-#CC# /src/plugins/index_pattern_management/ @elastic/kibana-app-services
-#CC# /src/plugins/inspector/ @elastic/kibana-app-services
-#CC# /src/plugins/share/ @elastic/kibana-app-services
-#CC# /x-pack/plugins/drilldowns/ @elastic/kibana-app-services
-#CC# /packages/kbn-interpreter/ @elastic/kibana-app-services
 
 ### Observability Plugins
 

docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md

@@ -89,6 +89,7 @@ readonly links: {
             readonly range: string;
             readonly significant_terms: string;
             readonly terms: string;
+            readonly terms_doc_count_error: string;
             readonly avg: string;
             readonly avg_bucket: string;
             readonly max_bucket: string;

package.json

@@ -223,7 +223,7 @@
     "deep-freeze-strict": "^1.1.1",
     "deepmerge": "^4.2.2",
     "del": "^5.1.0",
-    "elastic-apm-node": "^3.23.0",
+    "elastic-apm-node": "3.24.0",
     "execa": "^4.0.2",
     "exit-hook": "^2.2.0",
     "expiry-js": "0.1.7",

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

@@ -21,7 +21,7 @@ describe('ApmConfiguration', () => {
   beforeEach(() => {
     // start with an empty env to avoid CI from spoiling snapshots, env is unique for each jest file
     process.env = {};
-
+    devConfigMock.raw = {};
     packageMock.raw = {
       version: '8.0.0',
       build: {
@@ -86,10 +86,11 @@ describe('ApmConfiguration', () => {
     let config = new ApmConfiguration(mockedRootDir, {}, false);
     expect(config.getConfig('serviceName')).toMatchInlineSnapshot(`
       Object {
-        "active": false,
+        "active": true,
         "breakdownMetrics": true,
         "captureSpanStackTraces": false,
         "centralConfig": false,
+        "contextPropagationOnly": true,
         "environment": "development",
         "globalLabels": Object {},
         "logUncaughtExceptions": true,
@@ -105,12 +106,13 @@ describe('ApmConfiguration', () => {
     config = new ApmConfiguration(mockedRootDir, {}, true);
     expect(config.getConfig('serviceName')).toMatchInlineSnapshot(`
       Object {
-        "active": false,
+        "active": true,
         "breakdownMetrics": false,
         "captureBody": "off",
         "captureHeaders": false,
         "captureSpanStackTraces": false,
         "centralConfig": false,
+        "contextPropagationOnly": true,
         "environment": "development",
         "globalLabels": Object {
           "git_rev": "sha",
@@ -162,13 +164,12 @@ describe('ApmConfiguration', () => {
 
   it('does not load the configuration from the dev config in distributable', () => {
     devConfigMock.raw = {
-      active: true,
-      serverUrl: 'https://dev-url.co',
+      active: false,
     };
     const config = new ApmConfiguration(mockedRootDir, {}, true);
     expect(config.getConfig('serviceName')).toEqual(
       expect.objectContaining({
-        active: false,
+        active: true,
       })
     );
   });
@@ -224,4 +225,130 @@ describe('ApmConfiguration', () => {
       })
     );
   });
+
+  describe('contextPropagationOnly', () => {
+    it('sets "active: true" and "contextPropagationOnly: true" by default', () => {
+      expect(new ApmConfiguration(mockedRootDir, {}, false).getConfig('serviceName')).toEqual(
+        expect.objectContaining({
+          active: true,
+          contextPropagationOnly: true,
+        })
+      );
+
+      expect(new ApmConfiguration(mockedRootDir, {}, true).getConfig('serviceName')).toEqual(
+        expect.objectContaining({
+          active: true,
+          contextPropagationOnly: true,
+        })
+      );
+    });
+
+    it('value from config overrides the default', () => {
+      const kibanaConfig = {
+        elastic: {
+          apm: {
+            active: false,
+            contextPropagationOnly: false,
+          },
+        },
+      };
+
+      expect(
+        new ApmConfiguration(mockedRootDir, kibanaConfig, false).getConfig('serviceName')
+      ).toEqual(
+        expect.objectContaining({
+          active: false,
+          contextPropagationOnly: false,
+        })
+      );
+
+      expect(
+        new ApmConfiguration(mockedRootDir, kibanaConfig, true).getConfig('serviceName')
+      ).toEqual(
+        expect.objectContaining({
+          active: false,
+          contextPropagationOnly: false,
+        })
+      );
+    });
+
+    it('is "false" if "active: true" configured and "contextPropagationOnly" is not specified', () => {
+      const kibanaConfig = {
+        elastic: {
+          apm: {
+            active: true,
+          },
+        },
+      };
+
+      expect(
+        new ApmConfiguration(mockedRootDir, kibanaConfig, false).getConfig('serviceName')
+      ).toEqual(
+        expect.objectContaining({
+          active: true,
+          contextPropagationOnly: false,
+        })
+      );
+
+      expect(
+        new ApmConfiguration(mockedRootDir, kibanaConfig, true).getConfig('serviceName')
+      ).toEqual(
+        expect.objectContaining({
+          active: true,
+          contextPropagationOnly: false,
+        })
+      );
+    });
+
+    it('throws if "active: false" set without configuring "contextPropagationOnly: false"', () => {
+      const kibanaConfig = {
+        elastic: {
+          apm: {
+            active: false,
+          },
+        },
+      };
+
+      expect(() =>
+        new ApmConfiguration(mockedRootDir, kibanaConfig, false).getConfig('serviceName')
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"APM is disabled, but context propagation is enabled. Please disable context propagation with contextPropagationOnly:false"`
+      );
+
+      expect(() =>
+        new ApmConfiguration(mockedRootDir, kibanaConfig, true).getConfig('serviceName')
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"APM is disabled, but context propagation is enabled. Please disable context propagation with contextPropagationOnly:false"`
+      );
+    });
+
+    it('does not throw if "active: false" and "contextPropagationOnly: false" configured', () => {
+      const kibanaConfig = {
+        elastic: {
+          apm: {
+            active: false,
+            contextPropagationOnly: false,
+          },
+        },
+      };
+
+      expect(
+        new ApmConfiguration(mockedRootDir, kibanaConfig, false).getConfig('serviceName')
+      ).toEqual(
+        expect.objectContaining({
+          active: false,
+          contextPropagationOnly: false,
+        })
+      );
+
+      expect(
+        new ApmConfiguration(mockedRootDir, kibanaConfig, true).getConfig('serviceName')
+      ).toEqual(
+        expect.objectContaining({
+          active: false,
+          contextPropagationOnly: false,
+        })
+      );
+    });
+  });
 });

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

@@ -16,7 +16,8 @@ import type { AgentConfigOptions } from 'elastic-apm-node';
 
 // https://www.elastic.co/guide/en/apm/agent/nodejs/current/configuration.html
 const DEFAULT_CONFIG: AgentConfigOptions = {
-  active: false,
+  active: true,
+  contextPropagationOnly: true,
   environment: 'development',
   logUncaughtExceptions: true,
   globalLabels: {},
@@ -71,6 +72,8 @@ export class ApmConfiguration {
 
   private getBaseConfig() {
     if (!this.baseConfig) {
+      const configFromSources = this.getConfigFromAllSources();
+
       this.baseConfig = merge(
         {
           serviceVersion: this.kibanaVersion,
@@ -79,9 +82,7 @@ export class ApmConfiguration {
         this.getUuidConfig(),
         this.getGitConfig(),
         this.getCiConfig(),
-        this.getConfigFromKibanaConfig(),
-        this.getDevConfig(),
-        this.getConfigFromEnv()
+        configFromSources
       );
 
       /**
@@ -114,6 +115,12 @@ export class ApmConfiguration {
       config.active = true;
     }
 
+    if (process.env.ELASTIC_APM_CONTEXT_PROPAGATION_ONLY === 'true') {
+      config.contextPropagationOnly = true;
+    } else if (process.env.ELASTIC_APM_CONTEXT_PROPAGATION_ONLY === 'false') {
+      config.contextPropagationOnly = false;
+    }
+
     if (process.env.ELASTIC_APM_ENVIRONMENT || process.env.NODE_ENV) {
       config.environment = process.env.ELASTIC_APM_ENVIRONMENT || process.env.NODE_ENV;
     }
@@ -249,4 +256,28 @@ export class ApmConfiguration {
       return {};
     }
   }
+
+  /**
+   * Reads APM configuration from different sources and merges them together.
+   */
+  private getConfigFromAllSources(): AgentConfigOptions {
+    const config = merge(
+      {},
+      this.getConfigFromKibanaConfig(),
+      this.getDevConfig(),
+      this.getConfigFromEnv()
+    );
+
+    if (config.active === false && config.contextPropagationOnly !== false) {
+      throw new Error(
+        'APM is disabled, but context propagation is enabled. Please disable context propagation with contextPropagationOnly:false'
+      );
+    }
+
+    if (config.active === true) {
+      config.contextPropagationOnly = config.contextPropagationOnly ?? false;
+    }
+
+    return config;
+  }
 }

packages/kbn-logging/src/log_record.ts

@@ -20,4 +20,7 @@ export interface LogRecord {
   error?: Error;
   meta?: { [name: string]: any };
   pid: number;
+  spanId?: string;
+  traceId?: string;
+  transactionId?: string;
 }

src/core/public/doc_links/doc_links_service.ts

@@ -118,6 +118,7 @@ export class DocLinksService {
           range: `${ELASTICSEARCH_DOCS}search-aggregations-bucket-range-aggregation.html`,
           significant_terms: `${ELASTICSEARCH_DOCS}search-aggregations-bucket-significantterms-aggregation.html`,
           terms: `${ELASTICSEARCH_DOCS}search-aggregations-bucket-terms-aggregation.html`,
+          terms_doc_count_error: `${ELASTICSEARCH_DOCS}search-aggregations-bucket-terms-aggregation.html#_per_bucket_document_count_error`,
           avg: `${ELASTICSEARCH_DOCS}search-aggregations-metrics-avg-aggregation.html`,
           avg_bucket: `${ELASTICSEARCH_DOCS}search-aggregations-pipeline-avg-bucket-aggregation.html`,
           max_bucket: `${ELASTICSEARCH_DOCS}search-aggregations-pipeline-max-bucket-aggregation.html`,
@@ -613,6 +614,7 @@ export interface DocLinksStart {
       readonly range: string;
       readonly significant_terms: string;
       readonly terms: string;
+      readonly terms_doc_count_error: string;
       readonly avg: string;
       readonly avg_bucket: string;
       readonly max_bucket: string;

src/core/public/public.api.md

@@ -557,6 +557,7 @@ export interface DocLinksStart {
             readonly range: string;
             readonly significant_terms: string;
             readonly terms: string;
+            readonly terms_doc_count_error: string;
             readonly avg: string;
             readonly avg_bucket: string;
             readonly max_bucket: string;