Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions .github/workflows/release-please-validate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions .mocharc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"require": ["ts-node/register/transpile-only"]
}
1 change: 0 additions & 1 deletion .mocharc.yml

This file was deleted.

2 changes: 1 addition & 1 deletion examples/express/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions karma.webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ module.exports = {
// because the `util` package expects there to be a global variable named `process`.
// Thanks to https://stackoverflow.com/a/65018686/14239942
// NOTE: I wish there was a better way as this pollutes the tests with a defined 'process' global.
process: 'process/browser',
}),
process: 'process/browser.js'
})
],
module: {
rules: [
Expand Down
9,923 changes: 3,566 additions & 6,357 deletions package-lock.json

Large diffs are not rendered by default.

50 changes: 38 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,32 +44,58 @@
"author": "OpenTelemetry Authors",
"license": "Apache-2.0",
"devDependencies": {
"@babel/core": "7.28.4",
"@babel/preset-env": "7.28.3",
"@eslint/js": "9.34.0",
"@nx/eslint": "20.8.2",
"@types/mocha": "^10.0.10",
"@types/node": "^22.17.1",
"@types/semver": "^7.7.1",
"@types/webpack-env": "^1.18.8",
"cross-env": "^7.0.3",
"@types/mocha": "10.0.10",
"@types/node": "22.17.1",
"@types/semver": "7.7.1",
"@types/shimmer": "1.2.0",
"@types/sinon": "17.0.4",
"@types/webpack-env": "1.18.8",
"assert": "2.1.0",
"babel-loader": "10.0.0",
"babel-plugin-istanbul": "7.0.1",
"cross-env": "10.1.0",
"eslint": "9.34.0",
"eslint-plugin-header": "3.1.1",
"eslint-plugin-import": "2.32.0",
"eslint-plugin-n": "17.21.3",
"eslint-plugin-yet-another-license-header": "0.2.0",
"glob": "^11.0.3",
"expect": "29.7.0",
"glob": "11.0.3",
"globals": "^16.3.0",
"karma": "6.4.4",
"karma-chrome-launcher": "3.2.0",
"karma-coverage": "2.2.1",
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "5.0.1",
"lerna": "9.0.0",
"markdownlint-cli2": "0.13.0",
"minimatch": "^9.0.3",
"mocha": "^11.0.0",
"markdownlint-cli2": "0.17.2",
"minimatch": "9.0.5",
"mocha": "11.7.4",
"nock": "14.0.10",
"nx": "20.8.2",
"nyc": "17.1.0",
"prettier": "3.6.2",
"process": "0.11.10",
"semver": "^7.6.0",
"rimraf": "5.0.10",
"safe-stable-stringify": "2.5.0",
"semver": "7.7.2",
"sinon": "15.2.0",
"test-all-versions": "6.2.0",
"ts-loader": "9.5.4",
"ts-node": "10.9.2",
"typescript": "5.0.4",
"typescript-eslint": "8.41.0",
"util": "0.12.5"
"util": "0.12.5",
"webpack": "5.102.0",
"webpack-cli": "6.0.1",
"webpack-merge": "6.0.1"
},
"overrides": {
"rollup":"4.52.5"
},
"workspaces": [
"packages/*"
Expand Down
9 changes: 1 addition & 8 deletions packages/auto-configuration-propagators/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,7 @@
"@opentelemetry/api": "^1.4.1"
},
"devDependencies": {
"@opentelemetry/api": "^1.4.1",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"typescript": "5.0.4"
"@opentelemetry/api": "^1.4.1"
},
"dependencies": {
"@opentelemetry/core": "^2.0.0",
Expand Down
9 changes: 1 addition & 8 deletions packages/auto-instrumentations-node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,7 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.4.1",
"@opentelemetry/core": "^2.0.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"typescript": "5.0.4"
"@opentelemetry/core": "^2.0.0"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.208.0",
Expand Down
27 changes: 2 additions & 25 deletions packages/auto-instrumentations-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,34 +32,11 @@
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
},
"peerDependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/api": "^1.9.0",
"zone.js": "^0.11.4 || ^0.13.0 || ^0.14.0 || ^0.15.0"
},
"devDependencies": {
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "^1.3.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"@types/webpack-env": "1.16.3",
"assert": "2.0.0",
"babel-loader": "10.0.0",
"babel-plugin-istanbul": "7.0.1",
"karma": "6.4.4",
"karma-chrome-launcher": "3.1.0",
"karma-coverage": "2.2.1",
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "5.0.1",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"sinon": "15.1.2",
"ts-loader": "9.5.4",
"typescript": "5.0.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"@opentelemetry/api": "^1.9.0"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.208.0",
Expand Down
8 changes: 1 addition & 7 deletions packages/baggage-log-record-processor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,7 @@
"@opentelemetry/sdk-logs": "^0.208.0"
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"expect": "29.2.0",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"typescript": "5.0.4"
"@opentelemetry/api": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/baggage-log-record-processor#readme"
}
8 changes: 1 addition & 7 deletions packages/baggage-span-processor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,7 @@
"@opentelemetry/sdk-trace-base": "^2.0.0"
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"expect": "29.2.0",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"typescript": "5.0.4"
"@opentelemetry/api": "^1.0.0"
},
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/packages/baggage-span-processor#readme"
}
6 changes: 2 additions & 4 deletions packages/contrib-test-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@
"@opentelemetry/api": "^1.3.0"
},
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
"@types/node": "18.18.14",
"typescript": "5.0.4"
"@opentelemetry/api": "^1.3.0"
},
"dependencies": {
"@opentelemetry/core": "^2.0.0",
Expand All @@ -53,6 +51,6 @@
"@opentelemetry/sdk-node": "^0.208.0",
"@opentelemetry/sdk-trace-base": "^2.0.0",
"@opentelemetry/sdk-trace-node": "^2.0.0",
"@opentelemetry/semantic-conventions": "^1.27.0"
"@opentelemetry/semantic-conventions": "^1.37.0"
}
}
9 changes: 1 addition & 8 deletions packages/host-metrics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,7 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/sdk-metrics": "^2.0.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"typescript": "5.0.4"
"@opentelemetry/sdk-metrics": "^2.0.0"
},
"dependencies": {
"systeminformation": "5.23.8"
Expand Down
25 changes: 1 addition & 24 deletions packages/id-generator-aws-xray/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,30 +52,7 @@
"@opentelemetry/api": "^1.0.0"
},
"devDependencies": {
"@babel/core": "7.24.6",
"@babel/preset-env": "7.24.6",
"@opentelemetry/api": "^1.0.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"@types/webpack-env": "1.16.3",
"assert": "2.0.0",
"babel-loader": "10.0.0",
"babel-plugin-istanbul": "7.0.1",
"karma": "6.4.4",
"karma-chrome-launcher": "3.1.0",
"karma-coverage": "2.2.1",
"karma-mocha": "2.0.1",
"karma-spec-reporter": "0.0.36",
"karma-webpack": "5.0.1",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"sinon": "15.1.2",
"ts-loader": "9.5.4",
"typescript": "5.0.4",
"webpack": "5.94.0",
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
"@opentelemetry/api": "^1.0.0"
},
"dependencies": {
"@opentelemetry/sdk-trace-base": "^2.0.0"
Expand Down
13 changes: 2 additions & 11 deletions packages/instrumentation-amqplib/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,9 @@
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/contrib-test-utils": "^0.55.0",
"@types/amqplib": "^0.10.7",
"@types/lodash": "4.14.199",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"@types/lodash": "4.17.20",
"amqplib": "0.8.0",
"cross-env": "7.0.3",
"expect": "29.2.0",
"lodash": "4.17.21",
"nyc": "17.1.0",
"sinon": "15.2.0",
"test-all-versions": "6.1.0",
"typescript": "5.0.4"
"lodash": "4.17.21"
},
"engines": {
"node": "^18.19.0 || >=20.6.0"
Expand Down
7 changes: 1 addition & 6 deletions packages/instrumentation-aws-lambda/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,7 @@
"@opentelemetry/propagator-aws-xray-lambda": "^0.55.3",
"@opentelemetry/sdk-metrics": "^2.0.0",
"@opentelemetry/sdk-trace-base": "^2.0.0",
"@opentelemetry/sdk-trace-node": "^2.0.0",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"typescript": "5.0.4"
"@opentelemetry/sdk-trace-node": "^2.0.0"
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.208.0",
Expand Down
1 change: 1 addition & 0 deletions packages/instrumentation-aws-sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ aws-sdk instrumentation has few options available to choose from. You can set th
## Span Attributes

The instrumentations are collecting the following attributes:

| Attribute Name | Type | Description | Example |
| -------------- | ---- | ----------- | ------- |
| `rpc.system` | string | Always equals "aws-api" | |
Expand Down
12 changes: 1 addition & 11 deletions packages/instrumentation-aws-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,7 @@
"@opentelemetry/api": "^1.3.0",
"@opentelemetry/contrib-test-utils": "^0.55.0",
"@opentelemetry/sdk-trace-base": "^2.0.0",
"@smithy/node-http-handler": "4.1.1",
"@types/mocha": "10.0.10",
"@types/node": "18.18.14",
"@types/sinon": "17.0.4",
"expect": "29.2.0",
"nock": "13.3.3",
"nyc": "17.1.0",
"rimraf": "5.0.10",
"sinon": "15.2.0",
"test-all-versions": "6.1.0",
"typescript": "5.0.4"
"@smithy/node-http-handler": "4.1.1"
},
"engines": {
"node": "^18.19.0 || >=20.6.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"max_new_tokens": 10,
"temperature": 0.8,
"top_p": 1,
"stopSequences": ["|"]
"stopSequences": [
"|"
]
}
},
"status": 200,
Expand All @@ -36,7 +38,7 @@
"Content-Type",
"application/json",
"Content-Length",
"68",
"181",
"Connection",
"keep-alive",
"x-amzn-RequestId",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"maxTokenCount": 10,
"temperature": 0.8,
"topP": 1,
"stopSequences": ["|"]
"stopSequences": [
"|"
]
}
},
"status": 200,
Expand All @@ -29,7 +31,7 @@
"Content-Type",
"application/json",
"Content-Length",
"143",
"147",
"Connection",
"keep-alive",
"x-amzn-RequestId",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
"max_tokens": 10,
"temperature": 0.8,
"top_p": 1,
"stop_sequences": ["|"]
"stop_sequences": [
"|"
]
},
"status": 200,
"response": {
Expand All @@ -36,7 +38,7 @@
"Content-Type",
"application/json",
"Content-Length",
"68",
"134",
"Connection",
"keep-alive",
"x-amzn-RequestId",
Expand Down
Loading