@prairielearn/opentelemetry 1.5.1 → 1.5.2
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/.turbo/turbo-build.log +0 -2
- package/CHANGELOG.md +6 -0
- package/dist/index.js +10 -4
- package/dist/index.js.map +1 -1
- package/dist/index.test.js +8 -6
- package/dist/index.test.js.map +1 -1
- package/package.json +17 -17
- package/src/index.test.ts +10 -8
- package/src/index.ts +13 -7
package/.turbo/turbo-build.log
CHANGED
package/CHANGELOG.md
CHANGED
package/dist/index.js
CHANGED
|
@@ -126,6 +126,10 @@ async function init(config) {
|
|
|
126
126
|
break;
|
|
127
127
|
}
|
|
128
128
|
case 'honeycomb': {
|
|
129
|
+
if (!config.honeycombApiKey)
|
|
130
|
+
throw new Error('Missing Honeycomb API key');
|
|
131
|
+
if (!config.honeycombDataset)
|
|
132
|
+
throw new Error('Missing Honeycomb dataset');
|
|
129
133
|
// Create a Honeycomb exporter with the appropriate metadata from the
|
|
130
134
|
// config we've been provided with.
|
|
131
135
|
const metadata = new grpc_js_1.Metadata();
|
|
@@ -197,13 +201,15 @@ async function init(config) {
|
|
|
197
201
|
if (config.serviceName) {
|
|
198
202
|
resource = resource.merge(new resources_1.Resource({ [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: config.serviceName }));
|
|
199
203
|
}
|
|
200
|
-
|
|
204
|
+
const nodeTracerProvider = new sdk_trace_node_1.NodeTracerProvider({
|
|
201
205
|
sampler,
|
|
202
206
|
resource,
|
|
203
207
|
});
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
instrumentations.forEach((i) => i.setTracerProvider(
|
|
208
|
+
nodeTracerProvider.addSpanProcessor(spanProcessor);
|
|
209
|
+
nodeTracerProvider.register();
|
|
210
|
+
instrumentations.forEach((i) => i.setTracerProvider(nodeTracerProvider));
|
|
211
|
+
// Save the provider so we can shut it down later.
|
|
212
|
+
tracerProvider = tracerProvider;
|
|
207
213
|
}
|
|
208
214
|
exports.init = init;
|
|
209
215
|
/**
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,2CAAsD;AAEtD,sDAAkD;AAClD,kEAAmE;AACnE,kEAUuC;AACvC,wDAAqE;AACrE,8EAAiF;AACjF,oFAA0E;AAC1E,kEAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.test.js
CHANGED
|
@@ -36,14 +36,16 @@ describe('instrumented', () => {
|
|
|
36
36
|
});
|
|
37
37
|
it('records a span on failure', async () => {
|
|
38
38
|
let maybeError = null;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
try {
|
|
40
|
+
await (0, index_1.instrumented)('test-failure', () => {
|
|
41
|
+
throw new Error('foo');
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
catch (err) {
|
|
42
45
|
maybeError = err;
|
|
43
|
-
}
|
|
46
|
+
}
|
|
44
47
|
// Ensure the error was propagated back to the caller.
|
|
45
|
-
chai_1.assert.
|
|
46
|
-
chai_1.assert.equal(maybeError.message, 'foo');
|
|
48
|
+
chai_1.assert.equal(maybeError?.message, 'foo');
|
|
47
49
|
// Ensure the correct span was recorded.
|
|
48
50
|
const spans = exporter.getFinishedSpans();
|
|
49
51
|
chai_1.assert.lengthOf(spans, 1);
|
package/dist/index.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":";;AAAA,sDAAkD;AAClD,+BAA8B;AAE9B,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":";;AAAA,sDAAkD;AAClD,+BAA8B;AAE9B,mCAA6E;AAC7E,4EAA8E;AAE9E,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAI,cAAwC,CAAC;IAC7C,IAAI,QAAQ,GAAG,IAAI,kBAAO,CAAC,oBAAoB,EAAE,CAAC;IAElD,MAAM,CAAC,KAAK,IAAI,EAAE;QAChB,MAAM,IAAA,YAAI,EAAC;YACT,oBAAoB,EAAE,IAAI;YAC1B,qBAAqB,EAAE,QAAQ;YAC/B,wBAAwB,EAAE,WAAW;YACrC,0BAA0B,EAAE,QAAQ;SACrC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,cAAc,GAAG,IAAI,8CAAwB,EAAE,CAAC;QAChD,eAAO,CAAC,uBAAuB,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,eAAO,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;QACnD,MAAM,GAAG,GAAG,MAAM,IAAA,oBAAY,EAAC,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QACpD,aAAM,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;QACzC,MAAM,IAAA,oBAAY,EAAC,cAAc,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QAEhD,MAAM,KAAK,GAAG,QAAQ,CAAC,gBAAgB,EAAE,CAAC;QAC1C,aAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC1B,aAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5C,aAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,sBAAc,CAAC,EAAE,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;QACzC,IAAI,UAAU,GAAiB,IAAI,CAAC;QAEpC,IAAI;YACF,MAAM,IAAA,oBAAY,EAAC,cAAc,EAAE,GAAG,EAAE;gBACtC,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC,CAAC,CAAC;SACJ;QAAC,OAAO,GAAQ,EAAE;YACjB,UAAU,GAAG,GAAG,CAAC;SAClB;QAED,sDAAsD;QACtD,aAAM,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QAEzC,wCAAwC;QACxC,MAAM,KAAK,GAAG,QAAQ,CAAC,gBAAgB,EAAE,CAAC;QAC1C,aAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC1B,aAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC5C,aAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,sBAAc,CAAC,KAAK,CAAC,CAAC;QACzD,aAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7C,aAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;QACzC,MAAM,MAAM,GAAG,aAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAClD,MAAM,aAAa,GAAG,aAAK,CAAC,OAAO,CAAC,eAAO,CAAC,MAAM,EAAE,EAAE,UAAU,CAAC,CAAC;QAElE,MAAM,IAAA,oBAAY,EAAC,MAAM,EAAE,KAAK,IAAI,EAAE;YACpC,MAAM,YAAY,GAAG,eAAO,CAAC,MAAM,EAAE,CAAC;YACtC,aAAM,CAAC,cAAc,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prairielearn/opentelemetry",
|
|
3
|
-
"version": "1.5.
|
|
3
|
+
"version": "1.5.2",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "tsc",
|
|
@@ -8,29 +8,29 @@
|
|
|
8
8
|
"test": "mocha --no-config --require ts-node/register src/index.test.ts"
|
|
9
9
|
},
|
|
10
10
|
"dependencies": {
|
|
11
|
-
"@grpc/grpc-js": "^1.7
|
|
12
|
-
"@opentelemetry/api": "^1.
|
|
13
|
-
"@opentelemetry/core": "^1.
|
|
14
|
-
"@opentelemetry/exporter-jaeger": "^1.
|
|
15
|
-
"@opentelemetry/exporter-trace-otlp-grpc": "^0.
|
|
16
|
-
"@opentelemetry/instrumentation-aws-sdk": "^0.
|
|
11
|
+
"@grpc/grpc-js": "^1.8.7",
|
|
12
|
+
"@opentelemetry/api": "^1.4.0",
|
|
13
|
+
"@opentelemetry/core": "^1.9.1",
|
|
14
|
+
"@opentelemetry/exporter-jaeger": "^1.9.1",
|
|
15
|
+
"@opentelemetry/exporter-trace-otlp-grpc": "^0.35.1",
|
|
16
|
+
"@opentelemetry/instrumentation-aws-sdk": "^0.33.0",
|
|
17
17
|
"@opentelemetry/instrumentation-connect": "^0.31.0",
|
|
18
18
|
"@opentelemetry/instrumentation-dns": "^0.31.0",
|
|
19
19
|
"@opentelemetry/instrumentation-express": "^0.32.0",
|
|
20
|
-
"@opentelemetry/instrumentation-http": "^0.
|
|
21
|
-
"@opentelemetry/instrumentation-pg": "^0.
|
|
22
|
-
"@opentelemetry/instrumentation-redis": "^0.34.
|
|
20
|
+
"@opentelemetry/instrumentation-http": "^0.35.1",
|
|
21
|
+
"@opentelemetry/instrumentation-pg": "^0.34.0",
|
|
22
|
+
"@opentelemetry/instrumentation-redis": "^0.34.1",
|
|
23
23
|
"@opentelemetry/resource-detector-aws": "^1.2.1",
|
|
24
|
-
"@opentelemetry/resources": "^1.
|
|
25
|
-
"@opentelemetry/sdk-node": "^0.
|
|
26
|
-
"@opentelemetry/sdk-trace-base": "^1.
|
|
27
|
-
"@opentelemetry/sdk-trace-node": "^1.
|
|
28
|
-
"@opentelemetry/semantic-conventions": "^1.
|
|
24
|
+
"@opentelemetry/resources": "^1.9.1",
|
|
25
|
+
"@opentelemetry/sdk-node": "^0.35.1",
|
|
26
|
+
"@opentelemetry/sdk-trace-base": "^1.9.1",
|
|
27
|
+
"@opentelemetry/sdk-trace-node": "^1.9.1",
|
|
28
|
+
"@opentelemetry/semantic-conventions": "^1.9.1"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
31
31
|
"@prairielearn/tsconfig": "*",
|
|
32
|
-
"
|
|
32
|
+
"@types/node": "^18.11.18",
|
|
33
33
|
"ts-node": "^10.9.1",
|
|
34
|
-
"typescript": "^4.9.
|
|
34
|
+
"typescript": "^4.9.5"
|
|
35
35
|
}
|
|
36
36
|
}
|
package/src/index.test.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { tracing } from '@opentelemetry/sdk-node';
|
|
2
2
|
import { assert } from 'chai';
|
|
3
3
|
|
|
4
|
-
import { context, init, instrumented,
|
|
4
|
+
import { context, init, instrumented, trace, SpanStatusCode } from './index';
|
|
5
5
|
import { AsyncHooksContextManager } from '@opentelemetry/context-async-hooks';
|
|
6
6
|
|
|
7
7
|
describe('instrumented', () => {
|
|
@@ -42,16 +42,18 @@ describe('instrumented', () => {
|
|
|
42
42
|
});
|
|
43
43
|
|
|
44
44
|
it('records a span on failure', async () => {
|
|
45
|
-
let maybeError = null;
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
45
|
+
let maybeError: Error | null = null;
|
|
46
|
+
|
|
47
|
+
try {
|
|
48
|
+
await instrumented('test-failure', () => {
|
|
49
|
+
throw new Error('foo');
|
|
50
|
+
});
|
|
51
|
+
} catch (err: any) {
|
|
49
52
|
maybeError = err;
|
|
50
|
-
}
|
|
53
|
+
}
|
|
51
54
|
|
|
52
55
|
// Ensure the error was propagated back to the caller.
|
|
53
|
-
assert.
|
|
54
|
-
assert.equal(maybeError.message, 'foo');
|
|
56
|
+
assert.equal(maybeError?.message, 'foo');
|
|
55
57
|
|
|
56
58
|
// Ensure the correct span was recorded.
|
|
57
59
|
const spans = exporter.getFinishedSpans();
|
package/src/index.ts
CHANGED
|
@@ -17,7 +17,7 @@ import { detectResources, Resource } from '@opentelemetry/resources';
|
|
|
17
17
|
import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
|
|
18
18
|
import { ExpressLayerType } from '@opentelemetry/instrumentation-express';
|
|
19
19
|
import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
|
|
20
|
-
import { Span, SpanStatusCode,
|
|
20
|
+
import { Span, SpanStatusCode, trace } from '@opentelemetry/api';
|
|
21
21
|
import { hrTimeToMilliseconds } from '@opentelemetry/core';
|
|
22
22
|
|
|
23
23
|
// Exporters go here.
|
|
@@ -117,7 +117,7 @@ instrumentations.forEach((i) => {
|
|
|
117
117
|
i.enable();
|
|
118
118
|
});
|
|
119
119
|
|
|
120
|
-
let tracerProvider: NodeTracerProvider;
|
|
120
|
+
let tracerProvider: NodeTracerProvider | null;
|
|
121
121
|
|
|
122
122
|
export interface OpenTelemetryConfig {
|
|
123
123
|
openTelemetryEnabled: boolean;
|
|
@@ -158,6 +158,9 @@ export async function init(config: OpenTelemetryConfig) {
|
|
|
158
158
|
break;
|
|
159
159
|
}
|
|
160
160
|
case 'honeycomb': {
|
|
161
|
+
if (!config.honeycombApiKey) throw new Error('Missing Honeycomb API key');
|
|
162
|
+
if (!config.honeycombDataset) throw new Error('Missing Honeycomb dataset');
|
|
163
|
+
|
|
161
164
|
// Create a Honeycomb exporter with the appropriate metadata from the
|
|
162
165
|
// config we've been provided with.
|
|
163
166
|
const metadata = new Metadata();
|
|
@@ -240,14 +243,17 @@ export async function init(config: OpenTelemetryConfig) {
|
|
|
240
243
|
);
|
|
241
244
|
}
|
|
242
245
|
|
|
243
|
-
|
|
246
|
+
const nodeTracerProvider = new NodeTracerProvider({
|
|
244
247
|
sampler,
|
|
245
248
|
resource,
|
|
246
249
|
});
|
|
247
|
-
|
|
248
|
-
|
|
250
|
+
nodeTracerProvider.addSpanProcessor(spanProcessor);
|
|
251
|
+
nodeTracerProvider.register();
|
|
252
|
+
|
|
253
|
+
instrumentations.forEach((i) => i.setTracerProvider(nodeTracerProvider));
|
|
249
254
|
|
|
250
|
-
|
|
255
|
+
// Save the provider so we can shut it down later.
|
|
256
|
+
tracerProvider = tracerProvider;
|
|
251
257
|
}
|
|
252
258
|
|
|
253
259
|
/**
|
|
@@ -272,7 +278,7 @@ export async function instrumented<T>(
|
|
|
272
278
|
const result = await fn(span);
|
|
273
279
|
span.setStatus({ code: SpanStatusCode.OK });
|
|
274
280
|
return result;
|
|
275
|
-
} catch (e) {
|
|
281
|
+
} catch (e: any) {
|
|
276
282
|
span.setStatus({
|
|
277
283
|
code: SpanStatusCode.ERROR,
|
|
278
284
|
message: e.message,
|