Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update deps matching "@opentelemetry/*" #2500

Merged
merged 6 commits into from
Oct 24, 2024
Merged

chore(deps): update deps matching "@opentelemetry/*" #2500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
33bd40a
chore: clean up some deps
trentm Oct 23, 2024
97b6b82
I think ^1.0.0 is probably fine, but to be safe, let's start at the c…
trentm Oct 23, 2024
262ebba
chore(deps): update deps matching @opentelemetry/*
trentm Oct 23, 2024
57756c8
fix a race in clearing spans in this test case
trentm Oct 23, 2024
3bb5862
similar race in resource-detector-container test
trentm Oct 23, 2024
5108500
Merge branch 'main' into tm-update-otel-deps2
pichlermarc Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions detectors/node/opentelemetry-resource-detector-aws/test/detectors/AwsSuppressTracing.test.ts
View file
Open in desktop
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
5 changes: 3 additions & 2 deletions .../node/opentelemetry-resource-detector-container/test/ContainerDetectorIntegration.test.ts
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion detectors/node/opentelemetry-resource-detector-instana/package.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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