Merge branch 'main' into fix/129308

elastic · May 26, 2022 · b34af0c · b34af0c
2 parents 34d9465 + 8bcc929
commit b34af0c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/docs/apm/troubleshooting.asciidoc b/docs/apm/troubleshooting.asciidoc
@@ -176,7 +176,7 @@ These are dynamic by default, which means they will be indexed and become search
 
 If the service map is not showing an expected connection between the client and server,
 it's likely because you haven't configured
-{apm-agent-rum}/configuration.html#distributed-tracing-origins[`distributedTracingOrigins`].
+{apm-rum-ref}/distributed-tracing-guide.html[`distributedTracingOrigins`].
 
 
 This setting is necessary, for example, for cross-origin requests.

diff --git a/packages/elastic-apm-synthtrace/src/scripts/run_synthtrace.ts b/packages/elastic-apm-synthtrace/src/scripts/run_synthtrace.ts
@@ -110,8 +110,7 @@ function options(y: Argv) {
       string: true,
     })
     .option('streamProcessors', {
-      describe:
-        'Allows you to register a GCP repository in <client_name>:<bucket>[:base_path] format',
+      describe: 'Specify multiple sets of stream aggregators to be included in the StreamProcessor',
       string: true,
       array: true,
       alias: 'p',