@datadog/datadog-ci 3.12.0 → 3.13.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/commands/aas/common.d.ts +3 -4
- package/dist/commands/aas/common.js +28 -10
- package/dist/commands/aas/common.js.map +1 -1
- package/dist/commands/aas/instrument.d.ts +7 -2
- package/dist/commands/aas/instrument.js +51 -10
- package/dist/commands/aas/instrument.js.map +1 -1
- package/dist/commands/aas/interfaces.d.ts +3 -0
- package/dist/commands/cloud-run/constants.d.ts +2 -0
- package/dist/commands/cloud-run/constants.js +3 -1
- package/dist/commands/cloud-run/constants.js.map +1 -1
- package/dist/commands/cloud-run/flare.js +1 -0
- package/dist/commands/cloud-run/flare.js.map +1 -1
- package/dist/commands/cloud-run/instrument.d.ts +15 -8
- package/dist/commands/cloud-run/instrument.js +260 -138
- package/dist/commands/cloud-run/instrument.js.map +1 -1
- package/dist/commands/cloud-run/interfaces.d.ts +0 -19
- package/dist/commands/cloud-run/prompt.d.ts +5 -0
- package/dist/commands/cloud-run/prompt.js +86 -0
- package/dist/commands/cloud-run/prompt.js.map +1 -0
- package/dist/commands/cloud-run/renderer.d.ts +1 -2
- package/dist/commands/cloud-run/renderer.js +3 -11
- package/dist/commands/cloud-run/renderer.js.map +1 -1
- package/dist/commands/cloud-run/types.d.ts +3 -2
- package/dist/commands/cloud-run/uninstrument.d.ts +21 -0
- package/dist/commands/cloud-run/uninstrument.js +187 -0
- package/dist/commands/cloud-run/uninstrument.js.map +1 -0
- package/dist/commands/cloud-run/utils.d.ts +10 -0
- package/dist/commands/cloud-run/utils.js +81 -1
- package/dist/commands/cloud-run/utils.js.map +1 -1
- package/dist/commands/coverage/renderer.d.ts +2 -1
- package/dist/commands/coverage/renderer.js +12 -7
- package/dist/commands/coverage/renderer.js.map +1 -1
- package/dist/commands/coverage/upload.js +6 -6
- package/dist/commands/coverage/upload.js.map +1 -1
- package/dist/commands/coverage/utils.d.ts +8 -2
- package/dist/commands/coverage/utils.js +119 -4
- package/dist/commands/coverage/utils.js.map +1 -1
- package/dist/commands/dsyms/interfaces.d.ts +5 -5
- package/dist/commands/dsyms/interfaces.js +1 -1
- package/dist/commands/dsyms/interfaces.js.map +1 -1
- package/dist/commands/dsyms/renderer.d.ts +2 -2
- package/dist/commands/dsyms/renderer.js +6 -6
- package/dist/commands/dsyms/renderer.js.map +1 -1
- package/dist/commands/dsyms/upload.d.ts +17 -12
- package/dist/commands/dsyms/upload.js +177 -145
- package/dist/commands/dsyms/upload.js.map +1 -1
- package/dist/commands/junit/utils.d.ts +2 -2
- package/dist/commands/junit/utils.js +9 -11
- package/dist/commands/junit/utils.js.map +1 -1
- package/dist/commands/lambda/constants.d.ts +0 -7
- package/dist/commands/lambda/constants.js +3 -15
- package/dist/commands/lambda/constants.js.map +1 -1
- package/dist/commands/lambda/flare.js +1 -0
- package/dist/commands/lambda/flare.js.map +1 -1
- package/dist/commands/lambda/functions/instrument.js +9 -9
- package/dist/commands/lambda/functions/instrument.js.map +1 -1
- package/dist/commands/lambda/functions/uninstrument.js +6 -6
- package/dist/commands/lambda/functions/uninstrument.js.map +1 -1
- package/dist/commands/lambda/instrument.d.ts +0 -3
- package/dist/commands/lambda/instrument.js +4 -51
- package/dist/commands/lambda/instrument.js.map +1 -1
- package/dist/commands/react-native/xcode.d.ts +23 -0
- package/dist/commands/react-native/xcode.js +166 -10
- package/dist/commands/react-native/xcode.js.map +1 -1
- package/dist/commands/sarif/renderer.js +2 -2
- package/dist/commands/sarif/renderer.js.map +1 -1
- package/dist/commands/sbom/api.js +2 -2
- package/dist/commands/sbom/api.js.map +1 -1
- package/dist/commands/sbom/renderer.js +3 -3
- package/dist/commands/sbom/renderer.js.map +1 -1
- package/dist/commands/synthetics/api.d.ts +7 -3
- package/dist/commands/synthetics/api.js +20 -3
- package/dist/commands/synthetics/api.js.map +1 -1
- package/dist/commands/synthetics/base-command.d.ts +8 -2
- package/dist/commands/synthetics/base-command.js +34 -32
- package/dist/commands/synthetics/base-command.js.map +1 -1
- package/dist/commands/synthetics/batch.d.ts +4 -3
- package/dist/commands/synthetics/batch.js +27 -14
- package/dist/commands/synthetics/batch.js.map +1 -1
- package/dist/commands/synthetics/errors.d.ts +1 -1
- package/dist/commands/synthetics/errors.js +1 -1
- package/dist/commands/synthetics/errors.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +13 -2
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/reporters/default.js +16 -2
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/reporters/junit.d.ts +1 -0
- package/dist/commands/synthetics/reporters/junit.js +2 -0
- package/dist/commands/synthetics/reporters/junit.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.js +17 -3
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/test.d.ts +2 -2
- package/dist/commands/synthetics/test.js +15 -2
- package/dist/commands/synthetics/test.js.map +1 -1
- package/dist/commands/synthetics/utils/internal.d.ts +2 -2
- package/dist/commands/synthetics/utils/internal.js.map +1 -1
- package/dist/commands/synthetics/utils/public.js +9 -2
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/dist/constants.d.ts +7 -0
- package/dist/constants.js +14 -1
- package/dist/constants.js.map +1 -1
- package/dist/helpers/app.d.ts +1 -0
- package/dist/helpers/app.js +7 -1
- package/dist/helpers/app.js.map +1 -1
- package/dist/helpers/flare.d.ts +2 -0
- package/dist/helpers/flare.js +13 -1
- package/dist/helpers/flare.js.map +1 -1
- package/dist/helpers/git/instrument-helpers.d.ts +13 -0
- package/dist/helpers/git/instrument-helpers.js +60 -0
- package/dist/helpers/git/instrument-helpers.js.map +1 -0
- package/dist/helpers/version.d.ts +1 -0
- package/dist/helpers/version.js +17 -1
- package/dist/helpers/version.js.map +1 -1
- package/package.json +4 -1
|
@@ -17,52 +17,90 @@ const chalk_1 = __importDefault(require("chalk"));
|
|
|
17
17
|
const clipanion_1 = require("clipanion");
|
|
18
18
|
const constants_1 = require("../../constants");
|
|
19
19
|
const apikey_1 = require("../../helpers/apikey");
|
|
20
|
+
const env_1 = require("../../helpers/env");
|
|
21
|
+
const fips_1 = require("../../helpers/fips");
|
|
22
|
+
const instrument_helpers_1 = require("../../helpers/git/instrument-helpers");
|
|
20
23
|
const renderer_1 = require("../../helpers/renderer");
|
|
21
24
|
const utils_1 = require("../../helpers/utils");
|
|
25
|
+
const validation_1 = require("../../helpers/validation");
|
|
26
|
+
const constants_2 = require("./constants");
|
|
27
|
+
const prompt_1 = require("./prompt");
|
|
22
28
|
const renderer_2 = require("./renderer");
|
|
23
29
|
const utils_2 = require("./utils");
|
|
24
30
|
// XXX temporary workaround for @google-cloud/run ESM/CJS module issues
|
|
25
31
|
const { ServicesClient } = require('@google-cloud/run');
|
|
26
32
|
// equivalent to google.cloud.run.v2.EmptyDirVolumeSource.Medium.MEMORY
|
|
27
33
|
const EMPTY_DIR_VOLUME_SOURCE_MEMORY = 1;
|
|
28
|
-
const
|
|
29
|
-
const
|
|
30
|
-
const
|
|
34
|
+
const DEFAULT_VOLUME_PATH = '/shared-volume';
|
|
35
|
+
const DEFAULT_LOGS_PATH = '/shared-volume/logs/*.log';
|
|
36
|
+
const DEFAULT_HEALTH_CHECK_PORT = 5555;
|
|
37
|
+
const DEFAULT_SIDECAR_IMAGE = 'gcr.io/datadoghq/serverless-init:latest';
|
|
38
|
+
const DEFAULT_ENV_VARS = [
|
|
39
|
+
{ name: constants_1.SITE_ENV_VAR, value: constants_1.DATADOG_SITE_US1 },
|
|
40
|
+
{ name: constants_1.LOGS_INJECTION_ENV_VAR, value: 'true' },
|
|
41
|
+
{ name: constants_1.DD_TRACE_ENABLED_ENV_VAR, value: 'true' },
|
|
42
|
+
{ name: constants_1.HEALTH_PORT_ENV_VAR, value: DEFAULT_HEALTH_CHECK_PORT.toString() },
|
|
43
|
+
];
|
|
31
44
|
class InstrumentCommand extends clipanion_1.Command {
|
|
32
45
|
constructor() {
|
|
46
|
+
var _a, _b;
|
|
33
47
|
super(...arguments);
|
|
34
|
-
|
|
35
|
-
this.
|
|
36
|
-
this.dryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false); // todo
|
|
48
|
+
// private configPath = Option.String('--config') implement if requested by customers
|
|
49
|
+
this.dryRun = clipanion_1.Option.Boolean('-d,--dry,--dry-run', false);
|
|
37
50
|
this.environment = clipanion_1.Option.String('--env');
|
|
38
|
-
this.extraTags = clipanion_1.Option.String('--extra-tags,--extraTags');
|
|
39
|
-
this.project = clipanion_1.Option.String('-p,--project'
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
this.
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
this.
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
this.
|
|
51
|
+
this.extraTags = clipanion_1.Option.String('--extra-tags,--extraTags');
|
|
52
|
+
this.project = clipanion_1.Option.String('-p,--project', {
|
|
53
|
+
description: 'GCP project ID',
|
|
54
|
+
});
|
|
55
|
+
this.services = clipanion_1.Option.Array('-s,--service,--services', [], {
|
|
56
|
+
description: 'Cloud Run service(s) to instrument',
|
|
57
|
+
});
|
|
58
|
+
this.interactive = clipanion_1.Option.Boolean('-i,--interactive', false, {
|
|
59
|
+
description: 'Prompt for flags one at a time',
|
|
60
|
+
});
|
|
61
|
+
this.region = clipanion_1.Option.String('-r,--region', {
|
|
62
|
+
description: 'GCP region your service(s) are deployed in',
|
|
63
|
+
});
|
|
64
|
+
this.logLevel = clipanion_1.Option.String('--log-level,--logLevel');
|
|
65
|
+
this.sourceCodeIntegration = clipanion_1.Option.Boolean('--source-code-integration,--sourceCodeIntegration', true);
|
|
66
|
+
this.uploadGitMetadata = clipanion_1.Option.Boolean('-u,--upload-git-metadata,--uploadGitMetadata', true);
|
|
67
|
+
this.tracing = clipanion_1.Option.String('--tracing');
|
|
49
68
|
this.version = clipanion_1.Option.String('--version');
|
|
50
|
-
this.llmobs = clipanion_1.Option.String('--llmobs');
|
|
51
|
-
this.healthCheckPort = clipanion_1.Option.String('--port,--health-check-port,--healthCheckPort');
|
|
52
|
-
this.
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
69
|
+
this.llmobs = clipanion_1.Option.String('--llmobs');
|
|
70
|
+
this.healthCheckPort = clipanion_1.Option.String('--port,--health-check-port,--healthCheckPort');
|
|
71
|
+
this.sidecarImage = clipanion_1.Option.String('--image,--sidecar-image', DEFAULT_SIDECAR_IMAGE, {
|
|
72
|
+
description: `The image to use for the sidecar container. Defaults to '${DEFAULT_SIDECAR_IMAGE}'`,
|
|
73
|
+
});
|
|
74
|
+
this.sidecarName = clipanion_1.Option.String('--sidecar-name', constants_2.DEFAULT_SIDECAR_NAME, {
|
|
75
|
+
description: `(Not recommended) The name to use for the sidecar container. Defaults to '${constants_2.DEFAULT_SIDECAR_NAME}'`,
|
|
76
|
+
});
|
|
77
|
+
this.sharedVolumeName = clipanion_1.Option.String('--shared-volume-name', constants_2.DEFAULT_VOLUME_NAME, {
|
|
78
|
+
description: `(Not recommended) The name to use for the shared volume. Defaults to '${constants_2.DEFAULT_VOLUME_NAME}'`,
|
|
79
|
+
});
|
|
80
|
+
this.sharedVolumePath = clipanion_1.Option.String('--shared-volume-path', DEFAULT_VOLUME_PATH, {
|
|
81
|
+
description: `(Not recommended) The path to use for the shared volume. Defaults to '${DEFAULT_VOLUME_PATH}'`,
|
|
82
|
+
});
|
|
83
|
+
this.logsPath = clipanion_1.Option.String('--logs-path', DEFAULT_LOGS_PATH, {
|
|
84
|
+
description: `(Not recommended) The path to use for the logs. Defaults to '${DEFAULT_LOGS_PATH}'. Must begin with the shared volume path.`,
|
|
85
|
+
});
|
|
86
|
+
this.sidecarCpus = clipanion_1.Option.String('--sidecar-cpus', '1', {
|
|
87
|
+
description: `The number of CPUs to allocate to the sidecar container. Defaults to 1.`,
|
|
88
|
+
});
|
|
89
|
+
this.sidecarMemory = clipanion_1.Option.String('--sidecar-memory', '512Mi', {
|
|
90
|
+
description: `The number of CPUs to allocate to the sidecar container. Defaults to '512Mi'.`,
|
|
91
|
+
});
|
|
92
|
+
this.fips = clipanion_1.Option.Boolean('--fips', false);
|
|
93
|
+
this.fipsIgnoreError = clipanion_1.Option.Boolean('--fips-ignore-error', false);
|
|
94
|
+
this.fipsConfig = {
|
|
95
|
+
fips: (_a = (0, env_1.toBoolean)(process.env[constants_1.FIPS_ENV_VAR])) !== null && _a !== void 0 ? _a : false,
|
|
96
|
+
fipsIgnoreError: (_b = (0, env_1.toBoolean)(process.env[constants_1.FIPS_IGNORE_ERROR_ENV_VAR])) !== null && _b !== void 0 ? _b : false,
|
|
56
97
|
};
|
|
57
98
|
}
|
|
58
99
|
execute() {
|
|
59
|
-
var _a, _b
|
|
100
|
+
var _a, _b;
|
|
60
101
|
return __awaiter(this, void 0, void 0, function* () {
|
|
61
|
-
|
|
62
|
-
this.context.stdout.write(
|
|
63
|
-
// TODO resolve config from file
|
|
64
|
-
// TODO dry run
|
|
65
|
-
// TODO interactive
|
|
102
|
+
(0, fips_1.enableFips)(this.fips || this.fipsConfig.fips, this.fipsIgnoreError || this.fipsConfig.fipsIgnoreError);
|
|
103
|
+
this.context.stdout.write(`\n${(0, renderer_2.dryRunPrefix)(this.dryRun)}🐶 ${chalk_1.default.bold('Instrumenting Cloud Run service(s)')}\n\n`);
|
|
66
104
|
// Verify DD API Key
|
|
67
105
|
const isApiKeyValid = yield (0, apikey_1.newApiKeyValidator)({
|
|
68
106
|
apiKey: process.env.DD_API_KEY,
|
|
@@ -72,25 +110,41 @@ class InstrumentCommand extends clipanion_1.Command {
|
|
|
72
110
|
this.context.stdout.write((0, renderer_1.renderSoftWarning)(`Invalid API Key stored in the environment variable ${chalk_1.default.bold('DD_API_KEY')}: ${(0, utils_1.maskString)((_b = process.env.DD_API_KEY) !== null && _b !== void 0 ? _b : '')}\nEnsure you copied the value and not the Key ID.`));
|
|
73
111
|
return 1;
|
|
74
112
|
}
|
|
113
|
+
if (this.interactive) {
|
|
114
|
+
if (!this.project) {
|
|
115
|
+
this.project = yield (0, prompt_1.requestGCPProject)();
|
|
116
|
+
}
|
|
117
|
+
if (!this.region) {
|
|
118
|
+
this.region = yield (0, prompt_1.requestGCPRegion)();
|
|
119
|
+
}
|
|
120
|
+
if (this.services.length === 0) {
|
|
121
|
+
const serviceName = yield (0, prompt_1.requestServiceName)();
|
|
122
|
+
this.services = [serviceName];
|
|
123
|
+
}
|
|
124
|
+
const envSite = process.env[constants_1.CI_SITE_ENV_VAR];
|
|
125
|
+
if (!(0, validation_1.isValidDatadogSite)(envSite)) {
|
|
126
|
+
process.env[constants_1.CI_SITE_ENV_VAR] = yield (0, prompt_1.requestSite)();
|
|
127
|
+
}
|
|
128
|
+
}
|
|
75
129
|
// Validate required variables
|
|
76
|
-
this.
|
|
77
|
-
|
|
78
|
-
if (!project) {
|
|
79
|
-
this.context.stdout.write(chalk_1.default.yellow('No project specified for instrumentation. Please use the --project flag.\n'));
|
|
130
|
+
if (!this.project) {
|
|
131
|
+
this.context.stdout.write(chalk_1.default.yellow('Invalid or missing project. Please use the --project flag.\n'));
|
|
80
132
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
this.context.stdout.write(chalk_1.default.yellow('No services specified for instrumentation. Please use the --service flag.\n'));
|
|
133
|
+
if (this.services.length === 0) {
|
|
134
|
+
this.context.stdout.write(chalk_1.default.yellow('Invalid or missing service(s). Please use the --service flag.\n'));
|
|
84
135
|
}
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
this.context.stdout.write(chalk_1.default.yellow('No region specified for instrumentation. Please use the --region flag.\n'));
|
|
136
|
+
if (!this.region) {
|
|
137
|
+
this.context.stdout.write(chalk_1.default.yellow('Invalid or missing region. Please use the --region flag.\n'));
|
|
88
138
|
}
|
|
89
|
-
const ddService =
|
|
139
|
+
const ddService = process.env[constants_1.SERVICE_ENV_VAR];
|
|
90
140
|
if (!ddService) {
|
|
91
|
-
this.context.stdout.write(
|
|
141
|
+
this.context.stdout.write((0, renderer_1.renderSoftWarning)('No DD_SERVICE env var found. Will default to the service name.'));
|
|
92
142
|
}
|
|
93
|
-
if (
|
|
143
|
+
if (this.extraTags && !this.extraTags.match(constants_1.EXTRA_TAGS_REG_EXP)) {
|
|
144
|
+
this.context.stderr.write((0, renderer_1.renderError)('Extra tags do not comply with the <key>:<value> array.\n'));
|
|
145
|
+
return 1;
|
|
146
|
+
}
|
|
147
|
+
if (!this.project || !this.services || !this.services.length || !this.region) {
|
|
94
148
|
return 1;
|
|
95
149
|
}
|
|
96
150
|
this.context.stdout.write(chalk_1.default.green('✔ Required flags verified\n'));
|
|
@@ -101,46 +155,54 @@ class InstrumentCommand extends clipanion_1.Command {
|
|
|
101
155
|
this.context.stderr.write((0, renderer_2.renderAuthenticationInstructions)());
|
|
102
156
|
return 1;
|
|
103
157
|
}
|
|
104
|
-
this.context.stdout.write(chalk_1.default.green('✔ GCP credentials verified!\n'));
|
|
158
|
+
this.context.stdout.write(chalk_1.default.green('✔ GCP credentials verified!\n\n'));
|
|
159
|
+
// Source code integration
|
|
160
|
+
if (this.sourceCodeIntegration) {
|
|
161
|
+
try {
|
|
162
|
+
const gitData = yield (0, instrument_helpers_1.getGitData)();
|
|
163
|
+
if (this.uploadGitMetadata) {
|
|
164
|
+
yield (0, instrument_helpers_1.uploadGitData)(this.context);
|
|
165
|
+
}
|
|
166
|
+
if (this.extraTags) {
|
|
167
|
+
this.extraTags += `,git.commit.sha:${gitData.commitSha},git.repository_url:${gitData.gitRemote}`;
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
this.extraTags = `git.commit.sha:${gitData.commitSha},git.repository_url:${gitData.gitRemote}`;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
catch (err) {
|
|
174
|
+
this.context.stdout.write((0, renderer_1.renderSoftWarning)(`Couldn't add source code integration, continuing without it. ${err}`));
|
|
175
|
+
}
|
|
176
|
+
}
|
|
105
177
|
// Instrument services with sidecar
|
|
106
178
|
try {
|
|
107
|
-
yield this.instrumentSidecar(project, services, region, ddService);
|
|
179
|
+
yield this.instrumentSidecar(this.project, this.services, this.region, ddService);
|
|
108
180
|
}
|
|
109
181
|
catch (error) {
|
|
110
|
-
this.context.stderr.write(
|
|
182
|
+
this.context.stderr.write((0, renderer_2.dryRunPrefix)(this.dryRun) + (0, renderer_1.renderError)(`Uninstrumentation failed: ${error}\n`));
|
|
111
183
|
return 1;
|
|
112
184
|
}
|
|
113
|
-
this.
|
|
185
|
+
if (!this.dryRun) {
|
|
186
|
+
this.context.stdout.write('\n✅ Cloud Run instrumentation completed successfully!\n');
|
|
187
|
+
}
|
|
114
188
|
return 0;
|
|
115
189
|
});
|
|
116
190
|
}
|
|
117
191
|
instrumentSidecar(project, services, region, ddService) {
|
|
118
192
|
return __awaiter(this, void 0, void 0, function* () {
|
|
119
193
|
const client = new ServicesClient();
|
|
120
|
-
this.context.stdout.write(chalk_1.default.bold(
|
|
121
|
-
const existingServiceConfigs =
|
|
122
|
-
|
|
123
|
-
const servicePath = client.servicePath(project, region, serviceName);
|
|
124
|
-
const existingService = yield (0, renderer_2.withSpinner)(`Fetching configuration for ${chalk_1.default.bold(serviceName)}...`, () => __awaiter(this, void 0, void 0, function* () {
|
|
125
|
-
try {
|
|
126
|
-
const [serv] = yield client.getService({ name: servicePath });
|
|
127
|
-
return serv;
|
|
128
|
-
}
|
|
129
|
-
catch (error) {
|
|
130
|
-
throw new Error(`Service ${serviceName} not found in project ${project}, region ${region}.\n\nNo services were instrumented.\n`);
|
|
131
|
-
}
|
|
132
|
-
}), `Fetched service configuration for ${chalk_1.default.bold(serviceName)}`);
|
|
133
|
-
existingServiceConfigs.push(existingService);
|
|
134
|
-
}
|
|
135
|
-
this.context.stdout.write(chalk_1.default.bold('\n🚀 Instrumenting Cloud Run services with sidecar...\n'));
|
|
194
|
+
this.context.stdout.write(chalk_1.default.bold(`\n${(0, renderer_2.dryRunPrefix)(this.dryRun)}⬇️ Fetching existing service configurations from Cloud Run...\n`));
|
|
195
|
+
const existingServiceConfigs = yield (0, utils_2.fetchServiceConfigs)(client, project, region, services);
|
|
196
|
+
this.context.stdout.write(chalk_1.default.bold(`\n${(0, renderer_2.dryRunPrefix)(this.dryRun)}🚀 Instrumenting Cloud Run services with sidecar...\n`));
|
|
136
197
|
for (let i = 0; i < existingServiceConfigs.length; i++) {
|
|
137
198
|
const serviceConfig = existingServiceConfigs[i];
|
|
138
199
|
const serviceName = services[i];
|
|
139
200
|
try {
|
|
140
|
-
|
|
201
|
+
const actualDDService = ddService !== null && ddService !== void 0 ? ddService : serviceName;
|
|
202
|
+
yield this.instrumentService(client, serviceConfig, serviceName, actualDDService);
|
|
141
203
|
}
|
|
142
204
|
catch (error) {
|
|
143
|
-
this.context.stderr.write(
|
|
205
|
+
this.context.stderr.write((0, renderer_2.dryRunPrefix)(this.dryRun) + (0, renderer_1.renderError)(`Failed to instrument service ${serviceName}: ${error}\n`));
|
|
144
206
|
throw error;
|
|
145
207
|
}
|
|
146
208
|
}
|
|
@@ -149,43 +211,121 @@ class InstrumentCommand extends clipanion_1.Command {
|
|
|
149
211
|
instrumentService(client, existingService, serviceName, ddService) {
|
|
150
212
|
return __awaiter(this, void 0, void 0, function* () {
|
|
151
213
|
const updatedService = this.createInstrumentedServiceConfig(existingService, ddService);
|
|
152
|
-
|
|
214
|
+
this.context.stdout.write((0, utils_2.generateConfigDiff)(existingService, updatedService));
|
|
215
|
+
if (this.dryRun) {
|
|
216
|
+
this.context.stdout.write(`\n\n${(0, renderer_2.dryRunPrefix)(this.dryRun)}Would have updated service ${chalk_1.default.bold(serviceName)} with the above changes.\n`);
|
|
217
|
+
return;
|
|
218
|
+
}
|
|
219
|
+
else if (this.interactive) {
|
|
220
|
+
const confirmed = yield (0, prompt_1.requestConfirmation)('\nDo you want to apply the changes?');
|
|
221
|
+
if (!confirmed) {
|
|
222
|
+
throw new Error('Instrumentation cancelled by user.');
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
yield (0, renderer_2.withSpinner)(`Instrumenting service ${chalk_1.default.bold(serviceName)}...`, () => __awaiter(this, void 0, void 0, function* () {
|
|
153
226
|
const [operation] = yield client.updateService({
|
|
154
227
|
service: updatedService,
|
|
155
228
|
});
|
|
156
229
|
yield operation.promise();
|
|
157
|
-
}), `Instrumented service ${serviceName}`);
|
|
230
|
+
}), `Instrumented service ${chalk_1.default.bold(serviceName)}`);
|
|
158
231
|
});
|
|
159
232
|
}
|
|
160
233
|
createInstrumentedServiceConfig(service, ddService) {
|
|
161
234
|
const template = service.template || {};
|
|
162
235
|
const containers = template.containers || [];
|
|
163
236
|
const volumes = template.volumes || [];
|
|
164
|
-
|
|
165
|
-
const
|
|
237
|
+
const existingSidecarContainer = containers.find((c) => c.name === this.sidecarName);
|
|
238
|
+
const newSidecarContainer = this.buildSidecarContainer(existingSidecarContainer, ddService);
|
|
239
|
+
// Update all app containers to add volume mounts and env vars if they don't have them
|
|
240
|
+
const updatedContainers = containers.map((container) => {
|
|
241
|
+
if (container.name === this.sidecarName) {
|
|
242
|
+
return newSidecarContainer;
|
|
243
|
+
}
|
|
244
|
+
return this.updateAppContainer(container, ddService);
|
|
245
|
+
});
|
|
246
|
+
// Add sidecar if it doesn't exist
|
|
247
|
+
if (!existingSidecarContainer) {
|
|
248
|
+
updatedContainers.push(newSidecarContainer);
|
|
249
|
+
}
|
|
250
|
+
// Add shared volume if it doesn't exist
|
|
251
|
+
const hasSharedVolume = volumes.some((volume) => volume.name === this.sharedVolumeName);
|
|
252
|
+
const updatedVolumes = hasSharedVolume
|
|
253
|
+
? volumes
|
|
254
|
+
: [
|
|
255
|
+
...volumes,
|
|
256
|
+
{
|
|
257
|
+
name: this.sharedVolumeName,
|
|
258
|
+
emptyDir: {
|
|
259
|
+
medium: EMPTY_DIR_VOLUME_SOURCE_MEMORY,
|
|
260
|
+
},
|
|
261
|
+
},
|
|
262
|
+
];
|
|
263
|
+
return Object.assign(Object.assign({}, service), { template: Object.assign(Object.assign({}, template), { containers: updatedContainers, volumes: updatedVolumes,
|
|
264
|
+
// Let GCR generate the next revision name
|
|
265
|
+
revision: undefined }) });
|
|
266
|
+
}
|
|
267
|
+
buildSidecarContainer(existingSidecarContainer, ddService) {
|
|
268
|
+
var _a, _b, _c;
|
|
269
|
+
const newEnvVars = {};
|
|
270
|
+
for (const envVar of (_a = existingSidecarContainer === null || existingSidecarContainer === void 0 ? void 0 : existingSidecarContainer.env) !== null && _a !== void 0 ? _a : []) {
|
|
271
|
+
newEnvVars[envVar.name] = envVar.value;
|
|
272
|
+
}
|
|
273
|
+
// Add these env vars to the container if they don't already exist,
|
|
274
|
+
// but leave them unchanged if they already exist in the container.
|
|
275
|
+
for (const { name, value } of DEFAULT_ENV_VARS) {
|
|
276
|
+
if (!(name in newEnvVars)) {
|
|
277
|
+
newEnvVars[name] = value;
|
|
278
|
+
}
|
|
279
|
+
}
|
|
280
|
+
// Overwrite existing env vars with these if they already exist
|
|
281
|
+
// and add them to the container if they don't exist yet.
|
|
282
|
+
newEnvVars[constants_1.API_KEY_ENV_VAR] = (_b = process.env[constants_1.API_KEY_ENV_VAR]) !== null && _b !== void 0 ? _b : '';
|
|
283
|
+
newEnvVars[constants_1.SERVICE_ENV_VAR] = ddService;
|
|
284
|
+
if (process.env[constants_1.SITE_ENV_VAR]) {
|
|
285
|
+
newEnvVars[constants_1.SITE_ENV_VAR] = process.env[constants_1.SITE_ENV_VAR];
|
|
286
|
+
}
|
|
287
|
+
if (this.tracing) {
|
|
288
|
+
newEnvVars[constants_1.DD_TRACE_ENABLED_ENV_VAR] = this.tracing;
|
|
289
|
+
}
|
|
290
|
+
if (this.environment) {
|
|
291
|
+
newEnvVars[constants_1.ENVIRONMENT_ENV_VAR] = this.environment;
|
|
292
|
+
}
|
|
293
|
+
if (this.version) {
|
|
294
|
+
newEnvVars[constants_1.VERSION_ENV_VAR] = this.version;
|
|
295
|
+
}
|
|
296
|
+
if (this.logLevel) {
|
|
297
|
+
newEnvVars[constants_1.DD_LOG_LEVEL_ENV_VAR] = this.logLevel;
|
|
298
|
+
}
|
|
299
|
+
if (this.extraTags) {
|
|
300
|
+
newEnvVars[constants_1.DD_TAGS_ENV_VAR] = this.extraTags;
|
|
301
|
+
}
|
|
302
|
+
newEnvVars[constants_1.LOGS_PATH_ENV_VAR] = this.logsPath;
|
|
303
|
+
// If port is specified, overwrite any existing value
|
|
304
|
+
// If port is not specified but already exists, leave the existing value unchanged
|
|
305
|
+
// If port is not specified and does not exist, default to 5555
|
|
306
|
+
let healthCheckPort = (_c = newEnvVars[constants_1.HEALTH_PORT_ENV_VAR]) !== null && _c !== void 0 ? _c : DEFAULT_HEALTH_CHECK_PORT.toString();
|
|
307
|
+
if (this.healthCheckPort) {
|
|
308
|
+
const newHealthCheckPort = Number(this.healthCheckPort);
|
|
309
|
+
if (!Number.isNaN(newHealthCheckPort)) {
|
|
310
|
+
healthCheckPort = newHealthCheckPort.toString();
|
|
311
|
+
newEnvVars[constants_1.HEALTH_PORT_ENV_VAR] = healthCheckPort;
|
|
312
|
+
}
|
|
313
|
+
}
|
|
314
|
+
const newEnv = Object.entries(newEnvVars).map(([name, value]) => ({ name, value }));
|
|
166
315
|
// Create sidecar container with volume mount and environment variables
|
|
167
|
-
|
|
168
|
-
name:
|
|
169
|
-
image:
|
|
316
|
+
return {
|
|
317
|
+
name: this.sidecarName,
|
|
318
|
+
image: this.sidecarImage,
|
|
170
319
|
volumeMounts: [
|
|
171
320
|
{
|
|
172
|
-
name:
|
|
173
|
-
mountPath:
|
|
321
|
+
name: this.sharedVolumeName,
|
|
322
|
+
mountPath: this.sharedVolumePath,
|
|
174
323
|
},
|
|
175
324
|
],
|
|
176
|
-
env:
|
|
177
|
-
{ name: constants_1.SITE_ENV_VAR, value: process.env.DD_SITE || constants_1.DATADOG_SITE_US1 },
|
|
178
|
-
{ name: constants_1.LOGS_PATH_ENV_VAR, value: `${VOLUME_MOUNT_PATH}/logs/*.log` },
|
|
179
|
-
{ name: constants_1.API_KEY_ENV_VAR, value: process.env.DD_API_KEY },
|
|
180
|
-
{ name: constants_1.HEALTH_PORT_ENV_VAR, value: '12345' },
|
|
181
|
-
{ name: constants_1.LOGS_INJECTION_ENV_VAR, value: 'true' },
|
|
182
|
-
{ name: constants_1.SERVICE_ENV_VAR, value: ddService },
|
|
183
|
-
...(this.environment ? [{ name: constants_1.ENVIRONMENT_ENV_VAR, value: this.environment }] : []),
|
|
184
|
-
...(this.version ? [{ name: constants_1.VERSION_ENV_VAR, value: this.version }] : []),
|
|
185
|
-
],
|
|
325
|
+
env: newEnv,
|
|
186
326
|
startupProbe: {
|
|
187
327
|
tcpSocket: {
|
|
188
|
-
port:
|
|
328
|
+
port: healthCheckPort,
|
|
189
329
|
},
|
|
190
330
|
initialDelaySeconds: 0,
|
|
191
331
|
periodSeconds: 10,
|
|
@@ -194,66 +334,48 @@ class InstrumentCommand extends clipanion_1.Command {
|
|
|
194
334
|
},
|
|
195
335
|
resources: {
|
|
196
336
|
limits: {
|
|
197
|
-
memory:
|
|
198
|
-
cpu:
|
|
337
|
+
memory: this.sidecarMemory,
|
|
338
|
+
cpu: this.sidecarCpus,
|
|
199
339
|
},
|
|
200
340
|
},
|
|
201
341
|
};
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
updatedContainer.volumeMounts = [
|
|
214
|
-
...existingVolumeMounts,
|
|
215
|
-
{
|
|
216
|
-
name: VOLUME_NAME,
|
|
217
|
-
mountPath: VOLUME_MOUNT_PATH,
|
|
218
|
-
},
|
|
219
|
-
];
|
|
220
|
-
}
|
|
221
|
-
// Update environment variables
|
|
222
|
-
const updatedEnvVars = [...existingEnvVars];
|
|
223
|
-
// Replace DD_SERVICE with new value
|
|
224
|
-
const serviceEnvIndex = updatedEnvVars.findIndex((envVar) => envVar.name === constants_1.SERVICE_ENV_VAR);
|
|
225
|
-
if (serviceEnvIndex >= 0) {
|
|
226
|
-
updatedEnvVars[serviceEnvIndex] = { name: constants_1.SERVICE_ENV_VAR, value: ddService };
|
|
227
|
-
}
|
|
228
|
-
else {
|
|
229
|
-
updatedEnvVars.push({ name: constants_1.SERVICE_ENV_VAR, value: ddService });
|
|
230
|
-
}
|
|
231
|
-
// Default to DD_LOGS_INJECTION=true, but don't overwrite existing value
|
|
232
|
-
const hasLogsInjection = updatedEnvVars.some((envVar) => envVar.name === constants_1.LOGS_INJECTION_ENV_VAR);
|
|
233
|
-
if (!hasLogsInjection) {
|
|
234
|
-
updatedEnvVars.push({ name: constants_1.LOGS_INJECTION_ENV_VAR, value: 'true' });
|
|
235
|
-
}
|
|
236
|
-
updatedContainer.env = updatedEnvVars;
|
|
237
|
-
return updatedContainer;
|
|
238
|
-
});
|
|
239
|
-
// Add sidecar if it doesn't exist
|
|
240
|
-
if (existingSidecarIndex < 0) {
|
|
241
|
-
updatedContainers.push(sidecarContainer);
|
|
242
|
-
}
|
|
243
|
-
// Add shared volume if it doesn't exist
|
|
244
|
-
const hasSharedVolume = volumes.some((volume) => volume.name === VOLUME_NAME);
|
|
245
|
-
const updatedVolumes = hasSharedVolume
|
|
246
|
-
? volumes
|
|
247
|
-
: [
|
|
248
|
-
...volumes,
|
|
342
|
+
}
|
|
343
|
+
// Add volume mount and update required env vars
|
|
344
|
+
updateAppContainer(appContainer, ddService) {
|
|
345
|
+
var _a;
|
|
346
|
+
const existingVolumeMounts = appContainer.volumeMounts || [];
|
|
347
|
+
const hasSharedVolumeMount = existingVolumeMounts.some((mount) => mount.name === this.sharedVolumeName);
|
|
348
|
+
const existingEnvVars = appContainer.env || [];
|
|
349
|
+
const updatedContainer = Object.assign({}, appContainer);
|
|
350
|
+
if (!hasSharedVolumeMount) {
|
|
351
|
+
updatedContainer.volumeMounts = [
|
|
352
|
+
...existingVolumeMounts,
|
|
249
353
|
{
|
|
250
|
-
name:
|
|
251
|
-
|
|
252
|
-
medium: EMPTY_DIR_VOLUME_SOURCE_MEMORY,
|
|
253
|
-
},
|
|
354
|
+
name: this.sharedVolumeName,
|
|
355
|
+
mountPath: this.sharedVolumePath,
|
|
254
356
|
},
|
|
255
357
|
];
|
|
256
|
-
|
|
358
|
+
}
|
|
359
|
+
// Update environment variables
|
|
360
|
+
const newEnvVars = {};
|
|
361
|
+
for (const { name, value } of existingEnvVars) {
|
|
362
|
+
newEnvVars[name] = value;
|
|
363
|
+
}
|
|
364
|
+
// Default to DD_LOGS_INJECTION=true, but don't overwrite existing value
|
|
365
|
+
if (!(constants_1.LOGS_INJECTION_ENV_VAR in newEnvVars)) {
|
|
366
|
+
newEnvVars[constants_1.LOGS_INJECTION_ENV_VAR] = 'true';
|
|
367
|
+
}
|
|
368
|
+
// Replace or add other env vars
|
|
369
|
+
newEnvVars[constants_1.SERVICE_ENV_VAR] = ddService;
|
|
370
|
+
newEnvVars[constants_1.API_KEY_ENV_VAR] = (_a = process.env[constants_1.API_KEY_ENV_VAR]) !== null && _a !== void 0 ? _a : '';
|
|
371
|
+
if (this.llmobs) {
|
|
372
|
+
newEnvVars[constants_1.DD_LLMOBS_ENABLED_ENV_VAR] = 'true';
|
|
373
|
+
newEnvVars[constants_1.DD_LLMOBS_ML_APP_ENV_VAR] = this.llmobs;
|
|
374
|
+
// serverless-init is installed, so agentless mode should be false
|
|
375
|
+
newEnvVars[constants_1.DD_LLMOBS_AGENTLESS_ENABLED_ENV_VAR] = 'false';
|
|
376
|
+
}
|
|
377
|
+
updatedContainer.env = Object.entries(newEnvVars).map(([name, value]) => ({ name, value }));
|
|
378
|
+
return updatedContainer;
|
|
257
379
|
}
|
|
258
380
|
}
|
|
259
381
|
exports.InstrumentCommand = InstrumentCommand;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/instrument.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"instrument.js","sourceRoot":"","sources":["../../../src/commands/cloud-run/instrument.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,25 +25,6 @@ export interface LogConfig {
|
|
|
25
25
|
fileName: string;
|
|
26
26
|
severityFilter?: string;
|
|
27
27
|
}
|
|
28
|
-
/**
|
|
29
|
-
* Configuration options provided by the user through
|
|
30
|
-
* the CLI in order to instrument properly.
|
|
31
|
-
*/
|
|
32
|
-
export interface CloudRunConfigOptions {
|
|
33
|
-
project?: string;
|
|
34
|
-
environment?: string;
|
|
35
|
-
extraTags?: string;
|
|
36
|
-
services: string[];
|
|
37
|
-
interactive?: boolean;
|
|
38
|
-
logging?: string;
|
|
39
|
-
logLevel?: string;
|
|
40
|
-
profile?: string;
|
|
41
|
-
region?: string;
|
|
42
|
-
service?: string;
|
|
43
|
-
tracing?: string;
|
|
44
|
-
version?: string;
|
|
45
|
-
llmobs?: string;
|
|
46
|
-
}
|
|
47
28
|
/**
|
|
48
29
|
* Interface for Unified Service Tagging.
|
|
49
30
|
*
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export declare const requestGCPProject: () => Promise<string>;
|
|
2
|
+
export declare const requestGCPRegion: (defaultRegion?: string) => Promise<string>;
|
|
3
|
+
export declare const requestServiceName: () => Promise<string>;
|
|
4
|
+
export declare const requestSite: () => Promise<string>;
|
|
5
|
+
export declare const requestConfirmation: (message: string, defaultValue?: boolean) => Promise<boolean>;
|