Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[APM] Set a valid service_name for python APM onboarding #131959

Merged
merged 5 commits into from
May 11, 2022
Merged

[APM] Set a valid service_name for python APM onboarding #131959

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f4ad51
Set a valid SERVICE_NAME for python APM onboarding
basepi May 10, 2022
806e582
Fix unit tests
basepi May 10, 2022
7004424
Merge branch 'main' into django_flask_apm_onboarding
kibanamachine May 10, 2022
5747d80
Update the examples for node and golang
basepi May 11, 2022
b726821
Revert "Update the examples for node and golang"
basepi May 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/tutorial/config_agent/commands/django.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ELASTIC_APM = {
defaultMessage: 'a-z, A-Z, 0-9, -, _, and space',
}
)}
'SERVICE_NAME': '',
'SERVICE_NAME': 'my_python_service',

# ${i18n.translate(
'xpack.apm.tutorial.djangoClient.configure.commands.useIfApmServerRequiresTokenComment',
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/tutorial/config_agent/commands/flask.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ app.config['ELASTIC_APM'] = {
defaultMessage: 'a-z, A-Z, 0-9, -, _, and space',
}
)}
'SERVICE_NAME': '',
'SERVICE_NAME': 'my_python_service',

# ${i18n.translate(
'xpack.apm.tutorial.flaskClient.configure.commands.useIfApmServerRequiresTokenComment',
Expand Down
16 changes: 8 additions & 8 deletions x-pack/plugins/apm/public/tutorial/config_agent/commands/get_commands.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ describe('getCommands', () => {

// Override the service name from package.json
// Allowed characters: a-z, A-Z, 0-9, -, _, and space
serviceName: '',
serviceName: 'my_node_service',

// Use if APM Server requires a secret token
secretToken: '',
Expand Down Expand Up @@ -150,7 +150,7 @@ describe('getCommands', () => {

// Override the service name from package.json
// Allowed characters: a-z, A-Z, 0-9, -, _, and space
serviceName: '',
serviceName: 'my_node_service',

// Use if APM Server requires a secret token
secretToken: 'foobar',
Expand Down Expand Up @@ -181,7 +181,7 @@ describe('getCommands', () => {
ELASTIC_APM = {
# Set the required service name. Allowed characters:
# a-z, A-Z, 0-9, -, _, and space
'SERVICE_NAME': '',
'SERVICE_NAME': 'my_python_service',

# Use if APM Server requires a secret token
'SECRET_TOKEN': '',
Expand Down Expand Up @@ -219,7 +219,7 @@ describe('getCommands', () => {
ELASTIC_APM = {
# Set the required service name. Allowed characters:
# a-z, A-Z, 0-9, -, _, and space
'SERVICE_NAME': '',
'SERVICE_NAME': 'my_python_service',

# Use if APM Server requires a secret token
'SECRET_TOKEN': 'foobar',
Expand Down Expand Up @@ -257,7 +257,7 @@ describe('getCommands', () => {
app.config['ELASTIC_APM'] = {
# Set the required service name. Allowed characters:
# a-z, A-Z, 0-9, -, _, and space
'SERVICE_NAME': '',
'SERVICE_NAME': 'my_python_service',

# Use if APM Server requires a secret token
'SECRET_TOKEN': '',
Expand Down Expand Up @@ -292,7 +292,7 @@ describe('getCommands', () => {
app.config['ELASTIC_APM'] = {
# Set the required service name. Allowed characters:
# a-z, A-Z, 0-9, -, _, and space
'SERVICE_NAME': '',
'SERVICE_NAME': 'my_python_service',

# Use if APM Server requires a secret token
'SECRET_TOKEN': 'foobar',
Expand Down Expand Up @@ -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=
export ELASTIC_APM_SERVICE_NAME=my_go_service

# Set custom APM Server URL (default: http://localhost:8200)
export ELASTIC_APM_SERVER_URL=
Expand All @@ -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=
export ELASTIC_APM_SERVICE_NAME=my_go_service

# Set custom APM Server URL (default: http://localhost:8200)
export ELASTIC_APM_SERVER_URL=localhost:8220
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/tutorial/config_agent/commands/go.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
export ELASTIC_APM_SERVICE_NAME=my_go_service
# ${i18n.translate(
'xpack.apm.tutorial.goClient.configure.commands.setCustomApmServerUrlComment',
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/tutorial/config_agent/commands/node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var apm = require('elastic-apm-node').start({
defaultMessage: 'Allowed characters: a-z, A-Z, 0-9, -, _, and space',
}
)}
serviceName: '',
serviceName: 'my_node_service',
basepi marked this conversation as resolved.
Show resolved Hide resolved
// ${i18n.translate(
'xpack.apm.tutorial.nodeClient.configure.commands.useIfApmRequiresTokenComment',
Expand Down