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

address pr feedback #11

Merged
merged 5 commits into from
May 9, 2023
Merged

address pr feedback #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e218364
pin versions in example
pkanal May 9, 2023
9c4da01
add note about lack of support for node 20
pkanal May 9, 2023
f3aeddb
try re-exporting hook.mjs
pkanal May 9, 2023
d9b3e30
only use re-exported hook functions in hook.mjs
pkanal May 9, 2023
fc13942
remove hook.js from files in package.json
pkanal May 9, 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
12 changes: 6 additions & 6 deletions examples/esm-http-ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js/tree/main/examples/",
"dependencies": {
"@opentelemetry/api": "^1.4.0",
"@opentelemetry/exporter-trace-otlp-proto": "^0.36.0",
"@opentelemetry/api": "1.4.0",
"@opentelemetry/exporter-trace-otlp-proto": "0.38.0",
"@opentelemetry/instrumentation": "0.38.0",
"@opentelemetry/instrumentation-http": "0.38.0",
"@opentelemetry/resources": "^1.9.1",
"@opentelemetry/sdk-trace-base": "^1.9.1",
"@opentelemetry/sdk-trace-node": "^1.9.1",
"@opentelemetry/semantic-conventions": "^1.9.1"
"@opentelemetry/resources": "1.9.1",
"@opentelemetry/sdk-trace-base": "1.9.1",
"@opentelemetry/sdk-trace-node": "1.9.1",
"@opentelemetry/semantic-conventions": "1.9.1"
}
}
2 changes: 2 additions & 0 deletions experimental/packages/opentelemetry-instrumentation/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@ As the module loading mechanism for ESM is different than CJS, you need to selec
To avoid using the `--experimental-import-meta-resolve` flag, the hook file can be referenced directly from the `import-in-the-middle` library as `--experimental-loader=import-in-the-middle/hook.mjs`.
As the ESM module loader from NodeJS is experimental, so is our support for it. Feel free to provide feedback or report issues about it.

**Note**: ESM is not yet supported for Node 20.

## License

Apache 2.0 - See [LICENSE][license-url] for more information.
Expand Down
199 changes: 0 additions & 199 deletions experimental/packages/opentelemetry-instrumentation/hook.js
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletions experimental/packages/opentelemetry-instrumentation/hook.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
//
// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2021 Datadog, Inc.

import { createHook } from './hook.js';

const { load, resolve, getFormat, getSource } = await createHook(import.meta);

import {
load,
resolve,
getFormat,
getSource,
} from 'import-in-the-middle/hook.mjs';
export { load, resolve, getFormat, getSource };
3 changes: 1 addition & 2 deletions experimental/packages/opentelemetry-instrumentation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
"build/src/**/*.js",
"build/src/**/*.js.map",
"build/src/**/*.d.ts",
"hook.js",
"hook.mjs",
"doc",
"LICENSE",
Expand Down Expand Up @@ -73,7 +72,7 @@
},
"dependencies": {
"@types/shimmer": "^1.0.2",
"import-in-the-middle": "^1.3.4",
"import-in-the-middle": "1.3.5",
"require-in-the-middle": "^7.1.0",
"semver": "^7.3.2",
"shimmer": "^1.2.1"
Expand Down