From b72682140af4a8fcb157163a9635b4f0250636e9 Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Wed, 11 May 2022 10:54:21 -0600 Subject: [PATCH] Revert "Update the examples for node and golang" This reverts commit 5747d80f04ff35cfb9d72f45569bb850f9cebd4e. --- .../tutorial/config_agent/commands/get_commands.test.ts | 8 ++++---- .../apm/public/tutorial/config_agent/commands/go.ts | 2 +- .../apm/public/tutorial/config_agent/commands/node.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/get_commands.test.ts b/x-pack/plugins/apm/public/tutorial/config_agent/commands/get_commands.test.ts index da2b9a29642be0..9e2367238da100 100644 --- a/x-pack/plugins/apm/public/tutorial/config_agent/commands/get_commands.test.ts +++ b/x-pack/plugins/apm/public/tutorial/config_agent/commands/get_commands.test.ts @@ -122,7 +122,7 @@ describe('getCommands', () => { // Override the service name from package.json // Allowed characters: a-z, A-Z, 0-9, -, _, and space - serviceName: 'my_node_service', + serviceName: '', // Use if APM Server requires a secret token secretToken: '', @@ -150,7 +150,7 @@ describe('getCommands', () => { // Override the service name from package.json // Allowed characters: a-z, A-Z, 0-9, -, _, and space - serviceName: 'my_node_service', + serviceName: '', // Use if APM Server requires a secret token secretToken: 'foobar', @@ -422,7 +422,7 @@ describe('getCommands', () => { # Set the service name. Allowed characters: # a-z, A-Z, 0-9, -, _, and space. # If ELASTIC_APM_SERVICE_NAME is not specified, the executable name will be used. - export ELASTIC_APM_SERVICE_NAME=my_go_service + export ELASTIC_APM_SERVICE_NAME= # Set custom APM Server URL (default: http://localhost:8200) export ELASTIC_APM_SERVER_URL= @@ -449,7 +449,7 @@ describe('getCommands', () => { # Set the service name. Allowed characters: # a-z, A-Z, 0-9, -, _, and space. # If ELASTIC_APM_SERVICE_NAME is not specified, the executable name will be used. - export ELASTIC_APM_SERVICE_NAME=my_go_service + export ELASTIC_APM_SERVICE_NAME= # Set custom APM Server URL (default: http://localhost:8200) export ELASTIC_APM_SERVER_URL=localhost:8220 diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/go.ts b/x-pack/plugins/apm/public/tutorial/config_agent/commands/go.ts index baf8180654f6cd..a3900420d6fdec 100644 --- a/x-pack/plugins/apm/public/tutorial/config_agent/commands/go.ts +++ b/x-pack/plugins/apm/public/tutorial/config_agent/commands/go.ts @@ -28,7 +28,7 @@ export const go = `# ${i18n.translate( 'If ELASTIC_APM_SERVICE_NAME is not specified, the executable name will be used.', } )} -export ELASTIC_APM_SERVICE_NAME=my_go_service +export ELASTIC_APM_SERVICE_NAME= # ${i18n.translate( 'xpack.apm.tutorial.goClient.configure.commands.setCustomApmServerUrlComment', diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/node.ts b/x-pack/plugins/apm/public/tutorial/config_agent/commands/node.ts index c33ecdfefeabe9..31f9fac0ed480d 100644 --- a/x-pack/plugins/apm/public/tutorial/config_agent/commands/node.ts +++ b/x-pack/plugins/apm/public/tutorial/config_agent/commands/node.ts @@ -27,7 +27,7 @@ var apm = require('elastic-apm-node').start({ defaultMessage: 'Allowed characters: a-z, A-Z, 0-9, -, _, and space', } )} -serviceName: 'my_node_service', +serviceName: '', // ${i18n.translate( 'xpack.apm.tutorial.nodeClient.configure.commands.useIfApmRequiresTokenComment',