@datadog/datadog-ci 2.34.0 → 2.36.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 +12 -9
- package/dist/cli.js +1 -1
- package/dist/cli.js.map +1 -1
- package/dist/commands/dsyms/utils.js +4 -11
- package/dist/commands/dsyms/utils.js.map +1 -1
- package/dist/commands/elf-symbols/cli.d.ts +1 -0
- package/dist/commands/elf-symbols/cli.js +5 -0
- package/dist/commands/elf-symbols/cli.js.map +1 -0
- package/dist/commands/elf-symbols/elf-constants.d.ts +256 -0
- package/dist/commands/elf-symbols/elf-constants.js +462 -0
- package/dist/commands/elf-symbols/elf-constants.js.map +1 -0
- package/dist/commands/elf-symbols/elf.d.ts +103 -0
- package/dist/commands/elf-symbols/elf.js +428 -0
- package/dist/commands/elf-symbols/elf.js.map +1 -0
- package/dist/commands/elf-symbols/helpers.d.ts +4 -0
- package/dist/commands/elf-symbols/helpers.js +29 -0
- package/dist/commands/elf-symbols/helpers.js.map +1 -0
- package/dist/commands/elf-symbols/interfaces.d.ts +14 -0
- package/dist/commands/elf-symbols/interfaces.js +7 -0
- package/dist/commands/elf-symbols/interfaces.js.map +1 -0
- package/dist/commands/elf-symbols/renderer.d.ts +18 -0
- package/dist/commands/elf-symbols/renderer.js +84 -0
- package/dist/commands/elf-symbols/renderer.js.map +1 -0
- package/dist/commands/elf-symbols/upload.d.ts +25 -0
- package/dist/commands/elf-symbols/upload.js +363 -0
- package/dist/commands/elf-symbols/upload.js.map +1 -0
- package/dist/commands/git-metadata/upload.d.ts +0 -1
- package/dist/commands/git-metadata/upload.js +1 -11
- package/dist/commands/git-metadata/upload.js.map +1 -1
- package/dist/commands/synthetics/api.d.ts +7 -4
- package/dist/commands/synthetics/api.js +20 -12
- package/dist/commands/synthetics/api.js.map +1 -1
- package/dist/commands/synthetics/compatibility.d.ts +2 -0
- package/dist/commands/synthetics/compatibility.js +19 -0
- package/dist/commands/synthetics/compatibility.js.map +1 -0
- package/dist/commands/synthetics/errors.d.ts +1 -1
- package/dist/commands/synthetics/errors.js +4 -0
- package/dist/commands/synthetics/errors.js.map +1 -1
- package/dist/commands/synthetics/interfaces.d.ts +52 -2
- package/dist/commands/synthetics/interfaces.js.map +1 -1
- package/dist/commands/synthetics/mobile.d.ts +17 -25
- package/dist/commands/synthetics/mobile.js +139 -64
- package/dist/commands/synthetics/mobile.js.map +1 -1
- package/dist/commands/synthetics/reporters/constants.d.ts +6 -0
- package/dist/commands/synthetics/reporters/constants.js +14 -0
- package/dist/commands/synthetics/reporters/constants.js.map +1 -0
- package/dist/commands/synthetics/reporters/default.js +11 -15
- package/dist/commands/synthetics/reporters/default.js.map +1 -1
- package/dist/commands/synthetics/reporters/mobile/app-upload.d.ts +15 -0
- package/dist/commands/synthetics/reporters/mobile/app-upload.js +54 -0
- package/dist/commands/synthetics/reporters/mobile/app-upload.js.map +1 -0
- package/dist/commands/synthetics/run-tests-command.d.ts +1 -1
- package/dist/commands/synthetics/run-tests-command.js +8 -10
- package/dist/commands/synthetics/run-tests-command.js.map +1 -1
- package/dist/commands/synthetics/run-tests-lib.js +4 -10
- package/dist/commands/synthetics/run-tests-lib.js.map +1 -1
- package/dist/commands/synthetics/test.js +1 -1
- package/dist/commands/synthetics/test.js.map +1 -1
- package/dist/commands/synthetics/upload-application-command.js +4 -3
- package/dist/commands/synthetics/upload-application-command.js.map +1 -1
- package/dist/commands/synthetics/utils/internal.d.ts +2 -1
- package/dist/commands/synthetics/utils/internal.js +3 -1
- package/dist/commands/synthetics/utils/internal.js.map +1 -1
- package/dist/commands/synthetics/utils/public.d.ts +3 -13
- package/dist/commands/synthetics/utils/public.js +13 -19
- package/dist/commands/synthetics/utils/public.js.map +1 -1
- package/dist/commands/trace/interfaces.d.ts +1 -0
- package/dist/commands/trace/trace.d.ts +1 -0
- package/dist/commands/trace/trace.js +12 -2
- package/dist/commands/trace/trace.js.map +1 -1
- package/dist/helpers/tags.d.ts +1 -1
- package/dist/helpers/tags.js.map +1 -1
- package/dist/helpers/utils.d.ts +4 -0
- package/dist/helpers/utils.js +8 -1
- package/dist/helpers/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { Command } from 'clipanion';
|
|
2
|
+
export declare class UploadCommand extends Command {
|
|
3
|
+
static paths: string[][];
|
|
4
|
+
static usage: import("clipanion").Usage;
|
|
5
|
+
private disableGit;
|
|
6
|
+
private dryRun;
|
|
7
|
+
private configPath;
|
|
8
|
+
private maxConcurrency;
|
|
9
|
+
private repositoryUrl;
|
|
10
|
+
private symbolsLocation;
|
|
11
|
+
private cliVersion;
|
|
12
|
+
private config;
|
|
13
|
+
private gitData?;
|
|
14
|
+
execute(): Promise<0 | 1>;
|
|
15
|
+
private getApiKeyValidator;
|
|
16
|
+
private getGitDataPayload;
|
|
17
|
+
private getGitMetadata;
|
|
18
|
+
private getMappingMetadata;
|
|
19
|
+
private getMetricsLogger;
|
|
20
|
+
private getElfSymbolFiles;
|
|
21
|
+
private removeBuildIdDuplicates;
|
|
22
|
+
private performElfSymbolsUpload;
|
|
23
|
+
private checkBinUtils;
|
|
24
|
+
private verifyParameters;
|
|
25
|
+
}
|
|
@@ -0,0 +1,363 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
37
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
+
exports.UploadCommand = void 0;
|
|
39
|
+
const fs_1 = __importDefault(require("fs"));
|
|
40
|
+
const clipanion_1 = require("clipanion");
|
|
41
|
+
const glob_1 = __importDefault(require("glob"));
|
|
42
|
+
const apikey_1 = require("../../helpers/apikey");
|
|
43
|
+
const concurrency_1 = require("../../helpers/concurrency");
|
|
44
|
+
const format_git_sourcemaps_data_1 = require("../../helpers/git/format-git-sourcemaps-data");
|
|
45
|
+
const metrics_1 = require("../../helpers/metrics");
|
|
46
|
+
const upload_1 = require("../../helpers/upload");
|
|
47
|
+
const utils_1 = require("../../helpers/utils");
|
|
48
|
+
const validation = __importStar(require("../../helpers/validation"));
|
|
49
|
+
const validation_1 = require("../../helpers/validation");
|
|
50
|
+
const version_1 = require("../../helpers/version");
|
|
51
|
+
const utils_2 = require("../dsyms/utils");
|
|
52
|
+
const elf_1 = require("./elf");
|
|
53
|
+
const helpers_1 = require("./helpers");
|
|
54
|
+
const interfaces_1 = require("./interfaces");
|
|
55
|
+
const renderer_1 = require("./renderer");
|
|
56
|
+
class UploadCommand extends clipanion_1.Command {
|
|
57
|
+
constructor() {
|
|
58
|
+
super(...arguments);
|
|
59
|
+
this.disableGit = clipanion_1.Option.Boolean('--disable-git', false);
|
|
60
|
+
this.dryRun = clipanion_1.Option.Boolean('--dry-run', false);
|
|
61
|
+
this.configPath = clipanion_1.Option.String('--config');
|
|
62
|
+
this.maxConcurrency = clipanion_1.Option.String('--max-concurrency', '20', { validator: validation.isInteger() });
|
|
63
|
+
this.repositoryUrl = clipanion_1.Option.String('--repository-url');
|
|
64
|
+
this.symbolsLocation = clipanion_1.Option.String('--symbols-location', './');
|
|
65
|
+
this.cliVersion = version_1.version;
|
|
66
|
+
this.config = {
|
|
67
|
+
datadogSite: 'datadoghq.com',
|
|
68
|
+
};
|
|
69
|
+
}
|
|
70
|
+
execute() {
|
|
71
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
72
|
+
if (!(yield this.verifyParameters())) {
|
|
73
|
+
return 1;
|
|
74
|
+
}
|
|
75
|
+
const initialTime = Date.now();
|
|
76
|
+
this.context.stdout.write((0, renderer_1.renderCommandInfo)(this.dryRun, this.symbolsLocation));
|
|
77
|
+
this.config = yield (0, utils_1.resolveConfigFromFileAndEnvironment)(this.config, {
|
|
78
|
+
apiKey: process.env.DATADOG_API_KEY,
|
|
79
|
+
datadogSite: process.env.DATADOG_SITE,
|
|
80
|
+
}, {
|
|
81
|
+
configPath: this.configPath,
|
|
82
|
+
defaultConfigPaths: utils_1.DEFAULT_CONFIG_PATHS,
|
|
83
|
+
configFromFileCallback: (configFromFile) => {
|
|
84
|
+
(0, validation_1.checkAPIKeyOverride)(process.env.DATADOG_API_KEY, configFromFile.apiKey, this.context.stdout);
|
|
85
|
+
},
|
|
86
|
+
});
|
|
87
|
+
if (!this.disableGit) {
|
|
88
|
+
this.gitData = yield this.getGitMetadata();
|
|
89
|
+
}
|
|
90
|
+
const callResults = [];
|
|
91
|
+
try {
|
|
92
|
+
callResults.push(...(yield this.performElfSymbolsUpload()));
|
|
93
|
+
const totalTime = (Date.now() - initialTime) / 1000;
|
|
94
|
+
this.context.stdout.write((0, renderer_1.renderCommandSummary)(callResults, totalTime, this.dryRun));
|
|
95
|
+
}
|
|
96
|
+
catch (e) {
|
|
97
|
+
this.context.stderr.write((0, renderer_1.renderGeneralizedError)(e));
|
|
98
|
+
return 1;
|
|
99
|
+
}
|
|
100
|
+
return 0;
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
getApiKeyValidator(metricsLogger) {
|
|
104
|
+
return (0, apikey_1.newApiKeyValidator)({
|
|
105
|
+
apiKey: this.config.apiKey,
|
|
106
|
+
datadogSite: this.config.datadogSite,
|
|
107
|
+
metricsLogger: metricsLogger.logger,
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
getGitDataPayload(gitData) {
|
|
111
|
+
const files = gitData.trackedFilesMatcher.rawTrackedFilesList();
|
|
112
|
+
const repoPayload = {
|
|
113
|
+
data: [
|
|
114
|
+
{
|
|
115
|
+
files,
|
|
116
|
+
hash: gitData.hash,
|
|
117
|
+
repository_url: gitData.remote,
|
|
118
|
+
},
|
|
119
|
+
],
|
|
120
|
+
version: 1,
|
|
121
|
+
};
|
|
122
|
+
return {
|
|
123
|
+
type: 'string',
|
|
124
|
+
options: { filename: 'repository', contentType: 'application/json' },
|
|
125
|
+
value: JSON.stringify(repoPayload),
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
getGitMetadata() {
|
|
129
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
130
|
+
try {
|
|
131
|
+
return yield (0, format_git_sourcemaps_data_1.getRepositoryData)(yield (0, format_git_sourcemaps_data_1.newSimpleGit)(), this.repositoryUrl);
|
|
132
|
+
}
|
|
133
|
+
catch (e) {
|
|
134
|
+
this.context.stdout.write((0, renderer_1.renderGitWarning)(e));
|
|
135
|
+
}
|
|
136
|
+
return undefined;
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
getMappingMetadata(gnuBuildId, goBuildId, fileHash, arch) {
|
|
140
|
+
var _a, _b;
|
|
141
|
+
return {
|
|
142
|
+
arch,
|
|
143
|
+
gnu_build_id: gnuBuildId,
|
|
144
|
+
go_build_id: goBuildId,
|
|
145
|
+
file_hash: fileHash,
|
|
146
|
+
cli_version: this.cliVersion,
|
|
147
|
+
git_commit_sha: (_a = this.gitData) === null || _a === void 0 ? void 0 : _a.hash,
|
|
148
|
+
git_repository_url: (_b = this.gitData) === null || _b === void 0 ? void 0 : _b.remote,
|
|
149
|
+
platform: 'elf',
|
|
150
|
+
type: interfaces_1.TYPE_ELF_DEBUG_INFOS,
|
|
151
|
+
};
|
|
152
|
+
}
|
|
153
|
+
getMetricsLogger() {
|
|
154
|
+
const metricsLogger = (0, metrics_1.getMetricsLogger)({
|
|
155
|
+
apiKey: this.config.apiKey,
|
|
156
|
+
datadogSite: this.config.datadogSite,
|
|
157
|
+
defaultTags: [`cli_version:${this.cliVersion}`, 'platform:elf'],
|
|
158
|
+
prefix: 'datadog.ci.elf_symbols.',
|
|
159
|
+
});
|
|
160
|
+
return metricsLogger;
|
|
161
|
+
}
|
|
162
|
+
getElfSymbolFiles(symbolsLocation) {
|
|
163
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
164
|
+
let files = [];
|
|
165
|
+
let reportFailure;
|
|
166
|
+
if (fs_1.default.statSync(symbolsLocation).isDirectory()) {
|
|
167
|
+
files = glob_1.default.sync((0, utils_1.buildPath)(symbolsLocation, '**'), { nodir: true });
|
|
168
|
+
reportFailure = (message) => this.context.stdout.write((0, renderer_1.renderWarning)(message));
|
|
169
|
+
}
|
|
170
|
+
else {
|
|
171
|
+
files = [symbolsLocation];
|
|
172
|
+
// in single file mode, we want to report failures as errors
|
|
173
|
+
reportFailure = (message) => {
|
|
174
|
+
throw Error(message);
|
|
175
|
+
};
|
|
176
|
+
}
|
|
177
|
+
const filesMetadata = [];
|
|
178
|
+
for (const file of files) {
|
|
179
|
+
// check that path is a file and is an ELF file
|
|
180
|
+
if (fs_1.default.lstatSync(file).isFile()) {
|
|
181
|
+
const metadata = yield (0, elf_1.getElfFileMetadata)(file);
|
|
182
|
+
// handle all possible failures
|
|
183
|
+
if (!metadata.isElf) {
|
|
184
|
+
reportFailure(`Input location ${file} is not an ELF file`);
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
if (metadata.error) {
|
|
188
|
+
reportFailure(`Error reading ELF file ${file}: ${metadata.error.message}`);
|
|
189
|
+
continue;
|
|
190
|
+
}
|
|
191
|
+
if (!(0, elf_1.isSupportedElfType)(metadata.type)) {
|
|
192
|
+
reportFailure(`Skipped ${file} because its not an executable, nor a shared library`);
|
|
193
|
+
continue;
|
|
194
|
+
}
|
|
195
|
+
if (!(0, elf_1.isSupportedArch)(metadata.arch)) {
|
|
196
|
+
reportFailure(`Skipped ${file} because it has an unsupported architecture (${metadata.arch})`);
|
|
197
|
+
continue;
|
|
198
|
+
}
|
|
199
|
+
if (!(metadata.gnuBuildId || metadata.goBuildId || metadata.fileHash)) {
|
|
200
|
+
reportFailure(`Skipped ${file} because it has no build id`);
|
|
201
|
+
continue;
|
|
202
|
+
}
|
|
203
|
+
if (!metadata.hasDebugInfo && !metadata.hasSymbols) {
|
|
204
|
+
reportFailure(`Skipped ${file} because it has no debug info, nor symbols`);
|
|
205
|
+
continue;
|
|
206
|
+
}
|
|
207
|
+
filesMetadata.push(metadata);
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
// sort files to make output deterministic
|
|
211
|
+
filesMetadata.sort((a, b) => a.filename.localeCompare(b.filename));
|
|
212
|
+
return filesMetadata;
|
|
213
|
+
});
|
|
214
|
+
}
|
|
215
|
+
removeBuildIdDuplicates(filesMetadata) {
|
|
216
|
+
const buildIds = new Map();
|
|
217
|
+
for (const metadata of filesMetadata) {
|
|
218
|
+
const buildId = (0, elf_1.getBuildId)(metadata);
|
|
219
|
+
const existing = buildIds.get(buildId);
|
|
220
|
+
if (existing) {
|
|
221
|
+
if ((metadata.hasDebugInfo && !existing.hasDebugInfo) || (metadata.hasSymbols && !existing.hasSymbols)) {
|
|
222
|
+
// if we have a duplicate build_id, we keep the one with debug info and symbols
|
|
223
|
+
this.context.stderr.write((0, renderer_1.renderWarning)(`Duplicate build_id found: ${buildId} in ${metadata.filename} and ${existing.filename} - skipping ${existing.filename} because it has no debug info or symbols`));
|
|
224
|
+
buildIds.set(buildId, metadata);
|
|
225
|
+
}
|
|
226
|
+
else {
|
|
227
|
+
// if both files have debug info and symbols, we keep the first one
|
|
228
|
+
this.context.stderr.write((0, renderer_1.renderWarning)(`Duplicate build_id found: ${buildId} in ${metadata.filename} and ${existing.filename} - skipping ${metadata.filename}`));
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
else {
|
|
232
|
+
buildIds.set(buildId, metadata);
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
return Array.from(buildIds.values()).sort((a, b) => a.filename.localeCompare(b.filename));
|
|
236
|
+
}
|
|
237
|
+
performElfSymbolsUpload() {
|
|
238
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
239
|
+
const metricsLogger = this.getMetricsLogger();
|
|
240
|
+
const apiKeyValidator = this.getApiKeyValidator(metricsLogger);
|
|
241
|
+
let elfFilesMetadata = yield this.getElfSymbolFiles(this.symbolsLocation);
|
|
242
|
+
elfFilesMetadata = this.removeBuildIdDuplicates(elfFilesMetadata);
|
|
243
|
+
const requestBuilder = (0, helpers_1.getElfRequestBuilder)(this.config.apiKey, this.cliVersion, this.config.datadogSite);
|
|
244
|
+
const tmpDirectory = yield (0, utils_2.createUniqueTmpDirectory)();
|
|
245
|
+
try {
|
|
246
|
+
const results = yield (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, elfFilesMetadata, (fileMetadata) => __awaiter(this, void 0, void 0, function* () {
|
|
247
|
+
const metadata = this.getMappingMetadata(fileMetadata.gnuBuildId, fileMetadata.goBuildId, fileMetadata.fileHash, fileMetadata.arch);
|
|
248
|
+
const outputFilename = (0, elf_1.getOutputFilenameFromBuildId)(fileMetadata.gnuBuildId || fileMetadata.goBuildId || fileMetadata.fileHash);
|
|
249
|
+
const outputFilePath = (0, utils_1.buildPath)(tmpDirectory, outputFilename);
|
|
250
|
+
yield (0, elf_1.copyElfDebugInfo)(fileMetadata.filename, outputFilePath, fileMetadata, false);
|
|
251
|
+
if (this.dryRun) {
|
|
252
|
+
this.context.stdout.write(`[DRYRUN] ${(0, renderer_1.renderUpload)(fileMetadata.filename, (0, elf_1.getBuildId)(fileMetadata))}`);
|
|
253
|
+
return upload_1.UploadStatus.Success;
|
|
254
|
+
}
|
|
255
|
+
const payload = {
|
|
256
|
+
content: new Map([
|
|
257
|
+
[
|
|
258
|
+
'event',
|
|
259
|
+
{
|
|
260
|
+
type: 'string',
|
|
261
|
+
value: JSON.stringify(metadata),
|
|
262
|
+
options: { filename: 'event', contentType: 'application/json' },
|
|
263
|
+
},
|
|
264
|
+
],
|
|
265
|
+
[
|
|
266
|
+
interfaces_1.VALUE_NAME_ELF_DEBUG_INFOS,
|
|
267
|
+
{
|
|
268
|
+
type: 'file',
|
|
269
|
+
path: outputFilePath,
|
|
270
|
+
options: { filename: interfaces_1.ELF_DEBUG_INFOS_FILENAME },
|
|
271
|
+
},
|
|
272
|
+
],
|
|
273
|
+
]),
|
|
274
|
+
};
|
|
275
|
+
if (this.gitData !== undefined) {
|
|
276
|
+
payload.content.set('repository', this.getGitDataPayload(this.gitData));
|
|
277
|
+
}
|
|
278
|
+
return (0, helpers_1.uploadMultipartHelper)(requestBuilder, payload, {
|
|
279
|
+
apiKeyValidator,
|
|
280
|
+
onError: (e) => {
|
|
281
|
+
this.context.stdout.write((0, renderer_1.renderFailedUpload)(fileMetadata.filename, e.message));
|
|
282
|
+
metricsLogger.logger.increment('failed', 1);
|
|
283
|
+
},
|
|
284
|
+
onRetry: (e, attempts) => {
|
|
285
|
+
this.context.stdout.write((0, renderer_1.renderRetriedUpload)(fileMetadata.filename, e.message, attempts));
|
|
286
|
+
metricsLogger.logger.increment('retries', 1);
|
|
287
|
+
},
|
|
288
|
+
onUpload: () => {
|
|
289
|
+
this.context.stdout.write((0, renderer_1.renderUpload)(fileMetadata.filename, (0, elf_1.getBuildId)(fileMetadata)));
|
|
290
|
+
},
|
|
291
|
+
retries: 5,
|
|
292
|
+
useGzip: true,
|
|
293
|
+
}).finally(() => {
|
|
294
|
+
// ignore errors when removing the file
|
|
295
|
+
fs_1.default.rm(outputFilePath, () => { });
|
|
296
|
+
});
|
|
297
|
+
}));
|
|
298
|
+
return results;
|
|
299
|
+
}
|
|
300
|
+
catch (error) {
|
|
301
|
+
throw error;
|
|
302
|
+
}
|
|
303
|
+
finally {
|
|
304
|
+
yield (0, utils_2.deleteDirectory)(tmpDirectory);
|
|
305
|
+
try {
|
|
306
|
+
yield metricsLogger.flush();
|
|
307
|
+
}
|
|
308
|
+
catch (err) {
|
|
309
|
+
this.context.stdout.write(`WARN: ${err}\n`);
|
|
310
|
+
}
|
|
311
|
+
}
|
|
312
|
+
});
|
|
313
|
+
}
|
|
314
|
+
checkBinUtils() {
|
|
315
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
316
|
+
try {
|
|
317
|
+
yield (0, utils_1.execute)('objcopy --version');
|
|
318
|
+
return true;
|
|
319
|
+
}
|
|
320
|
+
catch (e) {
|
|
321
|
+
return false;
|
|
322
|
+
}
|
|
323
|
+
});
|
|
324
|
+
}
|
|
325
|
+
verifyParameters() {
|
|
326
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
327
|
+
let parametersOkay = true;
|
|
328
|
+
if (!this.symbolsLocation) {
|
|
329
|
+
this.context.stderr.write((0, renderer_1.renderArgumentMissingError)('symbols-location'));
|
|
330
|
+
parametersOkay = false;
|
|
331
|
+
}
|
|
332
|
+
else {
|
|
333
|
+
if (fs_1.default.existsSync(this.symbolsLocation)) {
|
|
334
|
+
const stats = fs_1.default.statSync(this.symbolsLocation);
|
|
335
|
+
if (!stats.isDirectory() && !stats.isFile()) {
|
|
336
|
+
this.context.stderr.write((0, renderer_1.renderInvalidSymbolsLocation)(this.symbolsLocation));
|
|
337
|
+
parametersOkay = false;
|
|
338
|
+
}
|
|
339
|
+
}
|
|
340
|
+
else {
|
|
341
|
+
this.context.stderr.write((0, renderer_1.renderInvalidSymbolsLocation)(this.symbolsLocation));
|
|
342
|
+
parametersOkay = false;
|
|
343
|
+
}
|
|
344
|
+
}
|
|
345
|
+
if (!(yield this.checkBinUtils())) {
|
|
346
|
+
this.context.stderr.write((0, renderer_1.renderMissingBinUtils)());
|
|
347
|
+
parametersOkay = false;
|
|
348
|
+
}
|
|
349
|
+
return parametersOkay;
|
|
350
|
+
});
|
|
351
|
+
}
|
|
352
|
+
}
|
|
353
|
+
exports.UploadCommand = UploadCommand;
|
|
354
|
+
UploadCommand.paths = [['elf-symbols', 'upload']];
|
|
355
|
+
UploadCommand.usage = clipanion_1.Command.Usage({
|
|
356
|
+
category: 'RUM',
|
|
357
|
+
description: 'Upload Elf debug info files to Datadog.',
|
|
358
|
+
details: `
|
|
359
|
+
This command will upload debug info from all Elf files found recursively in the given location in order to symbolicate profiles
|
|
360
|
+
`,
|
|
361
|
+
examples: [['Upload debug infos for all Elf files in the current directory', 'datadog-ci elf-symbols upload']],
|
|
362
|
+
});
|
|
363
|
+
//# sourceMappingURL=upload.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/elf-symbols/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.UploadCommand = void 0;
|
|
16
16
|
const chalk_1 = __importDefault(require("chalk"));
|
|
17
17
|
const clipanion_1 = require("clipanion");
|
|
18
|
-
const constants_1 = require("../../constants");
|
|
19
18
|
const apikey_1 = require("../../helpers/apikey");
|
|
20
19
|
const errors_1 = require("../../helpers/errors");
|
|
21
20
|
const formatting_1 = require("../../helpers/formatting");
|
|
@@ -107,13 +106,7 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
107
106
|
this.logger.info(`${this.dryRun ? '[DRYRUN] ' : ''}Successfully synced git DB in ${elapsed} seconds.`);
|
|
108
107
|
}
|
|
109
108
|
catch (err) {
|
|
110
|
-
|
|
111
|
-
this.logger.warn(`Could not write to GitDB: ${err}`);
|
|
112
|
-
}
|
|
113
|
-
else {
|
|
114
|
-
// Skip the warning for Gov DC since git sync is not available there yet.
|
|
115
|
-
this.logger.warn(`Not writing to GitDB: not available for gov`);
|
|
116
|
-
}
|
|
109
|
+
this.logger.warn(`Could not write to GitDB: ${err}`);
|
|
117
110
|
}
|
|
118
111
|
}
|
|
119
112
|
try {
|
|
@@ -197,9 +190,6 @@ class UploadCommand extends clipanion_1.Command {
|
|
|
197
190
|
baseUrl: 'https://' + api_1.apiHost,
|
|
198
191
|
});
|
|
199
192
|
}
|
|
200
|
-
isTargetingGov() {
|
|
201
|
-
return api_1.datadogSite === constants_1.DATADOG_SITE_GOV;
|
|
202
|
-
}
|
|
203
193
|
}
|
|
204
194
|
exports.UploadCommand = UploadCommand;
|
|
205
195
|
UploadCommand.paths = [['git-metadata', 'upload']];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/upload.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,kDAAyB;AACzB,yCAAyC;AAEzC
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/git-metadata/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { AxiosError, AxiosPromise, AxiosRequestConfig } from 'axios';
|
|
3
|
-
import { APIConfiguration, APIHelperConfig, Batch, MobileApplicationUploadPart, MobileApplicationUploadPartResponse,
|
|
3
|
+
import { APIConfiguration, APIHelperConfig, Batch, MobileApplicationUploadPart, MobileApplicationUploadPartResponse, Payload, PollResult, MultipartPresignedUrlsResponse, ServerTest, SyntheticsOrgSettings, TestSearchResult, Trigger, MobileAppUploadResult, MobileApplicationNewVersionParams } from './interfaces';
|
|
4
4
|
interface BackendError {
|
|
5
5
|
errors: string[];
|
|
6
6
|
}
|
|
@@ -10,7 +10,10 @@ export declare class EndpointError extends Error {
|
|
|
10
10
|
constructor(message: string, status: number);
|
|
11
11
|
}
|
|
12
12
|
export declare const formatBackendErrors: (requestError: AxiosError<BackendError>) => string;
|
|
13
|
-
export declare const completeMultipartMobileApplicationUpload: (request: (args: AxiosRequestConfig) => AxiosPromise<
|
|
13
|
+
export declare const completeMultipartMobileApplicationUpload: (request: (args: AxiosRequestConfig) => AxiosPromise<{
|
|
14
|
+
job_id: string;
|
|
15
|
+
}>) => (applicationId: string, uploadId: string, key: string, uploadPartResponses: MobileApplicationUploadPartResponse[], newVersionParams?: MobileApplicationNewVersionParams) => Promise<string>;
|
|
16
|
+
export declare const pollMobileApplicationUploadResponse: (request: (args: AxiosRequestConfig) => AxiosPromise<MobileAppUploadResult>) => (jobId: string) => Promise<MobileAppUploadResult>;
|
|
14
17
|
export type RetryPolicy = {
|
|
15
18
|
retryOn404?: boolean | undefined;
|
|
16
19
|
retryOn429?: boolean | undefined;
|
|
@@ -33,8 +36,8 @@ export declare const apiConstructor: (configuration: APIConfiguration) => {
|
|
|
33
36
|
searchTests: (query: string) => Promise<TestSearchResult>;
|
|
34
37
|
triggerTests: (data: Payload) => Promise<Trigger>;
|
|
35
38
|
uploadMobileApplicationPart: (parts: MobileApplicationUploadPart[], multipartPresignedUrlsParams: MultipartPresignedUrlsResponse['multipart_presigned_urls_params']) => Promise<MobileApplicationUploadPartResponse[]>;
|
|
36
|
-
completeMultipartMobileApplicationUpload: (applicationId: string, uploadId: string, key: string, uploadPartResponses: MobileApplicationUploadPartResponse[]) => Promise<
|
|
37
|
-
|
|
39
|
+
completeMultipartMobileApplicationUpload: (applicationId: string, uploadId: string, key: string, uploadPartResponses: MobileApplicationUploadPartResponse[], newVersionParams?: MobileApplicationNewVersionParams) => Promise<string>;
|
|
40
|
+
pollMobileApplicationUploadResponse: (jobId: string) => Promise<MobileAppUploadResult>;
|
|
38
41
|
};
|
|
39
42
|
export type APIHelper = ReturnType<typeof apiConstructor>;
|
|
40
43
|
export declare const getApiHelper: (config: APIHelperConfig) => APIHelper;
|
|
@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.getApiHelper = exports.apiConstructor = exports.is5xxError = exports.isNodeError = exports.isTooManyRequestsError = exports.isNotFoundError = exports.isForbiddenError = exports.determineRetryDelay = exports.completeMultipartMobileApplicationUpload = exports.formatBackendErrors = exports.EndpointError = void 0;
|
|
12
|
+
exports.getApiHelper = exports.apiConstructor = exports.is5xxError = exports.isNodeError = exports.isTooManyRequestsError = exports.isNotFoundError = exports.isForbiddenError = exports.determineRetryDelay = exports.pollMobileApplicationUploadResponse = exports.completeMultipartMobileApplicationUpload = exports.formatBackendErrors = exports.EndpointError = void 0;
|
|
13
13
|
const querystring_1 = require("querystring");
|
|
14
14
|
const axios_1 = require("axios");
|
|
15
15
|
const utils_1 = require("../../helpers/utils");
|
|
@@ -19,7 +19,7 @@ const public_1 = require("./utils/public");
|
|
|
19
19
|
const MAX_RETRIES = 3;
|
|
20
20
|
const DELAY_BETWEEN_RETRIES = 500; // In ms
|
|
21
21
|
const LARGE_DELAY_BETWEEN_RETRIES = 1000; // In ms
|
|
22
|
-
// SYNTH-13709: Use the `Retry-After` header.
|
|
22
|
+
// TODO SYNTH-13709: Use the `Retry-After` header.
|
|
23
23
|
const DELAY_BETWEEN_429_RETRIES = 5000; // In ms
|
|
24
24
|
class EndpointError extends Error {
|
|
25
25
|
constructor(message, status) {
|
|
@@ -143,7 +143,8 @@ const uploadMobileApplicationPart = (request) => (parts, multipartPresignedUrlsP
|
|
|
143
143
|
method: 'PUT',
|
|
144
144
|
url: presignedUrl,
|
|
145
145
|
}, request);
|
|
146
|
-
|
|
146
|
+
// Azure part-upload does not return ETag headers, so our backend ignores it for Azure
|
|
147
|
+
const quotedEtag = isAzureUrl(presignedUrl) ? '' : resp.headers.etag;
|
|
147
148
|
return {
|
|
148
149
|
ETag: quotedEtag.replace(/"/g, ''),
|
|
149
150
|
PartNumber: Number(partNumber),
|
|
@@ -151,26 +152,29 @@ const uploadMobileApplicationPart = (request) => (parts, multipartPresignedUrlsP
|
|
|
151
152
|
}));
|
|
152
153
|
return Promise.all(promises);
|
|
153
154
|
});
|
|
154
|
-
const completeMultipartMobileApplicationUpload = (request) => (applicationId, uploadId, key, uploadPartResponses) => __awaiter(void 0, void 0, void 0, function* () {
|
|
155
|
-
yield retryRequest({
|
|
155
|
+
const completeMultipartMobileApplicationUpload = (request) => (applicationId, uploadId, key, uploadPartResponses, newVersionParams) => __awaiter(void 0, void 0, void 0, function* () {
|
|
156
|
+
const resp = yield retryRequest({
|
|
156
157
|
data: {
|
|
157
158
|
key,
|
|
159
|
+
newVersionParams,
|
|
158
160
|
parts: uploadPartResponses,
|
|
159
161
|
uploadId,
|
|
162
|
+
validateMode: newVersionParams ? 'validate-and-persist' : 'validate-only',
|
|
160
163
|
},
|
|
161
164
|
method: 'POST',
|
|
162
165
|
url: `/synthetics/mobile/applications/${applicationId}/multipart-upload-complete`,
|
|
163
166
|
}, request);
|
|
167
|
+
return resp.data.job_id;
|
|
164
168
|
});
|
|
165
169
|
exports.completeMultipartMobileApplicationUpload = completeMultipartMobileApplicationUpload;
|
|
166
|
-
const
|
|
167
|
-
const
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
url: `/synthetics/mobile/applications/versions`,
|
|
170
|
+
const pollMobileApplicationUploadResponse = (request) => (jobId) => __awaiter(void 0, void 0, void 0, function* () {
|
|
171
|
+
const response = yield retryRequest({
|
|
172
|
+
method: 'GET',
|
|
173
|
+
url: `/synthetics/mobile/applications/validation-job-status/${jobId}`,
|
|
171
174
|
}, request);
|
|
172
|
-
return
|
|
175
|
+
return response.data;
|
|
173
176
|
});
|
|
177
|
+
exports.pollMobileApplicationUploadResponse = pollMobileApplicationUploadResponse;
|
|
174
178
|
const retryWithJitter = (delay = DELAY_BETWEEN_429_RETRIES) => delay + Math.floor(Math.random() * delay);
|
|
175
179
|
const determineRetryDelay = (retries, error, retryPolicy = { retryOn404: false, retryOn429: false }) => {
|
|
176
180
|
// Always retry on Node.js errors
|
|
@@ -224,7 +228,7 @@ const apiConstructor = (configuration) => {
|
|
|
224
228
|
triggerTests: triggerTests(requestIntake),
|
|
225
229
|
uploadMobileApplicationPart: uploadMobileApplicationPart(request),
|
|
226
230
|
completeMultipartMobileApplicationUpload: (0, exports.completeMultipartMobileApplicationUpload)(requestUnstable),
|
|
227
|
-
|
|
231
|
+
pollMobileApplicationUploadResponse: (0, exports.pollMobileApplicationUploadResponse)(requestUnstable),
|
|
228
232
|
};
|
|
229
233
|
};
|
|
230
234
|
exports.apiConstructor = apiConstructor;
|
|
@@ -245,4 +249,8 @@ const getApiHelper = (config) => {
|
|
|
245
249
|
});
|
|
246
250
|
};
|
|
247
251
|
exports.getApiHelper = getApiHelper;
|
|
252
|
+
const isAzureUrl = (presignedUrl) => {
|
|
253
|
+
// https://learn.microsoft.com/en-us/rest/api/storageservices/put-blob-from-url?tabs=microsoft-entra-id#request
|
|
254
|
+
return presignedUrl.includes('.blob.core.windows.net');
|
|
255
|
+
};
|
|
248
256
|
//# sourceMappingURL=api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/synthetics/api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAqC;AAIrC,iCAAkC;AAElC,+CAAqD;AAErD,qCAAsC;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/synthetics/api.ts"],"names":[],"mappings":"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"}
|