Merge branch 'main' of github.com:open-telemetry/opentelemetry-js-contrib

sudarshan12s · sudarshan12s · commit 93d21e1339f4 · 2025-01-08T09:42:04.000+05:30
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -7,10 +7,10 @@
   "detectors/node/opentelemetry-resource-detector-github": "0.29.0",
   "detectors/node/opentelemetry-resource-detector-instana": "0.17.0",
   "metapackages/auto-configuration-propagators": "0.3.1",
-  "metapackages/auto-instrumentations-node": "0.55.0",
+  "metapackages/auto-instrumentations-node": "0.55.1",
   "metapackages/auto-instrumentations-web": "0.45.0",
   "packages/baggage-span-processor": "0.3.1",
-  "packages/opentelemetry-host-metrics": "0.35.4",
+  "packages/opentelemetry-host-metrics": "0.35.5",
   "packages/opentelemetry-id-generator-aws-xray": "1.2.2",
   "packages/opentelemetry-propagation-utils": "0.30.15",
   "packages/opentelemetry-redis-common": "0.36.2",
@@ -38,7 +38,7 @@
   "plugins/node/opentelemetry-instrumentation-fastify": "0.44.0",
   "plugins/node/opentelemetry-instrumentation-generic-pool": "0.43.0",
   "plugins/node/opentelemetry-instrumentation-graphql": "0.47.0",
-  "plugins/node/opentelemetry-instrumentation-hapi": "0.45.0",
+  "plugins/node/opentelemetry-instrumentation-hapi": "0.45.1",
   "plugins/node/opentelemetry-instrumentation-ioredis": "0.47.0",
   "plugins/node/opentelemetry-instrumentation-knex": "0.44.0",
   "plugins/node/opentelemetry-instrumentation-koa": "0.47.0",
diff --git a/metapackages/auto-instrumentations-node/CHANGELOG.md b/metapackages/auto-instrumentations-node/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.55.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.55.0...auto-instrumentations-node-v0.55.1) (2025-01-07)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @opentelemetry/instrumentation-hapi bumped from ^0.45.0 to ^0.45.1
+
 ## [0.55.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.54.0...auto-instrumentations-node-v0.55.0) (2024-12-18)
 
 
diff --git a/metapackages/auto-instrumentations-node/package.json b/metapackages/auto-instrumentations-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/auto-instrumentations-node",
-  "version": "0.55.0",
+  "version": "0.55.1",
   "description": "Metapackage which bundles opentelemetry node core and contrib instrumentations",
   "author": "OpenTelemetry Authors",
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#readme",
@@ -62,7 +62,7 @@
     "@opentelemetry/instrumentation-generic-pool": "^0.43.0",
     "@opentelemetry/instrumentation-graphql": "^0.47.0",
     "@opentelemetry/instrumentation-grpc": "^0.57.0",
-    "@opentelemetry/instrumentation-hapi": "^0.45.0",
+    "@opentelemetry/instrumentation-hapi": "^0.45.1",
     "@opentelemetry/instrumentation-http": "^0.57.0",
     "@opentelemetry/instrumentation-ioredis": "^0.47.0",
     "@opentelemetry/instrumentation-kafkajs": "^0.7.0",
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/opentelemetry-host-metrics/CHANGELOG.md b/packages/opentelemetry-host-metrics/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.35.5](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/host-metrics-v0.35.4...host-metrics-v0.35.5) (2025-01-07)
+
+
+### Bug Fixes
+
+* **deps:** update dependency systeminformation to v5.23.8 [security] ([#2613](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2613)) ([3bab134](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/3bab134ab63bf3da48623957a8a63c07995c00cb))
+
 ## [0.35.4](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/host-metrics-v0.35.3...host-metrics-v0.35.4) (2024-10-08)
 
 
diff --git a/packages/opentelemetry-host-metrics/package.json b/packages/opentelemetry-host-metrics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/host-metrics",
-  "version": "0.35.4",
+  "version": "0.35.5",
   "description": "OpenTelemetry Host Metrics for Node.js",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -53,7 +53,7 @@
     "typescript": "4.4.4"
   },
   "dependencies": {
-    "systeminformation": "5.22.9"
+    "systeminformation": "5.23.8"
   },
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/opentelemetry-host-metrics#readme"
 }
diff --git a/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md b/plugins/node/opentelemetry-instrumentation-hapi/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.45.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-hapi-v0.45.0...instrumentation-hapi-v0.45.1) (2025-01-07)
+
+
+### Bug Fixes
+
+* **instrumentation-hapi:** fix this binding for plugin register method ([#2625](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/2625)) ([f6ded2e](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/f6ded2e77909f2e78f40828eb9618a8fa761021c))
+
 ## [0.45.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-hapi-v0.44.0...instrumentation-hapi-v0.45.0) (2024-12-18)
 
 
diff --git a/plugins/node/opentelemetry-instrumentation-hapi/package.json b/plugins/node/opentelemetry-instrumentation-hapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/instrumentation-hapi",
-  "version": "0.45.0",
+  "version": "0.45.1",
   "description": "OpenTelemetry instrumentation for `@hapi/hapi` http web application framework",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
diff --git a/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-hapi/src/instrumentation.ts
@@ -267,9 +267,13 @@ export class HapiInstrumentation extends InstrumentationBase {
   private _wrapRegisterHandler<T>(plugin: Hapi.Plugin<T>): void {
     const instrumentation: HapiInstrumentation = this;
     const pluginName = getPluginName(plugin);
-    const oldHandler = plugin.register;
+    const oldRegister = plugin.register;
     const self = this;
-    const newRegisterHandler = function (server: Hapi.Server, options: T) {
+    const newRegisterHandler = function (
+      this: typeof plugin,
+      server: Hapi.Server,
+      options: T
+    ) {
       self._wrap(server, 'route', original => {
         return instrumentation._getServerRoutePatch.bind(instrumentation)(
           original,
@@ -287,7 +291,7 @@ export class HapiInstrumentation extends InstrumentationBase {
           pluginName
         );
       });
-      return oldHandler(server, options);
+      return oldRegister.call(this, server, options);
     };
     plugin.register = newRegisterHandler;
   }
diff --git a/plugins/node/opentelemetry-instrumentation-hapi/test/hapi-plugin.test.ts b/plugins/node/opentelemetry-instrumentation-hapi/test/hapi-plugin.test.ts
@@ -81,12 +81,13 @@ describe('Hapi Instrumentation - Hapi.Plugin Tests', () => {
     name: 'simplePlugin',
     version: '1.0.0',
     multiple: true,
+    value: 42,
     register: async function (server: hapi.Server, options: any) {
       server.route({
         method: 'GET',
         path: '/hello',
-        handler: function (request, h) {
-          return `hello, world, ${options.name}`;
+        handler: (request, h) => {
+          return `hello, world, ${this.value} ${options.name}`;
         },
       });
     },

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@opentelemetry/instrumentation-hapi",`
`3`		`- "version": "0.45.0",`
	`3`	`+ "version": "0.45.1",`
`4`	`4`	"description": "OpenTelemetry instrumentation for `@hapi/hapi` http web application framework",
`5`	`5`	`"main": "build/src/index.js",`
`6`	`6`	`"types": "build/src/index.d.ts",`