@redocly/cli 2.24.1 → 2.25.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/lib/utils/otel.d.ts +2 -2
- package/lib/utils/otel.d.ts.map +1 -1
- package/lib/utils/otel.js +4 -29
- package/lib/utils/otel.js.map +1 -1
- package/lib/utils/telemetry.d.ts +1 -1
- package/lib/utils/telemetry.d.ts.map +1 -1
- package/lib/utils/telemetry.js +34 -42
- package/lib/utils/telemetry.js.map +1 -1
- package/package.json +4 -4
package/lib/utils/otel.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type CloudEvents } from '@redocly/cli-otel';
|
|
2
2
|
export declare class OtelServerTelemetry {
|
|
3
3
|
private nodeTracerProvider;
|
|
4
4
|
constructor();
|
|
5
|
-
send(cloudEvent: CloudEvents.
|
|
5
|
+
send(cloudEvent: CloudEvents.CloudEventMapperResult): void;
|
|
6
6
|
}
|
|
7
7
|
export declare const otelTelemetry: OtelServerTelemetry;
|
|
8
8
|
//# sourceMappingURL=otel.d.ts.map
|
package/lib/utils/otel.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../../src/utils/otel.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../../src/utils/otel.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,WAAW,EAA+B,MAAM,mBAAmB,CAAC;AAMlF,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,kBAAkB,CAAqB;;IAqB/C,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,sBAAsB,GAAG,IAAI;CAc3D;AAED,eAAO,MAAM,aAAa,qBAA4B,CAAC"}
|
package/lib/utils/otel.js
CHANGED
|
@@ -2,6 +2,7 @@ import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
|
|
|
2
2
|
import { resourceFromAttributes } from '@opentelemetry/resources';
|
|
3
3
|
import { NodeTracerProvider, SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
|
|
4
4
|
import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from '@opentelemetry/semantic-conventions';
|
|
5
|
+
import { processCloudEventAttributes } from '@redocly/cli-otel';
|
|
5
6
|
import { ulid } from 'ulid';
|
|
6
7
|
import { OTEL_TRACES_URL, DEFAULT_FETCH_TIMEOUT } from './constants.js';
|
|
7
8
|
import { version } from './package.js';
|
|
@@ -23,36 +24,10 @@ export class OtelServerTelemetry {
|
|
|
23
24
|
});
|
|
24
25
|
}
|
|
25
26
|
send(cloudEvent) {
|
|
26
|
-
const time =
|
|
27
|
+
const time = new Date(cloudEvent.time);
|
|
27
28
|
const tracer = this.nodeTracerProvider.getTracer('CliTelemetry');
|
|
28
|
-
const spanName = `event.${cloudEvent.
|
|
29
|
-
const attributes =
|
|
30
|
-
'cloudevents.event_id': cloudEvent.id,
|
|
31
|
-
'cloudevents.event_type': cloudEvent.type,
|
|
32
|
-
'cloudevents.event_source': cloudEvent.source,
|
|
33
|
-
'cloudevents.event_spec_version': cloudEvent.specversion,
|
|
34
|
-
'cloudevents.productType': cloudEvent.productType,
|
|
35
|
-
'cloudevents.event_data_content_type': cloudEvent.datacontenttype || 'application/json; charset=utf-8',
|
|
36
|
-
'cloudevents.event_time': time.toISOString(),
|
|
37
|
-
'cloudevents.event_version': '1.0.0',
|
|
38
|
-
'cloudevents.origin': cloudEvent.origin,
|
|
39
|
-
'cloudevents.project.id': '',
|
|
40
|
-
'cloudevents.project.slug': '',
|
|
41
|
-
'cloudevents.organization.id': '',
|
|
42
|
-
'cloudevents.organization.slug': '',
|
|
43
|
-
'cloudevents.event_origin': cloudEvent.productType,
|
|
44
|
-
'cloudevents.event_source_details.id': cloudEvent.sourceDetails?.id ?? `ann_${ulid()}`,
|
|
45
|
-
'cloudevents.event_source_details.object': cloudEvent.sourceDetails?.object ?? 'anonymous',
|
|
46
|
-
'cloudevents.event_source_details.uri': cloudEvent.sourceDetails?.uri ?? '',
|
|
47
|
-
'cloudevents.event_data.os_platform': cloudEvent.os_platform,
|
|
48
|
-
'cloudevents.event_data.environment': cloudEvent.environment,
|
|
49
|
-
};
|
|
50
|
-
for (const [key, value] of Object.entries(cloudEvent.data)) {
|
|
51
|
-
const keySnakeCase = key.replace(/([A-Z])/g, '_$1').toLowerCase();
|
|
52
|
-
if (value !== undefined) {
|
|
53
|
-
attributes[`cloudevents.event_data.${keySnakeCase}`] = value;
|
|
54
|
-
}
|
|
55
|
-
}
|
|
29
|
+
const spanName = `event.${cloudEvent.type}`;
|
|
30
|
+
const attributes = processCloudEventAttributes(cloudEvent, time);
|
|
56
31
|
const span = tracer.startSpan(spanName, {
|
|
57
32
|
attributes,
|
|
58
33
|
startTime: time,
|
package/lib/utils/otel.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otel.js","sourceRoot":"","sources":["../../src/utils/otel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"otel.js","sourceRoot":"","sources":["../../src/utils/otel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAC;AAC5E,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAC9F,OAAO,EAAoB,2BAA2B,EAAE,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAEvC,MAAM,OAAO,mBAAmB;IAG9B;QACE,IAAI,CAAC,kBAAkB,GAAG,IAAI,kBAAkB,CAAC;YAC/C,QAAQ,EAAE,sBAAsB,CAAC;gBAC/B,CAAC,iBAAiB,CAAC,EAAE,aAAa;gBAClC,CAAC,oBAAoB,CAAC,EAAE,gBAAgB,OAAO,EAAE;gBACjD,UAAU,EAAE,OAAO,IAAI,EAAE,EAAE;aAC5B,CAAC;YACF,cAAc,EAAE;gBACd,IAAI,mBAAmB,CACrB,IAAI,iBAAiB,CAAC;oBACpB,GAAG,EAAE,eAAe;oBACpB,OAAO,EAAE,EAAE;oBACX,aAAa,EAAE,qBAAqB;iBACrC,CAAC,CACH;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,UAA8C;QACjD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;QAEjE,MAAM,QAAQ,GAAG,SAAS,UAAU,CAAC,IAAI,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,2BAA2B,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAEjE,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;YACtC,UAAU;YACV,SAAS,EAAE,IAAI;SAChB,CAAC,CAAC;QAEH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,mBAAmB,EAAE,CAAC"}
|
package/lib/utils/telemetry.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type ArazzoDefinition, type Config } from '@redocly/openapi-core';
|
|
2
2
|
import type { Arguments } from 'yargs';
|
|
3
3
|
import type { CommandArgv } from '../types.js';
|
|
4
4
|
import type { ExitCode } from './miscellaneous.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/utils/telemetry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/utils/telemetry.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,MAAM,EAEZ,MAAM,uBAAuB,CAAC;AAS/B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAGvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAMnD,wBAAsB,aAAa,CAAC,EAClC,MAAM,EACN,IAAI,EACJ,SAAS,EACT,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,iBAAiB,EACjB,6BAA6B,GAC9B,EAAE;IACD,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC;IACzC,SAAS,EAAE,QAAQ,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,6BAA6B,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CACrD,GAAG,OAAO,CAAC,IAAI,CAAC,CAwEhB;AAED,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CAAC,EACnC,sCAAsC,EAAE,MAAM,EAAE,QAkCjD;AA8ED,wBAAgB,SAAS,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE;;;EAiCnE;AAED,eAAO,MAAM,gBAAgB,GAAI,aAAa,MAAM,KAAG,IAYtD,CAAC;AAEF,eAAO,MAAM,oBAAoB,QAAO,MAAM,GAAG,SAiBhD,CAAC"}
|
package/lib/utils/telemetry.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CloudEvents } from '@redocly/cli-otel';
|
|
2
|
+
import { isAbsoluteUrl, isPlainObject, } from '@redocly/openapi-core';
|
|
2
3
|
import { execSync } from 'node:child_process';
|
|
3
4
|
import * as fs from 'node:fs';
|
|
4
5
|
import { existsSync, writeFileSync, readFileSync } from 'node:fs';
|
|
@@ -30,53 +31,44 @@ export async function sendTelemetry({ config, argv, exit_code, execution_time, s
|
|
|
30
31
|
anonymous_id = `ann_${ulid()}`;
|
|
31
32
|
cacheAnonymousId(anonymous_id);
|
|
32
33
|
}
|
|
33
|
-
const eventData =
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
datacontenttype: 'application/json',
|
|
34
|
+
const eventData = [
|
|
35
|
+
{
|
|
36
|
+
id: 'cli-command-run',
|
|
37
|
+
object: 'command',
|
|
38
|
+
uri: 'urn:redocly:cli',
|
|
39
|
+
logged_in: logged_in ? 'yes' : 'no',
|
|
40
|
+
command: `${command}`,
|
|
41
|
+
...cleanArgs(args, process.argv.slice(2)),
|
|
42
|
+
node_version: process.version,
|
|
43
|
+
npm_version: execSync('npm -v').toString().replace('\n', ''),
|
|
44
|
+
version,
|
|
45
|
+
exit_code,
|
|
46
|
+
execution_time,
|
|
47
|
+
metadata: process.env.REDOCLY_CLI_TELEMETRY_METADATA,
|
|
48
|
+
environment_ci: process.env.CI,
|
|
49
|
+
environment: process.env.REDOCLY_ENVIRONMENT,
|
|
50
|
+
has_config: typeof config?.document?.parsed === 'undefined' ? 'no' : 'yes',
|
|
51
|
+
spec_version,
|
|
52
|
+
spec_keyword,
|
|
53
|
+
spec_full_version,
|
|
54
|
+
respect_x_security_auth_types: spec_version === 'arazzo1' && respect_x_security_auth_types?.length
|
|
55
|
+
? JSON.stringify(respect_x_security_auth_types)
|
|
56
|
+
: undefined,
|
|
57
|
+
},
|
|
58
|
+
];
|
|
59
|
+
const cloudEvent = CloudEvents.mapToCloudEvent({
|
|
60
|
+
type: 'com.redocly.command.ran',
|
|
61
61
|
source: 'com.redocly.cli',
|
|
62
|
-
origin: 'cli',
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
subjects: [
|
|
66
|
-
{
|
|
67
|
-
id: ulid(),
|
|
68
|
-
object: 'command.ran',
|
|
69
|
-
uri: '',
|
|
70
|
-
},
|
|
71
|
-
],
|
|
72
|
-
environment: process.env.REDOCLY_ENVIRONMENT,
|
|
73
|
-
sourceDetails: {
|
|
62
|
+
origin: 'redocly-cli',
|
|
63
|
+
osPlatform: os.platform(),
|
|
64
|
+
actor: {
|
|
74
65
|
id: anonymous_id,
|
|
75
66
|
object: 'user',
|
|
76
67
|
uri: '',
|
|
77
68
|
},
|
|
69
|
+
category: 'product',
|
|
78
70
|
data: eventData,
|
|
79
|
-
};
|
|
71
|
+
});
|
|
80
72
|
const { otelTelemetry } = await import('./otel.js');
|
|
81
73
|
otelTelemetry.send(cloudEvent);
|
|
82
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/utils/telemetry.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/utils/telemetry.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@redocly/cli",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.25.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"bin": {
|
|
@@ -42,8 +42,9 @@
|
|
|
42
42
|
"@opentelemetry/resources": "2.0.1",
|
|
43
43
|
"@opentelemetry/sdk-trace-node": "2.0.1",
|
|
44
44
|
"@opentelemetry/semantic-conventions": "1.34.0",
|
|
45
|
-
"@redocly/
|
|
46
|
-
"@redocly/
|
|
45
|
+
"@redocly/cli-otel": "0.1.2",
|
|
46
|
+
"@redocly/openapi-core": "2.25.0",
|
|
47
|
+
"@redocly/respect-core": "2.25.0",
|
|
47
48
|
"abort-controller": "^3.0.0",
|
|
48
49
|
"ajv": "npm:@redocly/ajv@8.18.0",
|
|
49
50
|
"ajv-formats": "^3.0.1",
|
|
@@ -68,7 +69,6 @@
|
|
|
68
69
|
"yargs": "17.0.1"
|
|
69
70
|
},
|
|
70
71
|
"devDependencies": {
|
|
71
|
-
"@redocly/cli-otel": "^0.0.4",
|
|
72
72
|
"@types/cookie": "0.6.0",
|
|
73
73
|
"@types/har-format": "^1.2.16",
|
|
74
74
|
"@types/pluralize": "^0.0.29",
|