Skip to content

Commit

Permalink
chore(deps): update deps matching "@opentelemetry/*" (#2500)
Browse files Browse the repository at this point in the history
- Includes a couples fixes for a race in two detector tests.

Co-authored-by: Marc Pichler <marc.pichler@dynatrace.com>
  • Loading branch information
trentm and pichlermarc authored Oct 24, 2024
1 parent d3c8bd9 commit 2822511
Show file tree
Hide file tree
Showing 49 changed files with 573 additions and 561 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ describe('[Integration] Internal tracing', () => {
'http://169.254.169.254/metadata';

const memoryExporter = new InMemorySpanExporter();
const spanProcessor = new SimpleSpanProcessor(memoryExporter);
const sdk = new NodeSDK({
instrumentations: [new FsInstrumentation(), new HttpInstrumentation()],
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
spanProcessors: [spanProcessor],
});
sdk.start();

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

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

const detectors = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ import { IResource } from '@opentelemetry/resources';
describe('[Integration] ContainerDetector', () => {
it('should not start spans for detector reads to filesystem', async () => {
const memoryExporter = new InMemorySpanExporter();
const spanProcessor = new SimpleSpanProcessor(memoryExporter);
const sdk = new NodeSDK({
instrumentations: [new FsInstrumentation()],
spanProcessors: [new SimpleSpanProcessor(memoryExporter)],
spanProcessors: [spanProcessor],
});

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

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

const resource = containerDetector.detect() as IResource;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/contrib-test-utils": "^0.41.0",
"@opentelemetry/sdk-node": "^0.53.0",
"@opentelemetry/sdk-node": "^0.54.0",
"@types/mocha": "8.2.3",
"@types/node": "18.18.14",
"@types/semver": "7.5.8",
Expand Down
8 changes: 4 additions & 4 deletions metapackages/auto-instrumentations-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"typescript": "4.4.4"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/instrumentation": "^0.54.0",
"@opentelemetry/instrumentation-amqplib": "^0.42.0",
"@opentelemetry/instrumentation-aws-lambda": "^0.45.0",
"@opentelemetry/instrumentation-aws-sdk": "^0.44.0",
Expand All @@ -62,9 +62,9 @@
"@opentelemetry/instrumentation-fs": "^0.15.0",
"@opentelemetry/instrumentation-generic-pool": "^0.39.0",
"@opentelemetry/instrumentation-graphql": "^0.43.0",
"@opentelemetry/instrumentation-grpc": "^0.53.0",
"@opentelemetry/instrumentation-grpc": "^0.54.0",
"@opentelemetry/instrumentation-hapi": "^0.41.0",
"@opentelemetry/instrumentation-http": "^0.53.0",
"@opentelemetry/instrumentation-http": "^0.54.0",
"@opentelemetry/instrumentation-ioredis": "^0.43.0",
"@opentelemetry/instrumentation-kafkajs": "^0.3.0",
"@opentelemetry/instrumentation-knex": "^0.40.0",
Expand Down Expand Up @@ -93,7 +93,7 @@
"@opentelemetry/resource-detector-container": "^0.4.4",
"@opentelemetry/resource-detector-gcp": "^0.29.12",
"@opentelemetry/resources": "^1.24.0",
"@opentelemetry/sdk-node": "^0.53.0"
"@opentelemetry/sdk-node": "^0.54.0"
},
"files": [
"build/src/**/*.js",
Expand Down
6 changes: 3 additions & 3 deletions metapackages/auto-instrumentations-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@
"webpack-merge": "5.10.0"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.53.0",
"@opentelemetry/instrumentation": "^0.54.0",
"@opentelemetry/instrumentation-document-load": "^0.40.0",
"@opentelemetry/instrumentation-fetch": "^0.53.0",
"@opentelemetry/instrumentation-fetch": "^0.54.0",
"@opentelemetry/instrumentation-user-interaction": "^0.40.0",
"@opentelemetry/instrumentation-xml-http-request": "^0.53.0"
"@opentelemetry/instrumentation-xml-http-request": "^0.54.0"
},
"files": [
"build/src/**/*.js",
Expand Down
Loading

0 comments on commit 2822511

Please sign in to comment.