@o3r/telemetry 10.0.0-prerelease.99 → 10.1.0-prerelease.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/package.json +4 -4
- package/schematics/ng-add/index.d.ts +1 -1
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +13 -2
- package/src/builders/index.d.ts.map +1 -1
- package/src/builders/index.js +20 -6
- package/src/builders/index.js.map +1 -1
- package/src/environment/index.d.ts.map +1 -1
- package/src/environment/index.js +2 -1
- package/src/environment/index.js.map +1 -1
- package/src/schematics/index.d.ts.map +1 -1
- package/src/schematics/index.js +17 -5
- package/src/schematics/index.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/telemetry",
|
|
3
|
-
"version": "10.
|
|
3
|
+
"version": "10.1.0-prerelease.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"@nx/eslint-plugin": "~18.0.2",
|
|
38
38
|
"@nx/jest": "~18.0.2",
|
|
39
39
|
"@nx/js": "~18.0.2",
|
|
40
|
-
"@o3r/eslint-plugin": "^10.
|
|
40
|
+
"@o3r/eslint-plugin": "^10.1.0-prerelease.0",
|
|
41
41
|
"@stylistic/eslint-plugin-ts": "^1.5.4",
|
|
42
42
|
"@types/jest": "~29.5.2",
|
|
43
43
|
"@types/node": "^20.0.0",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"eslint": "^8.42.0",
|
|
48
48
|
"eslint-import-resolver-node": "^0.3.4",
|
|
49
49
|
"eslint-plugin-jest": "~27.9.0",
|
|
50
|
-
"eslint-plugin-jsdoc": "~48.
|
|
50
|
+
"eslint-plugin-jsdoc": "~48.2.0",
|
|
51
51
|
"eslint-plugin-prefer-arrow": "~1.2.3",
|
|
52
52
|
"eslint-plugin-unicorn": "^51.0.0",
|
|
53
53
|
"jest": "~29.7.0",
|
|
@@ -57,7 +57,7 @@
|
|
|
57
57
|
"rxjs": "^7.8.1",
|
|
58
58
|
"ts-jest": "~29.1.1",
|
|
59
59
|
"ts-node": "~10.9.1",
|
|
60
|
-
"typescript": "~5.
|
|
60
|
+
"typescript": "~5.3.3"
|
|
61
61
|
},
|
|
62
62
|
"schematics": "./collection.json",
|
|
63
63
|
"engines": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEtD;;;GAGG;AACH,wBAAgB,KAAK,CAAC,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAc3D"}
|
|
@@ -1,13 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ngAdd = void 0;
|
|
4
|
-
const schematics_1 = require("@angular-devkit/schematics");
|
|
5
4
|
/**
|
|
6
5
|
* Add Otter telemetry to an Otter Project
|
|
7
6
|
* @param options
|
|
8
7
|
*/
|
|
9
8
|
function ngAdd(_options) {
|
|
10
|
-
return (
|
|
9
|
+
return (tree, context) => {
|
|
10
|
+
if (tree.exists('/package.json')) {
|
|
11
|
+
const packageJson = tree.readJson('/package.json');
|
|
12
|
+
packageJson.config ||= {};
|
|
13
|
+
packageJson.config.o3rMetrics = true;
|
|
14
|
+
tree.overwrite('/package.json', JSON.stringify(packageJson, null, 2));
|
|
15
|
+
}
|
|
16
|
+
context.logger.info(`
|
|
17
|
+
By installing '@o3r/telemetry', you have activated the collection of anonymous data for Otter builders and schematics usage.
|
|
18
|
+
You can deactivate it at any time by changing 'config.o3rMetrics' in 'package.json' or by setting 'O3R_METRICS' to false as environment variable.
|
|
19
|
+
You can also temporarily deactivate it by running your builder or schematic with '--no-o3r-metrics'.
|
|
20
|
+
`);
|
|
21
|
+
};
|
|
11
22
|
}
|
|
12
23
|
exports.ngAdd = ngAdd;
|
|
13
24
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builders/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACd,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/builders/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACd,MAAM,2BAA2B,CAAC;AAKnC,OAAO,EAAkD,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5F,KAAK,gBAAgB,CAAC,CAAC,EAAE,CAAC,SAAS,aAAa,GAAG,aAAa,IAC9D,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,cAAc,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAEnD;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,EAAE,CAAC,SAAS,aAAa,GAAG,aAAa,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,KAAK,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE9J;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,EAAE,cA6DpC,CAAC"}
|
package/src/builders/index.js
CHANGED
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createBuilderWithMetrics = void 0;
|
|
4
|
-
const
|
|
4
|
+
const node_fs_1 = require("node:fs");
|
|
5
|
+
const path = require("node:path");
|
|
5
6
|
const node_perf_hooks_1 = require("node:perf_hooks");
|
|
7
|
+
const index_1 = require("../environment/index");
|
|
6
8
|
const sender_1 = require("../sender");
|
|
7
9
|
/**
|
|
8
10
|
* Wrapper method of a builder to retrieve some metrics around the builder run
|
|
@@ -46,11 +48,23 @@ const createBuilderWithMetrics = (builderFn, sendData = sender_1.sendData) => as
|
|
|
46
48
|
error
|
|
47
49
|
};
|
|
48
50
|
context.logger.debug(JSON.stringify(data, null, 2));
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
51
|
+
const packageJsonPath = path.join(context.currentDirectory, 'package.json');
|
|
52
|
+
const packageJson = (0, node_fs_1.existsSync)(packageJsonPath) ? JSON.parse((0, node_fs_1.readFileSync)(packageJsonPath, 'utf-8')) : {};
|
|
53
|
+
const shouldSendData = !!(options.o3rMetrics
|
|
54
|
+
?? ((process.env.O3R_METRICS || '').length > 0 ? process.env.O3R_METRICS !== 'false' : undefined)
|
|
55
|
+
?? packageJson.config?.o3rMetrics);
|
|
56
|
+
if (shouldSendData) {
|
|
57
|
+
if (typeof (options.o3rMetrics ?? process.env.O3R_METRICS) === 'undefined') {
|
|
58
|
+
context.logger.info('Telemetry is globally activated for the project (`config.o3rMetrics` in package.json). '
|
|
59
|
+
+ 'If you personally don\'t want to send telemetry, you can deactivate it by setting `O3R_METRICS` to false in your environment variables, '
|
|
60
|
+
+ 'or by calling the builder with `--no-o3r-metrics`.');
|
|
61
|
+
}
|
|
62
|
+
void sendData(data, context.logger).catch((e) => {
|
|
63
|
+
// Do not throw error if we don't manage to collect data
|
|
64
|
+
const err = (e instanceof Error ? e : new Error(error));
|
|
65
|
+
context.logger.error(err.stack || err.toString());
|
|
66
|
+
});
|
|
67
|
+
}
|
|
54
68
|
}
|
|
55
69
|
};
|
|
56
70
|
exports.createBuilderWithMetrics = createBuilderWithMetrics;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builders/index.ts"],"names":[],"mappings":";;;AAIA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/builders/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/environment/index.ts"],"names":[],"mappings":"AAKA,mCAAmC;AACnC,KAAK,wBAAwB,GAAG,KAAK,GAAG,MAAM,CAAC;AA0C/C,UAAU,kBAAkB;IAC1B,uCAAuC;IACvC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAYD;;GAEG;AACH,UAAU,mBAAmB;IAC3B,wCAAwC;IACxC,YAAY,EAAE,MAAM,CAAC;IACrB,gCAAgC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,QAAQ;IAChB,wBAAwB;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,SAAS;IACjB,iDAAiD;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,UAAU,WAAW;IACnB,0BAA0B;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC,qBAAqB;IACrB,EAAE,EAAE,mBAAmB,CAAC;IACxB,yBAAyB;IACzB,IAAI,EAAE,QAAQ,CAAC;IACf,kCAAkC;IAClC,cAAc,EAAE,kBAAkB,CAAC;IACnC,wBAAwB;IACxB,KAAK,EAAE,SAAS,CAAC;IACjB,6BAA6B;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,0BAA0B;IAC1B,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,QAAa,QAAQ,qBAAqB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/environment/index.ts"],"names":[],"mappings":"AAKA,mCAAmC;AACnC,KAAK,wBAAwB,GAAG,KAAK,GAAG,MAAM,CAAC;AA0C/C,UAAU,kBAAkB;IAC1B,uCAAuC;IACvC,IAAI,EAAE,wBAAwB,CAAC;IAC/B,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAYD;;GAEG;AACH,UAAU,mBAAmB;IAC3B,wCAAwC;IACxC,YAAY,EAAE,MAAM,CAAC;IACrB,gCAAgC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,+BAA+B;IAC/B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,QAAQ;IAChB,wBAAwB;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,UAAU,SAAS;IACjB,iDAAiD;IACjD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,UAAU,WAAW;IACnB,0BAA0B;IAC1B,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,qBAAqB;IACpC,qBAAqB;IACrB,EAAE,EAAE,mBAAmB,CAAC;IACxB,yBAAyB;IACzB,IAAI,EAAE,QAAQ,CAAC;IACf,kCAAkC;IAClC,cAAc,EAAE,kBAAkB,CAAC;IACnC,wBAAwB;IACxB,KAAK,EAAE,SAAS,CAAC;IACjB,6BAA6B;IAC7B,EAAE,EAAE,OAAO,CAAC;IACZ,0BAA0B;IAC1B,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAED;;;GAGG;AACH,eAAO,MAAM,kBAAkB,QAAa,QAAQ,qBAAqB,CAuCxE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,2BAA2B,uBAYvC,CAAC"}
|
package/src/environment/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/environment/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,8BAA8B;AAC9B,2DAA8C;AAC9C,kCAAkC;AAKlC;;;GAGG;AACH,SAAS,yBAAyB,CAAC,IAAU;IAC3C,OAAO,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,KAAK,CAAC;AAC3C,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB;IACxB,IAAI,yBAAyB,CAAC,OAAO,CAAC,GAAG,EAAE,wBAAwB,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/environment/index.ts"],"names":[],"mappings":";;;AAAA,8BAA8B;AAC9B,8BAA8B;AAC9B,2DAA8C;AAC9C,kCAAkC;AAKlC;;;GAGG;AACH,SAAS,yBAAyB,CAAC,IAAU;IAC3C,OAAO,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,KAAK,CAAC;AAC3C,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB;IACxB,IAAI,yBAAyB,CAAC,OAAO,CAAC,GAAG,EAAE,wBAAwB,CAAC,EAAE,CAAC;QACrE,OAAO,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;IAC9C,CAAC;IACD,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC;AAC1E,CAAC;AAED;;GAEG;AACH,SAAS,wBAAwB;IAC/B,IAAI,CAAC;QACH,OAAO,IAAA,6BAAQ,EAAC,GAAG,iBAAiB,EAAE,YAAY,EAAE;YAClD,QAAQ,EAAE,MAAM;YAChB,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC;YACnC,GAAG,EAAE;gBACH,GAAG,OAAO,CAAC,GAAG;gBACd,uGAAuG;gBACvG,gEAAgE;gBAChE,kBAAkB,EAAE,GAAG;gBACvB,gEAAgE;gBAChE,0BAA0B,EAAE,OAAO;aACpC;SACF,CAAC,CAAC,IAAI,EAAE,CAAC;IACZ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AASD;;GAEG;AACH,SAAS,qBAAqB;IAC5B,OAAO;QACL,IAAI,EAAE,iBAAiB,EAAE;QACzB,OAAO,EAAE,wBAAwB,EAAE;KACpC,CAAC;AACJ,CAAC;AAqDD;;;GAGG;AACI,MAAM,kBAAkB,GAAG,KAAK,IAAoC,EAAE;IAC3E,MAAM,MAAM,GAAG;QACb,YAAY,EAAE,EAAE,CAAC,IAAI,EAAE;QACvB,QAAQ,EAAE,EAAE,CAAC,QAAQ,EAAE;QACvB,OAAO,EAAE,EAAE,CAAC,OAAO,EAAE;KACtB,CAAC;IAEF,MAAM,QAAQ,GAAG;QACf,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC;IAEF,MAAM,kBAAkB,GAAG,qBAAqB,EAAE,CAAC;IAEnD,IAAI,wBAA4C,CAAC;IACjD,IAAI,CAAC;QACH,wBAAwB,GAAG,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACvE,CAAC;IAAC,MAAM,CAAC;QACP,2EAA2E;QAC3E,wBAAwB,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,SAAS,GAAG;QAChB,OAAO,EAAE,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,OAAiB,CAAC,CAAC,CAAC,SAAS;KAC1J,CAAC;IAEF,MAAM,EAAE,GAAG,OAAO,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,EAAE,WAAW,EAAE,KAAK,OAAO,CAAC;IAE5F,IAAI,WAA+B,CAAC;IACpC,IAAI,CAAC;QACH,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7H,CAAC;IAAC,MAAM,CAAC,CAAA,CAAC;IAEV,OAAO;QACL,EAAE,EAAE,MAAM;QACV,IAAI,EAAE,QAAQ;QACd,cAAc,EAAE,kBAAkB;QAClC,KAAK,EAAE,SAAS;QAChB,EAAE;QACF,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC3D,CAAC;AACJ,CAAC,CAAC;AAvCW,QAAA,kBAAkB,sBAuC7B;AAEF;;;GAGG;AACI,MAAM,2BAA2B,GAAG,KAAK,IAAI,EAAE;IACpD,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE,EAAE,GAAG,MAAM,IAAA,0BAAkB,GAAE,CAAC;IAC5H,OAAO;6BACoB,MAAM,CAAC,YAAY;yBACvB,MAAM,CAAC,QAAQ;wBAChB,MAAM,CAAC,OAAO;kBACpB,QAAQ,CAAC,OAAO,IAAI,WAAW;0BACvB,kBAAkB,CAAC,IAAI;6BACpB,kBAAkB,CAAC,OAAO,IAAI,WAAW;mBACnD,SAAS,CAAC,OAAO,IAAI,WAAW;QAC3C,EAAE;CACT,CAAC;AACF,CAAC,CAAC;AAZW,QAAA,2BAA2B,+BAYtC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schematics/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/schematics/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,IAAI,EAAE,MAAM,4BAA4B,CAAC;AAI5D,OAAO,EAAoD,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAE9F;;;GAGG;AACH,KAAK,kBAAkB,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,IAAI,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,EAAE,UAAU,KAAK,kBAAkB,CAAC,CAAC,CAAC,CAAC;AAEvH;;;GAGG;AACH,eAAO,MAAM,0BAA0B,EAAE,gBAmDtC,CAAC"}
|
package/src/schematics/index.js
CHANGED
|
@@ -16,6 +16,7 @@ const createSchematicWithMetrics = (schematicFn, sendData = sender_1.sendData) =
|
|
|
16
16
|
try {
|
|
17
17
|
const rule = schematicFn(options);
|
|
18
18
|
await (0, rxjs_1.lastValueFrom)((0, schematics_1.callRule)(rule, tree, context));
|
|
19
|
+
await (0, rxjs_1.lastValueFrom)(context.engine.executePostTasks());
|
|
19
20
|
}
|
|
20
21
|
catch (e) {
|
|
21
22
|
const err = e instanceof Error ? e : new Error(error);
|
|
@@ -38,11 +39,22 @@ const createSchematicWithMetrics = (schematicFn, sendData = sender_1.sendData) =
|
|
|
38
39
|
error
|
|
39
40
|
};
|
|
40
41
|
context.logger.debug(JSON.stringify(data, null, 2));
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
42
|
+
const packageJson = (tree.exists('/package.json') ? tree.readJson('/package.json') : {});
|
|
43
|
+
const shouldSendData = !!(options.o3rMetrics
|
|
44
|
+
?? ((process.env.O3R_METRICS || '').length > 0 ? process.env.O3R_METRICS !== 'false' : undefined)
|
|
45
|
+
?? packageJson.config?.o3rMetrics);
|
|
46
|
+
if (shouldSendData) {
|
|
47
|
+
if (typeof (options.o3rMetrics ?? typeof process.env.O3R_METRICS) === 'undefined') {
|
|
48
|
+
context.logger.info('Telemetry is globally activated for the project (`config.o3rMetrics` in package.json). '
|
|
49
|
+
+ 'If you personally don\'t want to send telemetry, you can deactivate it by setting `O3R_METRICS` to false in your environment variables, '
|
|
50
|
+
+ 'or by calling the schematic with `--no-o3r-metrics`.');
|
|
51
|
+
}
|
|
52
|
+
void sendData(data, context.logger).catch((e) => {
|
|
53
|
+
// Do not throw error if we don't manage to collect data
|
|
54
|
+
const err = (e instanceof Error ? e : new Error(error));
|
|
55
|
+
context.logger.error(err.stack || err.toString());
|
|
56
|
+
});
|
|
57
|
+
}
|
|
46
58
|
}
|
|
47
59
|
};
|
|
48
60
|
exports.createSchematicWithMetrics = createSchematicWithMetrics;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/schematics/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/schematics/index.ts"],"names":[],"mappings":"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"}
|