Merge branch 'main' into pkanal/browser-exception-instrumentation

Author: wolfgangcodes

.github/component_owners.yml

@@ -72,6 +72,10 @@ components:
     - blumamir
   packages/instrumentation-socket.io:
     - mottibec
+  packages/instrumentation-sequelize:
+    - seemk
+    - t2t2
+    - mhennoch
   packages/instrumentation-tedious: []
     # Unmaintained
   packages/instrumentation-typeorm:

.github/workflows/lint.yml

@@ -10,14 +10,14 @@ permissions:
   contents: read
 
 jobs:
-  build:
+  lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-node@v6
         with:
           node-version: 18
-          cache: 'npm'
+          cache: npm
       - run: npm ci --ignore-scripts
       - name: Lint
         run: |

.github/workflows/release-please-validate.yaml

@@ -13,13 +13,10 @@ jobs:
   rp-validate:
     runs-on: ubuntu-latest
     container:
-      image: node:20
+      image: node:22
     steps:
       - name: Checkout
         uses: actions/checkout@v5
 
-      - name: Install glob
-        run: npm install glob
-
       - name: Ensure Release Please Config and Manifest are in sync with the repository
         run: node scripts/check-release-please.mjs

.mocharc.json

@@ -0,0 +1,3 @@
+{
+  "require": ["ts-node/register/transpile-only"]
+}

.mocharc.yml

@@ -1,69 +1,70 @@
 {
-  "packages/resource-detector-alibaba-cloud": "0.31.10",
-  "packages/resource-detector-aws": "2.7.0",
-  "packages/resource-detector-azure": "0.15.0",
-  "packages/resource-detector-container": "0.7.10",
-  "packages/resource-detector-gcp": "0.42.0",
+  "packages/resource-detector-alibaba-cloud": "0.31.11",
+  "packages/resource-detector-aws": "2.8.0",
+  "packages/resource-detector-azure": "0.16.0",
+  "packages/resource-detector-container": "0.7.11",
+  "packages/resource-detector-gcp": "0.43.0",
   "packages/resource-detector-github": "0.31.2",
-  "packages/resource-detector-instana": "0.26.0",
+  "packages/resource-detector-instana": "0.27.0",
   "packages/auto-configuration-propagators": "0.4.4",
-  "packages/auto-instrumentations-node": "0.66.0",
-  "packages/auto-instrumentations-web": "0.53.0",
+  "packages/auto-instrumentations-node": "0.67.0",
+  "packages/auto-instrumentations-web": "0.54.0",
   "packages/baggage-span-processor": "0.4.2",
-  "packages/baggage-log-record-processor": "0.8.0",
-  "packages/host-metrics": "0.36.2",
+  "packages/baggage-log-record-processor": "0.9.0",
+  "packages/host-metrics": "0.37.0",
   "packages/id-generator-aws-xray": "2.0.3",
-  "packages/propagation-utils": "0.31.10",
+  "packages/propagation-utils": "0.31.11",
   "packages/redis-common": "0.38.2",
   "packages/sampler-aws-xray": "0.1.2",
   "packages/sql-common": "0.41.2",
-  "packages/contrib-test-utils": "0.54.0",
-  "packages/winston-transport": "0.18.0",
-  "packages/instrumentation-amqplib": "0.54.0",
-  "packages/instrumentation-cucumber": "0.23.0",
-  "packages/instrumentation-dataloader": "0.25.0",
-  "packages/instrumentation-fs": "0.27.0",
-  "packages/instrumentation-kafkajs": "0.17.0",
-  "packages/instrumentation-lru-memoizer": "0.52.0",
-  "packages/instrumentation-mongoose": "0.54.0",
-  "packages/instrumentation-runtime-node": "0.21.0",
-  "packages/instrumentation-socket.io": "0.54.0",
-  "packages/instrumentation-tedious": "0.26.0",
-  "packages/instrumentation-typeorm": "0.8.0",
-  "packages/instrumentation-undici": "0.18.0",
-  "packages/instrumentation-aws-lambda": "0.59.0",
-  "packages/instrumentation-aws-sdk": "0.63.0",
-  "packages/instrumentation-bunyan": "0.53.0",
-  "packages/instrumentation-cassandra-driver": "0.53.0",
-  "packages/instrumentation-connect": "0.51.0",
-  "packages/instrumentation-dns": "0.51.0",
-  "packages/instrumentation-express": "0.56.0",
-  "packages/instrumentation-fastify": "0.52.0",
-  "packages/instrumentation-generic-pool": "0.51.0",
-  "packages/instrumentation-graphql": "0.55.0",
-  "packages/instrumentation-hapi": "0.54.0",
-  "packages/instrumentation-ioredis": "0.55.0",
-  "packages/instrumentation-knex": "0.52.0",
-  "packages/instrumentation-koa": "0.56.0",
-  "packages/instrumentation-memcached": "0.51.0",
-  "packages/instrumentation-mongodb": "0.60.0",
-  "packages/instrumentation-mysql": "0.53.0",
-  "packages/instrumentation-mysql2": "0.54.0",
-  "packages/instrumentation-nestjs-core": "0.54.0",
-  "packages/instrumentation-net": "0.51.0",
-  "packages/instrumentation-openai": "0.5.0",
-  "packages/instrumentation-oracledb": "0.33.0",
-  "packages/instrumentation-pg": "0.60.0",
-  "packages/instrumentation-pino": "0.54.0",
-  "packages/instrumentation-redis": "0.56.0",
-  "packages/instrumentation-restify": "0.53.0",
-  "packages/instrumentation-router": "0.52.0",
-  "packages/instrumentation-winston": "0.52.0",
-  "packages/instrumentation-document-load": "0.53.0",
-  "packages/instrumentation-long-task": "0.52.0",
-  "packages/instrumentation-user-interaction": "0.52.0",
-  "packages/instrumentation-web-exception": "0.0.1",
-  "packages/plugin-react-load": "0.39.0",
+  "packages/contrib-test-utils": "0.55.0",
+  "packages/winston-transport": "0.19.0",
+  "packages/instrumentation-amqplib": "0.55.0",
+  "packages/instrumentation-cucumber": "0.24.0",
+  "packages/instrumentation-dataloader": "0.26.0",
+  "packages/instrumentation-fs": "0.28.0",
+  "packages/instrumentation-kafkajs": "0.18.0",
+  "packages/instrumentation-lru-memoizer": "0.53.0",
+  "packages/instrumentation-mongoose": "0.55.0",
+  "packages/instrumentation-runtime-node": "0.22.0",
+  "packages/instrumentation-sequelize": "0.2.0",
+  "packages/instrumentation-socket.io": "0.55.0",
+  "packages/instrumentation-tedious": "0.27.0",
+  "packages/instrumentation-typeorm": "0.9.0",
+  "packages/instrumentation-undici": "0.19.0",
+  "packages/instrumentation-aws-lambda": "0.60.0",
+  "packages/instrumentation-aws-sdk": "0.64.0",
+  "packages/instrumentation-bunyan": "0.54.0",
+  "packages/instrumentation-cassandra-driver": "0.54.0",
+  "packages/instrumentation-connect": "0.52.0",
+  "packages/instrumentation-dns": "0.52.0",
+  "packages/instrumentation-express": "0.57.0",
+  "packages/instrumentation-fastify": "0.53.0",
+  "packages/instrumentation-generic-pool": "0.52.0",
+  "packages/instrumentation-graphql": "0.56.0",
+  "packages/instrumentation-hapi": "0.55.0",
+  "packages/instrumentation-ioredis": "0.56.0",
+  "packages/instrumentation-knex": "0.53.0",
+  "packages/instrumentation-koa": "0.57.0",
+  "packages/instrumentation-memcached": "0.52.0",
+  "packages/instrumentation-mongodb": "0.61.0",
+  "packages/instrumentation-mysql": "0.54.0",
+  "packages/instrumentation-mysql2": "0.55.0",
+  "packages/instrumentation-nestjs-core": "0.55.0",
+  "packages/instrumentation-net": "0.52.0",
+  "packages/instrumentation-openai": "0.6.0",
+  "packages/instrumentation-oracledb": "0.34.0",
+  "packages/instrumentation-pg": "0.61.0",
+  "packages/instrumentation-pino": "0.55.0",
+  "packages/instrumentation-redis": "0.57.0",
+  "packages/instrumentation-restify": "0.54.0",
+  "packages/instrumentation-router": "0.53.0",
+  "packages/instrumentation-winston": "0.53.0",
+  "packages/instrumentation-document-load": "0.54.0",
+  "packages/instrumentation-web-exception": "0.1.0",
+  "packages/instrumentation-long-task": "0.53.0",
+  "packages/instrumentation-user-interaction": "0.53.0",
+  "packages/plugin-react-load": "0.40.0",
   "packages/propagator-instana": "0.4.3",
   "packages/propagator-ot-trace": "0.28.3",
   "packages/propagator-aws-xray": "2.1.3",

.release-please-manifest.json

@@ -19,7 +19,7 @@
     "tracing"
   ],
   "engines": {
-    "node": ">=14"
+    "node": "^18.19.0 || >=20.6.0"
   },
   "author": "OpenTelemetry Authors",
   "license": "Apache-2.0",
@@ -29,21 +29,21 @@
   "homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/examples/express#readme",
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/exporter-trace-otlp-proto": "^0.54.2",
-    "@opentelemetry/instrumentation": "^0.54.2",
-    "@opentelemetry/instrumentation-express": "^0.44.0",
-    "@opentelemetry/instrumentation-http": "^0.54.2",
-    "@opentelemetry/resources": "^1.27.0",
-    "@opentelemetry/sdk-trace-base": "^1.27.0",
-    "@opentelemetry/sdk-trace-node": "^1.27.0",
-    "@opentelemetry/semantic-conventions": "^1.27.0",
-    "axios": "^1.6.0",
-    "express": "^4.17.1"
+    "@opentelemetry/exporter-trace-otlp-proto": "^0.207.0",
+    "@opentelemetry/instrumentation": "^0.207.0",
+    "@opentelemetry/instrumentation-express": "^0.56.0",
+    "@opentelemetry/instrumentation-http": "^0.207.0",
+    "@opentelemetry/resources": "^2.2.0",
+    "@opentelemetry/sdk-trace-base": "^2.2.0",
+    "@opentelemetry/sdk-trace-node": "^2.2.0",
+    "@opentelemetry/semantic-conventions": "^1.37.0",
+    "axios": "^1.13.1",
+    "express": "^5.1.0"
   },
   "devDependencies": {
-    "@types/express": "^4.17.13",
+    "@types/express": "^5.0.5",
     "@types/node": "18.18.14",
-    "ts-node": "^10.6.0",
+    "ts-node": "^10.9.2",
     "typescript": "5.0.4"
   }
 }

examples/express/package.json

@@ -54,4 +54,4 @@ async function makeRequest() {
   );
 }
 
-makeRequest().catch(err => console.log(err));
+makeRequest().catch(err => console.error(err));

examples/express/src/client.ts

@@ -21,7 +21,7 @@ setupTracing('example-express-server');
 
 // Require in rest of modules
 import * as express from 'express';
-import * as axios from 'axios';
+import axios from 'axios';
 import { RequestHandler } from 'express';
 
 // Setup express
@@ -30,10 +30,10 @@ const PORT = 8080;
 
 const getCrudController = () => {
   const router = express.Router();
-  const resources: any[] = [];
-  router.get('/', (req, res) => res.send(resources));
+  const things: unknown[] = [];
+  router.get('/', (req, res) => res.send(things));
   router.post('/', (req, res) => {
-    resources.push(req.body);
+    things.push(req.body);
     return res.status(201).send(req.body);
   });
   return router;

examples/express/src/server.ts

@@ -14,32 +14,28 @@
  * limitations under the License.
  */
 
-import {
-  trace,
-  SamplingDecision,
-  SpanKind,
-  Attributes,
-} from '@opentelemetry/api';
+import { trace, SpanKind, Attributes } from '@opentelemetry/api';
 import { registerInstrumentations } from '@opentelemetry/instrumentation';
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node';
 import {
   Sampler,
   AlwaysOnSampler,
   SimpleSpanProcessor,
+  SamplingDecision,
 } from '@opentelemetry/sdk-trace-base';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
-import { Resource } from '@opentelemetry/resources';
 import {
   ATTR_SERVICE_NAME,
   ATTR_HTTP_ROUTE,
 } from '@opentelemetry/semantic-conventions';
 import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
+import { resourceFromAttributes } from '@opentelemetry/resources';
 
 export const setupTracing = (serviceName: string) => {
   const exporter = new OTLPTraceExporter({});
   const provider = new NodeTracerProvider({
-    resource: new Resource({
+    resource: resourceFromAttributes({
       [ATTR_SERVICE_NAME]: serviceName,
     }),
     spanProcessors: [new SimpleSpanProcessor(exporter)],