Skip to content

Commit 2822511

Browse files
trentmpichlermarc
andauthored
chore(deps): update deps matching "@opentelemetry/*" (#2500)
- Includes a couples fixes for a race in two detector tests. Co-authored-by: Marc Pichler <[email protected]>
1 parent d3c8bd9 commit 2822511

File tree

49 files changed

+573
-561
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+573
-561
lines changed

detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsSuppressTracing.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ describe('[Integration] Internal tracing', () => {
3232
'http://169.254.169.254/metadata';
3333

3434
const memoryExporter = new InMemorySpanExporter();
35+
const spanProcessor = new SimpleSpanProcessor(memoryExporter);
3536
const sdk = new NodeSDK({
3637
instrumentations: [new FsInstrumentation(), new HttpInstrumentation()],
37-
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
38+
spanProcessors: [spanProcessor],
3839
});
3940
sdk.start();
4041

@@ -58,7 +59,7 @@ describe('[Integration] Internal tracing', () => {
5859

5960
// NOTE: the require process makes use of the fs API so spans are being exported.
6061
// We reset the exporter to have a clean state for assertions
61-
await new Promise(r => setTimeout(r, 0));
62+
await spanProcessor.forceFlush();
6263
memoryExporter.reset();
6364

6465
const detectors = [

detectors/node/opentelemetry-resource-detector-container/test/ContainerDetectorIntegration.test.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ import { IResource } from '@opentelemetry/resources';
2727
describe('[Integration] ContainerDetector', () => {
2828
it('should not start spans for detector reads to filesystem', async () => {
2929
const memoryExporter = new InMemorySpanExporter();
30+
const spanProcessor = new SimpleSpanProcessor(memoryExporter);
3031
const sdk = new NodeSDK({
3132
instrumentations: [new FsInstrumentation()],
32-
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
33+
spanProcessors: [spanProcessor],
3334
});
3435

3536
sdk.start();
@@ -50,7 +51,7 @@ describe('[Integration] ContainerDetector', () => {
5051

5152
// NOTE: the require process makes use of the fs API so spans are being exported.
5253
// We need to check no new spans are exported when `detect` is called.
53-
await new Promise(r => setTimeout(r, 0));
54+
await spanProcessor.forceFlush();
5455
const numSpansAfterRequire = memoryExporter.getFinishedSpans().length;
5556

5657
const resource = containerDetector.detect() as IResource;

detectors/node/opentelemetry-resource-detector-instana/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"devDependencies": {
4040
"@opentelemetry/api": "^1.3.0",
4141
"@opentelemetry/contrib-test-utils": "^0.41.0",
42-
"@opentelemetry/sdk-node": "^0.53.0",
42+
"@opentelemetry/sdk-node": "^0.54.0",
4343
"@types/mocha": "8.2.3",
4444
"@types/node": "18.18.14",
4545
"@types/semver": "7.5.8",

metapackages/auto-instrumentations-node/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"typescript": "4.4.4"
4848
},
4949
"dependencies": {
50-
"@opentelemetry/instrumentation": "^0.53.0",
50+
"@opentelemetry/instrumentation": "^0.54.0",
5151
"@opentelemetry/instrumentation-amqplib": "^0.42.0",
5252
"@opentelemetry/instrumentation-aws-lambda": "^0.45.0",
5353
"@opentelemetry/instrumentation-aws-sdk": "^0.44.0",
@@ -62,9 +62,9 @@
6262
"@opentelemetry/instrumentation-fs": "^0.15.0",
6363
"@opentelemetry/instrumentation-generic-pool": "^0.39.0",
6464
"@opentelemetry/instrumentation-graphql": "^0.43.0",
65-
"@opentelemetry/instrumentation-grpc": "^0.53.0",
65+
"@opentelemetry/instrumentation-grpc": "^0.54.0",
6666
"@opentelemetry/instrumentation-hapi": "^0.41.0",
67-
"@opentelemetry/instrumentation-http": "^0.53.0",
67+
"@opentelemetry/instrumentation-http": "^0.54.0",
6868
"@opentelemetry/instrumentation-ioredis": "^0.43.0",
6969
"@opentelemetry/instrumentation-kafkajs": "^0.3.0",
7070
"@opentelemetry/instrumentation-knex": "^0.40.0",
@@ -93,7 +93,7 @@
9393
"@opentelemetry/resource-detector-container": "^0.4.4",
9494
"@opentelemetry/resource-detector-gcp": "^0.29.12",
9595
"@opentelemetry/resources": "^1.24.0",
96-
"@opentelemetry/sdk-node": "^0.53.0"
96+
"@opentelemetry/sdk-node": "^0.54.0"
9797
},
9898
"files": [
9999
"build/src/**/*.js",

metapackages/auto-instrumentations-web/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@
6262
"webpack-merge": "5.10.0"
6363
},
6464
"dependencies": {
65-
"@opentelemetry/instrumentation": "^0.53.0",
65+
"@opentelemetry/instrumentation": "^0.54.0",
6666
"@opentelemetry/instrumentation-document-load": "^0.40.0",
67-
"@opentelemetry/instrumentation-fetch": "^0.53.0",
67+
"@opentelemetry/instrumentation-fetch": "^0.54.0",
6868
"@opentelemetry/instrumentation-user-interaction": "^0.40.0",
69-
"@opentelemetry/instrumentation-xml-http-request": "^0.53.0"
69+
"@opentelemetry/instrumentation-xml-http-request": "^0.54.0"
7070
},
7171
"files": [
7272
"build/src/**/*.js",

0 commit comments

Comments
 (0)