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

Jump to bottom

fix(generic-pool): remove deps on types package for ts5 compatibility #1637

Merged
merged 2 commits into from
Aug 16, 2023
Merged

fix(generic-pool): remove deps on types package for ts5 compatibility #1637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e310634
fix(generic-pool): remove deps on types package for ts5 compatibility
blumamir Aug 14, 2023
52dcddd
Merge branch 'main' into generic-pool-types
blumamir Aug 15, 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
4 changes: 2 additions & 2 deletions plugins/node/opentelemetry-instrumentation-generic-pool/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"@opentelemetry/context-async-hooks": "^1.8.0",
"@opentelemetry/sdk-trace-base": "^1.8.0",
"@opentelemetry/sdk-trace-node": "^1.8.0",
"@types/generic-pool": "^3.1.9",
"@types/mocha": "7.0.2",
"@types/node": "18.16.19",
"@types/semver": "7.5.0",
Expand All @@ -62,8 +63,7 @@
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.41.2",
"@opentelemetry/semantic-conventions": "^1.0.0",
"@types/generic-pool": "^3.1.9"
"@opentelemetry/semantic-conventions": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/plugins/node/opentelemetry-instrumentation-generic-pool#readme"
}
8 changes: 3 additions & 5 deletions plugins/node/opentelemetry-instrumentation-generic-pool/src/instrumentation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@ import { VERSION } from './version';

const MODULE_NAME = 'generic-pool';

export default class Instrumentation extends InstrumentationBase<
typeof genericPool
> {
export default class Instrumentation extends InstrumentationBase<any> {
// only used for v2 - v2.3)
private _isDisabled = false;

Expand All @@ -40,7 +38,7 @@ export default class Instrumentation extends InstrumentationBase<

init() {
return [
new InstrumentationNodeModuleDefinition<typeof genericPool>(
new InstrumentationNodeModuleDefinition<any>(
MODULE_NAME,
['>=3'],
(moduleExports, moduleVersion) => {
Expand All @@ -63,7 +61,7 @@ export default class Instrumentation extends InstrumentationBase<
return moduleExports;
}
),
new InstrumentationNodeModuleDefinition<typeof genericPool>(
new InstrumentationNodeModuleDefinition<any>(
MODULE_NAME,
['^2.4'],
(moduleExports, moduleVersion) => {
Expand Down
Loading