Skip to content

fix: fix path to package.json after upgrade to OTel JS SDK 2.0.0 #119

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
merged 1 commit into from
Apr 27, 2025
Merged

fix: fix path to package.json after upgrade to OTel JS SDK 2.0.0 #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 17 additions & 13 deletions src/1.x/init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,16 @@ const debugOutput = hasOptedIn('DASH0_DEBUG');
let packageJson;
let version: string;
try {
// In the published package, the transpiled JS files are in dist/src/init.js, therefore the relative path to
// package.json is two levels above the directory of init.js.
// In the published package, the transpiled JS files are in dist/src/(1.x|2.x)/init.js, therefore the relative path to
// package.json is three levels above the directory of init.js.
// eslint-disable-next-line @typescript-eslint/no-require-imports
packageJson = require('../../package.json');
packageJson = require('../../../package.json');
} catch (e1) {
try {
// In development, the directory is just src, therefore the relative path to package.json is only one level above.
// In development, the directory is just src/(1.x|2.x)/, therefore the relative path to package.json is only two
// levels above.
// eslint-disable-next-line @typescript-eslint/no-require-imports
packageJson = require('../package.json');
packageJson = require('../../package.json');
} catch (e2) {
printDebugStderr(
'Unable to find our own package.json file, will not transmit telemetry.distro.version. This warning can be safely ignored.',
Expand All @@ -50,14 +51,17 @@ try {
);
}
}
// Since we read the package.json from two possible relative paths, we are extra-careful to make sure we actually are
// reading from our own package.json file, hence the name check.
if (packageJson && packageJson.name === '@dash0hq/opentelemetry') {
version = packageJson.version;
} else {
printDebugStderr(
`Unexpected package name in our own package.json: ${packageJson.name}, will not transmit telemetry.distro.version. This warning can be safely ignored.`,
);

if (packageJson) {
// Since we read the package.json from two possible relative paths, we are extra-careful to make sure we actually are
// reading from our own package.json file, hence the name check.
if (packageJson.name === '@dash0hq/opentelemetry') {
version = packageJson.version;
} else {
printDebugStderr(
`Unexpected package name in our own package.json: ${packageJson.name}, will not transmit telemetry.distro.version. This warning can be safely ignored.`,
);
}
}

printDebugStdout('Starting NodeSDK.');
Expand Down
30 changes: 17 additions & 13 deletions src/2.x/init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,16 @@ const debugOutput = hasOptedIn('DASH0_DEBUG');
let packageJson;
let version: string;
try {
// In the published package, the transpiled JS files are in dist/src/init.js, therefore the relative path to
// package.json is two levels above the directory of init.js.
// In the published package, the transpiled JS files are in dist/src/(1.x|2.x)/init.js, therefore the relative path to
// package.json is three levels above the directory of init.js.
// eslint-disable-next-line @typescript-eslint/no-require-imports
packageJson = require('../../package.json');
packageJson = require('../../../package.json');
} catch (e1) {
try {
// In development, the directory is just src, therefore the relative path to package.json is only one level above.
// In development, the directory is just src/(1.x|2.x)/, therefore the relative path to package.json is only two
// levels above.
// eslint-disable-next-line @typescript-eslint/no-require-imports
packageJson = require('../package.json');
packageJson = require('../../package.json');
} catch (e2) {
printDebugStderr(
'Unable to find our own package.json file, will not transmit telemetry.distro.version. This warning can be safely ignored.',
Expand All @@ -50,14 +51,17 @@ try {
);
}
}
// Since we read the package.json from two possible relative paths, we are extra-careful to make sure we actually are
// reading from our own package.json file, hence the name check.
if (packageJson && packageJson.name === '@dash0hq/opentelemetry') {
version = packageJson.version;
} else {
printDebugStderr(
`Unexpected package name in our own package.json: ${packageJson.name}, will not transmit telemetry.distro.version. This warning can be safely ignored.`,
);

if (packageJson) {
// Since we read the package.json from two possible relative paths, we are extra-careful to make sure we actually are
// reading from our own package.json file, hence the name check.
if (packageJson.name === '@dash0hq/opentelemetry') {
version = packageJson.version;
} else {
printDebugStderr(
`Unexpected package name in our own package.json: ${packageJson.name}, will not transmit telemetry.distro.version. This warning can be safely ignored.`,
);
}
}

printDebugStdout('Starting NodeSDK.');
Expand Down
1 change: 1 addition & 0 deletions test/integration/ChildProcessWrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ export function defaultAppConfiguration(appPort: number): ChildProcessWrapperOpt
OTEL_METRIC_EXPORT_TIMEOUT: '90',

DASH0_OTEL_COLLECTOR_BASE_URL: 'http://localhost:4318',
DASH0_DEBUG: 'true',

// helpful options for troubleshooting integration tests:
// DASH0_DEBUG_PRINT_SPANS: 'true',
Expand Down