Merge branch 'main' into main

Author: pichlermarc

.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/pr-review.yml

@@ -17,7 +17,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Run add-labels-to-reviewed-pr.sh
         run: |

.github/workflows/test-all-versions.yml

@@ -34,6 +34,7 @@ jobs:
           node-version: 18
       - name: Install
         run: npm ci --ignore-scripts
+        timeout-minutes: 10
       - name: Build
         run: npm run compile
       - name: Upload Build Artifacts
@@ -57,14 +58,14 @@ jobs:
       mongo:
         image: mongo
         ports:
-        - 27017:27017
+          - 27017:27017
       mssql:
         image: mcr.microsoft.com/mssql/server:2022-latest
         env:
           MSSQL_SA_PASSWORD: mssql_passw0rd
           ACCEPT_EULA: Y
         ports:
-        - 1433:1433
+          - 1433:1433
         options: >-
           --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
           --health-interval 1s
@@ -79,7 +80,7 @@ jobs:
           MYSQL_DATABASE: otel_mysql_database
           MYSQL_ROOT_PASSWORD: rootpw
         ports:
-        - 3306:3306
+          - 3306:3306
         options: >-
           --health-cmd="mysqladmin ping"
           --health-interval 10s
@@ -105,7 +106,7 @@ jobs:
           POSTGRES_DB: otel_pg_database
           POSTGRES_PASSWORD: postgres
         ports:
-        - 5432:5432
+          - 5432:5432
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -114,14 +115,14 @@ jobs:
       rabbitmq:
         image: rabbitmq:3
         ports:
-        - 22221:5672
+          - 22221:5672
         env:
           RABBITMQ_DEFAULT_USER: username
           RABBITMQ_DEFAULT_PASS: password
       redis:
         image: redis
         ports:
-        - 6379:6379
+          - 6379:6379
         options: >-
           --health-cmd "redis-cli ping"
           --health-interval 10s
@@ -171,6 +172,7 @@ jobs:
         # Post install scripts are required for some deps for successful test
         # runs: sqlite3, better-sqlite3, and possibly esbuild.
         run: npm ci
+        timeout-minutes: 10
       - name: Download Build Artifacts
         uses: actions/download-artifact@v5
         with:

.github/workflows/test.yml

@@ -27,6 +27,7 @@ jobs:
           node-version: 18
       - name: Install
         run: npm ci --ignore-scripts
+        timeout-minutes: 10
       # Note: when pushing to main we want to test only what changed in
       # last commit. Otherwise we want to test all changes from origin/main.
       # So we set the right values for base and head commits depending
@@ -71,18 +72,18 @@ jobs:
       memcached:
         image: memcached:1.6.39-alpine
         ports:
-        - 11211:11211
+          - 11211:11211
       mongo:
         image: mongo
         ports:
-        - 27017:27017
+          - 27017:27017
       mssql:
         image: mcr.microsoft.com/mssql/server:2022-latest
         env:
           MSSQL_SA_PASSWORD: mssql_passw0rd
           ACCEPT_EULA: Y
         ports:
-        - 1433:1433
+          - 1433:1433
         options: >-
           --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U sa -P $MSSQL_SA_PASSWORD -C -Q 'select 1' -b -o /dev/null"
           --health-interval 1s
@@ -97,7 +98,7 @@ jobs:
           MYSQL_DATABASE: otel_mysql_database
           MYSQL_ROOT_PASSWORD: rootpw
         ports:
-        - 3306:3306
+          - 3306:3306
         options: >-
           --health-cmd="mysqladmin ping"
           --health-interval 10s
@@ -123,7 +124,7 @@ jobs:
           POSTGRES_DB: otel_pg_database
           POSTGRES_PASSWORD: postgres
         ports:
-        - 5432:5432
+          - 5432:5432
         options: >-
           --health-cmd pg_isready
           --health-interval 10s
@@ -132,7 +133,7 @@ jobs:
       redis:
         image: redis
         ports:
-        - 6379:6379
+          - 6379:6379
         options: >-
           --health-cmd "redis-cli ping"
           --health-interval 10s
@@ -141,11 +142,11 @@ jobs:
       cassandra:
         image: cassandra:3
         ports:
-        - 9042:9042
+          - 9042:9042
       rabbitmq:
         image: rabbitmq:3
         ports:
-        - 22221:5672
+          - 22221:5672
         env:
           RABBITMQ_DEFAULT_USER: username
           RABBITMQ_DEFAULT_PASS: password
@@ -198,6 +199,7 @@ jobs:
           node-version: ${{ matrix.node }}
       - name: Install
         run: npm ci
+        timeout-minutes: 10
       - name: Download Build Artifacts
         uses: actions/download-artifact@v5
         with:
@@ -242,6 +244,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - run: npm ci
+        timeout-minutes: 10
       - name: Download Build Artifacts
         uses: actions/download-artifact@v5
         with:
@@ -286,6 +289,7 @@ jobs:
           node-version: 18
       - name: Install
         run: npm ci --ignore-scripts
+        timeout-minutes: 10
       # Note: Keep this in sync with the node versions from `test-all-versions` job.
       - name: Download Test Artifacts (18)
         uses: actions/download-artifact@v5
@@ -312,4 +316,3 @@ jobs:
         env:
           COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
           PR_BRANCH_NAME: ${{ github.event.pull_request.head.label }}
-

.release-please-manifest.json

@@ -27,6 +27,7 @@
   "packages/instrumentation-lru-memoizer": "0.52.0",
   "packages/instrumentation-mongoose": "0.54.0",
   "packages/instrumentation-runtime-node": "0.21.0",
+  "packages/instrumentation-sequelize": "0.1.0",
   "packages/instrumentation-socket.io": "0.54.0",
   "packages/instrumentation-tedious": "0.26.0",
   "packages/instrumentation-typeorm": "0.8.0",

examples/express/package.json

@@ -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/src/client.ts

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

examples/express/src/server.ts

@@ -23,14 +23,15 @@ setupTracing('example-express-server');
 import * as express from 'express';
 import * as axios from 'axios';
 import { RequestHandler } from 'express';
+import type { Resource } from '@opentelemetry/resources';
 
 // Setup express
 const app = express();
 const PORT = 8080;
 
 const getCrudController = () => {
   const router = express.Router();
-  const resources: any[] = [];
+  const resources: Resource[] = [];
   router.get('/', (req, res) => res.send(resources));
   router.post('/', (req, res) => {
     resources.push(req.body);

examples/express/src/tracer.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)],