Skip to content

Commit

Permalink
[CI] Enables APM tracking
Browse files Browse the repository at this point in the history
Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
  • Loading branch information
Tyler Smalley committed Oct 13, 2020
1 parent 59a24c2 commit 0d57811
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 21 deletions.
40 changes: 37 additions & 3 deletions packages/kbn-apm-config-loader/src/config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import {

import { ApmConfiguration } from './config';

const initialEnv = { ...process.env };

describe('ApmConfiguration', () => {
beforeEach(() => {
packageMock.raw = {
Expand All @@ -39,6 +41,7 @@ describe('ApmConfiguration', () => {
});

afterEach(() => {
process.env = { ...initialEnv };
resetAllMocks();
});

Expand Down Expand Up @@ -90,13 +93,16 @@ describe('ApmConfiguration', () => {
let config = new ApmConfiguration(mockedRootDir, {}, false);
expect(config.getConfig('serviceName')).toEqual(
expect.objectContaining({
serverUrl: expect.any(String),
secretToken: expect.any(String),
breakdownMetrics: true,
})
);

config = new ApmConfiguration(mockedRootDir, {}, true);
expect(Object.keys(config.getConfig('serviceName'))).not.toContain('serverUrl');
expect(config.getConfig('serviceName')).toEqual(
expect.objectContaining({
breakdownMetrics: false,
})
);
});

it('loads the configuration from the kibana config file', () => {
Expand Down Expand Up @@ -156,4 +162,32 @@ describe('ApmConfiguration', () => {
})
);
});

it('sets correctly sets environment', () => {
delete process.env.ELASTIC_APM_ENVIRONMENT;
delete process.env.NODE_ENV;

let config = new ApmConfiguration(mockedRootDir, {}, false);
expect(config.getConfig('serviceName')).toEqual(
expect.objectContaining({
environment: 'development',
})
);

process.env.ELASTIC_APM_ENVIRONMENT = 'ci';
config = new ApmConfiguration(mockedRootDir, {}, false);
expect(config.getConfig('serviceName')).toEqual(
expect.objectContaining({
environment: 'ci',
})
);

process.env.NODE_ENV = 'production';
config = new ApmConfiguration(mockedRootDir, {}, false);
expect(config.getConfig('serviceName')).toEqual(
expect.objectContaining({
environment: 'production',
})
);
});
});
41 changes: 23 additions & 18 deletions packages/kbn-apm-config-loader/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,33 +26,38 @@ import { readFileSync } from 'fs';
import { ApmAgentConfig } from './types';

const getDefaultConfig = (isDistributable: boolean): ApmAgentConfig => {
if (isDistributable) {
return {
active: false,
globalLabels: {},
// Do not use a centralized controlled config
centralConfig: false,
// Capture all exceptions that are not caught
logUncaughtExceptions: true,
// Can be performance intensive, disabling by default
breakdownMetrics: false,
};
}
// https://www.elastic.co/guide/en/apm/agent/nodejs/current/configuration.html
const baseConfig = {
active: process.env.ELASTIC_APM_ACTIVE || false,
environment: process.env.NODE_ENV || process.env.ELASTIC_APM_ENVIRONMENT || 'development',

serverUrl: 'https://b1e3b4b4233e44cdad468c127d0af8d8.apm.europe-west1.gcp.cloud.es.io:443',

return {
active: false,
serverUrl: 'https://f1542b814f674090afd914960583265f.apm.us-central1.gcp.cloud.es.io:443',
// The secretToken below is intended to be hardcoded in this file even though
// it makes it public. This is not a security/privacy issue. Normally we'd
// instead disable the need for a secretToken in the APM Server config where
// the data is transmitted to, but due to how it's being hosted, it's easier,
// for now, to simply leave it in.
secretToken: 'R0Gjg46pE9K9wGestd',
secretToken: '2OyjjaI6RVkzx2O5CV',

logUncaughtExceptions: true,
globalLabels: {},
breakdownMetrics: true,
centralConfig: false,
logUncaughtExceptions: true,

// Can be performance intensive, disabling by default
breakdownMetrics: false,
};

if (!isDistributable) {
return {
...baseConfig,
...{
breakdownMetrics: true,
},
};
}

return baseConfig;
};

export class ApmConfiguration {
Expand Down
5 changes: 5 additions & 0 deletions src/dev/ci_setup/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ export NODE_OPTIONS="$NODE_OPTIONS --max-old-space-size=4096"
###
export FORCE_COLOR=1

### Enables APM tracking
###
export ELASTIC_APM_ACTIVE=true
export ELASTIC_APM_ENVIRONMENT=ci

###
### check that we seem to be in a kibana project
###
Expand Down

0 comments on commit 0d57811

Please sign in to comment.