@salesforce/plugin-telemetry 2.3.8 → 3.1.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 +2 -2
- package/lib/commandExecution.js +25 -16
- package/lib/commandExecution.js.map +1 -1
- package/lib/commands/telemetry.js +8 -11
- package/lib/commands/telemetry.js.map +1 -1
- package/lib/debugger.d.ts +2 -3
- package/lib/debugger.js +2 -8
- package/lib/debugger.js.map +1 -1
- package/lib/hooks/telemetryPrerun.js +24 -44
- package/lib/hooks/telemetryPrerun.js.map +1 -1
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -17
- package/lib/index.js.map +1 -1
- package/lib/telemetry.js +55 -53
- package/lib/telemetry.js.map +1 -1
- package/lib/telemetryGlobal.d.ts +1 -1
- package/lib/telemetryGlobal.js +1 -2
- package/lib/telemetryGlobal.js.map +1 -1
- package/lib/uploader.d.ts +2 -1
- package/lib/uploader.js +22 -23
- package/lib/uploader.js.map +1 -1
- package/oclif.lock +8152 -0
- package/oclif.manifest.json +26 -12
- package/package.json +28 -44
- package/processes/upload.js +21 -0
- package/processes/upload +0 -13
package/README.md
CHANGED
|
@@ -10,10 +10,10 @@ This plugin is bundled with the CLI and will automatically collect usage data on
|
|
|
10
10
|
|
|
11
11
|
All command usage is recorded by initializing on the `init` oclif hook, recording all events to a log file, then spawning a process on exit to send the data to appinsights.
|
|
12
12
|
|
|
13
|
-
To debug the telemetry spawned process, run a command with the environment variables `SF_TELEMETRY_DEBUG=true` and `DEBUG=
|
|
13
|
+
To debug the telemetry spawned process, run a command with the environment variables `SF_TELEMETRY_DEBUG=true` and `DEBUG=sf:telemetry`.
|
|
14
14
|
|
|
15
15
|
```bash
|
|
16
|
-
SF_TELEMETRY_DEBUG=true DEBUG=
|
|
16
|
+
SF_TELEMETRY_DEBUG=true DEBUG=sf:telemetry* ./bin/dev telemetry
|
|
17
17
|
```
|
|
18
18
|
|
|
19
19
|
## Getting Started
|
package/lib/commandExecution.js
CHANGED
|
@@ -1,22 +1,28 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
7
|
+
import { Flags, Parser } from '@oclif/core';
|
|
8
|
+
import { AsyncCreatable } from '@salesforce/kit';
|
|
9
|
+
import { isNumber } from '@salesforce/ts-types';
|
|
10
|
+
import { debug } from './debugger.js';
|
|
11
|
+
export class CommandExecution extends AsyncCreatable {
|
|
12
|
+
status;
|
|
13
|
+
specifiedFlags = [];
|
|
14
|
+
specifiedFlagFullNames = [];
|
|
15
|
+
deprecatedFlagsUsed = [];
|
|
16
|
+
deprecatedCommandUsed;
|
|
17
|
+
command;
|
|
18
|
+
argv;
|
|
19
|
+
config;
|
|
20
|
+
orgId;
|
|
21
|
+
devhubId;
|
|
22
|
+
orgApiVersion;
|
|
23
|
+
devhubApiVersion;
|
|
15
24
|
constructor(options) {
|
|
16
25
|
super(options);
|
|
17
|
-
this.specifiedFlags = [];
|
|
18
|
-
this.specifiedFlagFullNames = [];
|
|
19
|
-
this.deprecatedFlagsUsed = [];
|
|
20
26
|
this.command = options.command;
|
|
21
27
|
this.argv = options.argv;
|
|
22
28
|
this.config = options.config;
|
|
@@ -61,7 +67,7 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
61
67
|
// Execution information
|
|
62
68
|
date: new Date().toUTCString(),
|
|
63
69
|
// Don't log status or timestamp as a number, otherwise vscode will think it is a metric
|
|
64
|
-
status:
|
|
70
|
+
status: isNumber(this.status) ? this.status.toString() : undefined,
|
|
65
71
|
timestamp: String(Date.now()),
|
|
66
72
|
// Salesforce Information
|
|
67
73
|
orgId: this.orgId,
|
|
@@ -81,7 +87,11 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
81
87
|
}
|
|
82
88
|
async init() {
|
|
83
89
|
const argv = this.argv;
|
|
84
|
-
const flagDefinitions =
|
|
90
|
+
const flagDefinitions = {
|
|
91
|
+
...this.command.flags,
|
|
92
|
+
...this.command.baseFlags,
|
|
93
|
+
...(this.command.enableJsonFlag ? { json: Flags.boolean() } : {}),
|
|
94
|
+
};
|
|
85
95
|
// slice off node or bin path, and the executable path, and then remove anything that's been processed as a flag
|
|
86
96
|
const typedCommand = process.argv
|
|
87
97
|
.splice(2)
|
|
@@ -97,7 +107,7 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
97
107
|
}
|
|
98
108
|
let flags = {};
|
|
99
109
|
try {
|
|
100
|
-
flags = (await
|
|
110
|
+
flags = (await Parser.parse(argv, {
|
|
101
111
|
flags: flagDefinitions,
|
|
102
112
|
args: this.command.args,
|
|
103
113
|
// @ts-expect-error because varargs is not on SfCommand but is on SfdxCommand
|
|
@@ -105,7 +115,7 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
105
115
|
})).flags;
|
|
106
116
|
}
|
|
107
117
|
catch (error) {
|
|
108
|
-
|
|
118
|
+
debug('Error parsing flags');
|
|
109
119
|
}
|
|
110
120
|
this.orgId = flags['target-org'] ? flags['target-org'].getOrgId() : null;
|
|
111
121
|
this.devhubId = flags['target-dev-hub'] ? flags['target-dev-hub'].getOrgId() : null;
|
|
@@ -155,5 +165,4 @@ class CommandExecution extends kit_1.AsyncCreatable {
|
|
|
155
165
|
}
|
|
156
166
|
}
|
|
157
167
|
}
|
|
158
|
-
exports.CommandExecution = CommandExecution;
|
|
159
168
|
//# sourceMappingURL=commandExecution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandExecution.js","sourceRoot":"","sources":["../src/commandExecution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"commandExecution.js","sourceRoot":"","sources":["../src/commandExecution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,31 +1,28 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2018, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
7
|
+
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
8
|
+
import { isEnabled } from '@salesforce/telemetry/enabledCheck';
|
|
9
|
+
import Telemetry from '../telemetry.js';
|
|
10
|
+
export default class TelemetryGet extends SfCommand {
|
|
11
|
+
static hidden = true;
|
|
13
12
|
async run() {
|
|
14
|
-
const enabled = await
|
|
13
|
+
const enabled = await isEnabled();
|
|
15
14
|
const cliId = global.cliTelemetry?.getCLIId();
|
|
16
15
|
this.log(`Telemetry is ${enabled ? 'enabled' : 'disabled'}.`);
|
|
17
|
-
this.log(`Telemetry tmp directory is ${
|
|
16
|
+
this.log(`Telemetry tmp directory is ${Telemetry.tmpDir}.`);
|
|
18
17
|
this.log(`Telemetry cache directory is ${this.config.cacheDir}.`);
|
|
19
18
|
this.log();
|
|
20
19
|
this.log(`Salesforce CLI ID is ${cliId}.`);
|
|
21
20
|
return {
|
|
22
21
|
enabled,
|
|
23
22
|
cliId,
|
|
24
|
-
tmpDir:
|
|
23
|
+
tmpDir: Telemetry.tmpDir,
|
|
25
24
|
cacheDir: this.config.cacheDir,
|
|
26
25
|
};
|
|
27
26
|
}
|
|
28
27
|
}
|
|
29
|
-
exports.default = TelemetryGet;
|
|
30
|
-
TelemetryGet.hidden = true;
|
|
31
28
|
//# sourceMappingURL=telemetry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/commands/telemetry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/commands/telemetry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,SAAS,MAAM,iBAAiB,CAAC;AAYxC,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,SAA6B;IAC9D,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC;IAErB,KAAK,CAAC,GAAG;QACd,MAAM,OAAO,GAAG,MAAM,SAAS,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,CAAC;QAE9C,IAAI,CAAC,GAAG,CAAC,gBAAgB,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC;QAC9D,IAAI,CAAC,GAAG,CAAC,8BAA8B,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC;QAC5D,IAAI,CAAC,GAAG,CAAC,gCAAgC,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC;QAClE,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,IAAI,CAAC,GAAG,CAAC,wBAAwB,KAAK,GAAG,CAAC,CAAC;QAE3C,OAAO;YACL,OAAO;YACP,KAAK;YACL,MAAM,EAAE,SAAS,CAAC,MAAM;YACxB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;SAC/B,CAAC;IACJ,CAAC"}
|
package/lib/debugger.d.ts
CHANGED
|
@@ -1,3 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
export declare const
|
|
3
|
-
export declare const debug: import("debug").Debugger;
|
|
1
|
+
import Debug from 'debug';
|
|
2
|
+
export declare const debug: Debug.Debugger;
|
package/lib/debugger.js
CHANGED
|
@@ -1,15 +1,9 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const debug_1 = require("debug");
|
|
11
|
-
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
12
|
-
const packageJson = require('../package.json');
|
|
13
|
-
exports.version = packageJson.version;
|
|
14
|
-
exports.debug = (0, debug_1.default)(`sfdx:telemetry@${exports.version}`);
|
|
7
|
+
import Debug from 'debug';
|
|
8
|
+
export const debug = Debug('sf:telemetry');
|
|
15
9
|
//# sourceMappingURL=debugger.js.map
|
package/lib/debugger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debugger.js","sourceRoot":"","sources":["../src/debugger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"debugger.js","sourceRoot":"","sources":["../src/debugger.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC"}
|
|
@@ -1,18 +1,16 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2018, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
const debugger_1 = require("../debugger");
|
|
7
|
+
import { join } from 'node:path';
|
|
8
|
+
import { Performance } from '@oclif/core';
|
|
9
|
+
import { Lifecycle } from '@salesforce/core';
|
|
10
|
+
import enabledCheck from '@salesforce/telemetry/enabledCheck';
|
|
11
|
+
import Telemetry from '../telemetry.js';
|
|
12
|
+
import { CommandExecution } from '../commandExecution.js';
|
|
13
|
+
import { debug } from '../debugger.js';
|
|
16
14
|
/**
|
|
17
15
|
* A hook that runs before every command that:
|
|
18
16
|
* 1. Warns the user about command usage data collection the CLI does unless they have already acknowledged the warning.
|
|
@@ -21,8 +19,8 @@ const debugger_1 = require("../debugger");
|
|
|
21
19
|
*/
|
|
22
20
|
const hook = async function (options) {
|
|
23
21
|
// Don't even bother logging if telemetry is disabled
|
|
24
|
-
if (!(await
|
|
25
|
-
|
|
22
|
+
if (!(await enabledCheck.isEnabled())) {
|
|
23
|
+
debug('Telemetry disabled. Doing nothing.');
|
|
26
24
|
return;
|
|
27
25
|
}
|
|
28
26
|
try {
|
|
@@ -30,18 +28,18 @@ const hook = async function (options) {
|
|
|
30
28
|
// Instantiating telemetry shows data collection warning.
|
|
31
29
|
// Adding this to the global so that telemetry events are sent even when different
|
|
32
30
|
// versions of this plugin are in use by the CLI.
|
|
33
|
-
const telemetry = (global.cliTelemetry = await
|
|
31
|
+
const telemetry = (global.cliTelemetry = await Telemetry.create({
|
|
34
32
|
cacheDir: this.config.cacheDir,
|
|
35
33
|
executable: this.config.bin,
|
|
36
34
|
}));
|
|
37
|
-
const commandExecution = await
|
|
35
|
+
const commandExecution = await CommandExecution.create({
|
|
38
36
|
command: options.Command,
|
|
39
37
|
argv: options.argv,
|
|
40
38
|
config: this.config,
|
|
41
39
|
});
|
|
42
40
|
let commonData;
|
|
43
41
|
try {
|
|
44
|
-
|
|
42
|
+
Lifecycle.getInstance().onTelemetry(async (data) => {
|
|
45
43
|
await Promise.resolve(telemetry.record({
|
|
46
44
|
type: 'EVENT',
|
|
47
45
|
...commonDataMemoized(),
|
|
@@ -52,7 +50,7 @@ const hook = async function (options) {
|
|
|
52
50
|
catch (err) {
|
|
53
51
|
// even if this throws, the rest of telemetry is not affected
|
|
54
52
|
const error = err;
|
|
55
|
-
|
|
53
|
+
debug('Error subscribing to telemetry events', error.message);
|
|
56
54
|
}
|
|
57
55
|
process.on('warning', (warning) => {
|
|
58
56
|
telemetry.record({
|
|
@@ -63,40 +61,22 @@ const hook = async function (options) {
|
|
|
63
61
|
message: warning.message,
|
|
64
62
|
});
|
|
65
63
|
});
|
|
66
|
-
|
|
64
|
+
debug('Setting up process exit handler');
|
|
67
65
|
process.once('exit', (status) => {
|
|
68
|
-
let oclifPerf
|
|
66
|
+
let oclifPerf;
|
|
67
|
+
let nonOclifPerf;
|
|
69
68
|
try {
|
|
70
|
-
oclifPerf =
|
|
71
|
-
|
|
72
|
-
// The amount of time (ms) required for oclif to get to the point where it can start running the command.
|
|
73
|
-
'oclif.initMs': core_1.Performance.highlights.initTime,
|
|
74
|
-
// The amount of time (ms) required for oclif to load the Config.
|
|
75
|
-
'oclif.configLoadMs': core_1.Performance.highlights.configLoadTime,
|
|
76
|
-
// The amount of time (ms) required for oclif to load the command.
|
|
77
|
-
'oclif.commandLoadMs': core_1.Performance.highlights.commandLoadTime,
|
|
78
|
-
// The amount of time (ms) required for oclif to load core (i.e. bundled) plugins.
|
|
79
|
-
'oclif.corePluginsLoadMs': core_1.Performance.highlights.corePluginsLoadTime,
|
|
80
|
-
// The amount of time (ms) required for oclif to load user plugins.
|
|
81
|
-
'oclif.userPluginsLoadMs': core_1.Performance.highlights.userPluginsLoadTime,
|
|
82
|
-
// The amount of time (ms) required for oclif to load linked plugins.
|
|
83
|
-
'oclif.linkedPluginsLoadMs': core_1.Performance.highlights.linkedPluginsLoadTime,
|
|
84
|
-
// The amount of time (ms) required for oclif to run all the init hooks
|
|
85
|
-
'oclif.initHookMs': core_1.Performance.highlights.hookRunTimes.init?.total,
|
|
86
|
-
// The amount of time (ms) required for oclif to run all the prerun hooks
|
|
87
|
-
'oclif.prerunHookMs': core_1.Performance.highlights.hookRunTimes.prerun?.total,
|
|
88
|
-
// The amount of time (ms) required for oclif to run all the postrun hooks
|
|
89
|
-
'oclif.postrunHookMs': core_1.Performance.highlights.hookRunTimes.postrun?.total,
|
|
90
|
-
};
|
|
69
|
+
oclifPerf = Performance.oclifPerf;
|
|
70
|
+
nonOclifPerf = Object.fromEntries(Array.from(Performance.results.entries()).flatMap(([owner, results]) => results.map((result) => [`${owner}__${result.name}`, result.duration ?? 0])));
|
|
91
71
|
}
|
|
92
72
|
catch (err) {
|
|
93
|
-
|
|
73
|
+
debug('Unable to get oclif performance metrics', err);
|
|
94
74
|
}
|
|
95
75
|
for (const { event, error } of errors) {
|
|
96
|
-
telemetry.recordError(error, { ...event, ...oclifPerf });
|
|
76
|
+
telemetry.recordError(error, { ...event, ...oclifPerf, ...nonOclifPerf });
|
|
97
77
|
}
|
|
98
78
|
commandExecution.status = status;
|
|
99
|
-
telemetry.record({ ...commandExecution.toJson(), ...oclifPerf });
|
|
79
|
+
telemetry.record({ ...commandExecution.toJson(), ...oclifPerf, ...nonOclifPerf });
|
|
100
80
|
if (process.listenerCount('exit') >= 20) {
|
|
101
81
|
// On exit listeners have been a problem in the past. Make sure we don't accumulate too many...
|
|
102
82
|
// This could be from too many plugins. If we start getting this, log number of plugins too.
|
|
@@ -109,7 +89,7 @@ const hook = async function (options) {
|
|
|
109
89
|
if (telemetry.firstRun) {
|
|
110
90
|
telemetry.record({
|
|
111
91
|
eventName: 'INSTALL',
|
|
112
|
-
installType: this.config.binPath?.includes(
|
|
92
|
+
installType: this.config.binPath?.includes(join('sfdx', 'client')) || this.config.binPath?.includes(join('sf', 'client'))
|
|
113
93
|
? 'installer'
|
|
114
94
|
: 'npm',
|
|
115
95
|
platform: this.config.platform,
|
|
@@ -144,8 +124,8 @@ const hook = async function (options) {
|
|
|
144
124
|
}
|
|
145
125
|
catch (err) {
|
|
146
126
|
const error = err;
|
|
147
|
-
|
|
127
|
+
debug('Error with logging or sending telemetry:', error.message);
|
|
148
128
|
}
|
|
149
129
|
};
|
|
150
|
-
|
|
130
|
+
export default hook;
|
|
151
131
|
//# sourceMappingURL=telemetryPrerun.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetryPrerun.js","sourceRoot":"","sources":["../../src/hooks/telemetryPrerun.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"telemetryPrerun.js","sourceRoot":"","sources":["../../src/hooks/telemetryPrerun.ts"],"names":[],"mappings":"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"}
|
package/lib/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export * from './telemetry';
|
|
1
|
+
export * from './telemetry.js';
|
package/lib/index.js
CHANGED
|
@@ -1,24 +1,8 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/*
|
|
3
2
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
4
3
|
* All rights reserved.
|
|
5
4
|
* Licensed under the BSD 3-Clause license.
|
|
6
5
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
7
6
|
*/
|
|
8
|
-
|
|
9
|
-
if (k2 === undefined) k2 = k;
|
|
10
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
11
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
12
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
13
|
-
}
|
|
14
|
-
Object.defineProperty(o, k2, desc);
|
|
15
|
-
}) : (function(o, m, k, k2) {
|
|
16
|
-
if (k2 === undefined) k2 = k;
|
|
17
|
-
o[k2] = m[k];
|
|
18
|
-
}));
|
|
19
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
20
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
21
|
-
};
|
|
22
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
23
|
-
__exportStar(require("./telemetry"), exports);
|
|
7
|
+
export * from './telemetry.js';
|
|
24
8
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,cAAc,gBAAgB,CAAC"}
|