Skip to content

fix: bump @opentelemetry/instrumentation-net pkg + silence otel logs by default #73

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

Merged
wrn14897 merged 4 commits into from
Dec 12, 2023
Merged

fix: bump @opentelemetry/instrumentation-net pkg + silence otel logs by default #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef3db02
fix: bump net instrumentation pkg to v0.32.4
wrn14897 Dec 12, 2023
c34b5b9
fix: set default otel log level to error
wrn14897 Dec 12, 2023
4f6ffcf
fix: silence otel log by default
wrn14897 Dec 12, 2023
daa3498
docs: add changeset
wrn14897 Dec 12, 2023
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: 5 additions & 0 deletions .changeset/thirty-pandas-play.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@hyperdx/node-opentelemetry': patch
---

fix: bump @opentelemetry/instrumentation-net pkg + silence otel logs by default
1 change: 1 addition & 0 deletions packages/node-opentelemetry/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"@hyperdx/node-logger": "~0.3.0-next.0",
"@opentelemetry/api": "^1.6.0",
"@opentelemetry/auto-instrumentations-node": "~0.37.1",
"@opentelemetry/instrumentation-net": "~0.32.4",
"@opentelemetry/core": "~1.15.2",
"@opentelemetry/exporter-metrics-otlp-proto": "~0.41.2",
"@opentelemetry/exporter-trace-otlp-proto": "~0.41.2",
Expand Down
9 changes: 8 additions & 1 deletion packages/node-opentelemetry/src/otel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { NetInstrumentation } from '@opentelemetry/instrumentation-net';
import { NodeSDK } from '@opentelemetry/sdk-node';
import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
import {
Expand Down Expand Up @@ -43,7 +44,7 @@ export const initSDK = (config: SDKConfig) => {
env.OTEL_EXPORTER_OTLP_ENDPOINT =
env.OTEL_EXPORTER_OTLP_ENDPOINT ?? 'https://in-otel.hyperdx.io';
env.OTEL_NODE_RESOURCE_DETECTORS = env.OTEL_NODE_RESOURCE_DETECTORS ?? 'all';
env.OTEL_LOG_LEVEL = env.OTEL_LOG_LEVEL ?? 'info';
env.OTEL_LOG_LEVEL = env.OTEL_LOG_LEVEL ?? 'none'; // silence by default
env.OTEL_TRACES_SAMPLER = env.OTEL_TRACES_SAMPLER ?? 'parentbased_always_on';
env.OTEL_TRACES_SAMPLER_ARG = env.OTEL_TRACES_SAMPLER_ARG ?? '1';

Expand Down Expand Up @@ -99,8 +100,14 @@ export const initSDK = (config: SDKConfig) => {
'@opentelemetry/instrumentation-fs': {
enabled: false,
},
// FIXME: enable this once auto instrumentation is upgraded to v0.40.2
'@opentelemetry/instrumentation-net': {
enabled: false,
},
...config.instrumentations,
}),
// for fix: https://github.com/open-telemetry/opentelemetry-js-contrib/releases/tag/instrumentation-net-v0.32.4
new NetInstrumentation(),
...(config.additionalInstrumentations ?? []),
],
});
Expand Down
21 changes: 20 additions & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1634,6 +1634,14 @@
"@opentelemetry/instrumentation" "^0.40.0"
"@opentelemetry/semantic-conventions" "^1.0.0"

"@opentelemetry/instrumentation-net@~0.32.4":
version "0.32.4"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-net/-/instrumentation-net-0.32.4.tgz#edcfcad41f4b8ae75841ebfffaa7efdfc37ff536"
integrity sha512-sZUELN+pO73Mo2zXOt9pTrmwsVtf/WvOOjh+ItFYth4X5syOcHA192NvoEPLqIgWv0L5Iipm8M2SiWZiWm2X7w==
dependencies:
"@opentelemetry/instrumentation" "^0.45.1"
"@opentelemetry/semantic-conventions" "^1.0.0"

"@opentelemetry/instrumentation-pg@^0.35.3":
version "0.35.3"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation-pg/-/instrumentation-pg-0.35.3.tgz#47b29891e2be797a2148e699bb43094fdf33a281"
Expand Down Expand Up @@ -1752,6 +1760,17 @@
semver "^7.5.1"
shimmer "^1.2.1"

"@opentelemetry/instrumentation@^0.45.1":
version "0.45.1"
resolved "https://registry.yarnpkg.com/@opentelemetry/instrumentation/-/instrumentation-0.45.1.tgz#043ac90a889fae8a551c8d06e16be443984449af"
integrity sha512-V1Cr0g8hSg35lpW3G/GYVZurrhHrQZJdmP68WyJ83f1FDn3iru+/Vnlto9kiOSm7PHhW+pZGdb9Fbv+mkQ31CA==
dependencies:
"@types/shimmer" "^1.0.2"
import-in-the-middle "1.4.2"
require-in-the-middle "^7.1.1"
semver "^7.5.2"
shimmer "^1.2.1"

"@opentelemetry/[email protected]":
version "0.40.0"
resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.40.0.tgz#34568717b86cfdc9743d4a7c43606a67118458b3"
Expand Down Expand Up @@ -7076,7 +7095,7 @@ semver@^6.0.0, semver@^6.3.0:
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==

semver@^7.5.1:
semver@^7.5.1, semver@^7.5.2:
version "7.5.4"
resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
Expand Down