Skip to content

Commit

Permalink
Merge branch 'main' into tm-disable-client-sqs-context-test
Browse files Browse the repository at this point in the history
  • Loading branch information
trentm authored Dec 11, 2023
2 parents 212935e + 3cb2802 commit a5bb350
Show file tree
Hide file tree
Showing 57 changed files with 1,074 additions and 151 deletions.
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.4","detectors/node/opentelemetry-resource-detector-aws":"1.3.4","detectors/node/opentelemetry-resource-detector-azure":"0.2.1","detectors/node/opentelemetry-resource-detector-container":"0.3.4","detectors/node/opentelemetry-resource-detector-gcp":"0.29.4","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.4","metapackages/auto-instrumentations-node":"0.40.1","metapackages/auto-instrumentations-web":"0.34.0","packages/opentelemetry-host-metrics":"0.33.2","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.4","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.35.0","plugins/node/instrumentation-amqplib":"0.33.4","plugins/node/instrumentation-cucumber":"0.1.2","plugins/node/instrumentation-dataloader":"0.5.3","plugins/node/instrumentation-fs":"0.8.3","plugins/node/instrumentation-lru-memoizer":"0.33.4","plugins/node/instrumentation-mongoose":"0.33.4","plugins/node/instrumentation-socket.io":"0.34.4","plugins/node/instrumentation-tedious":"0.6.4","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.2","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.37.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.33.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.34.1","plugins/node/opentelemetry-instrumentation-connect":"0.32.3","plugins/node/opentelemetry-instrumentation-dns":"0.32.4","plugins/node/opentelemetry-instrumentation-express":"0.33.3","plugins/node/opentelemetry-instrumentation-fastify":"0.32.4","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.4","plugins/node/opentelemetry-instrumentation-graphql":"0.36.0","plugins/node/opentelemetry-instrumentation-hapi":"0.33.2","plugins/node/opentelemetry-instrumentation-ioredis":"0.36.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.3","plugins/node/opentelemetry-instrumentation-koa":"0.36.2","plugins/node/opentelemetry-instrumentation-memcached":"0.32.4","plugins/node/opentelemetry-instrumentation-mongodb":"0.37.3","plugins/node/opentelemetry-instrumentation-mysql":"0.34.4","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.4","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.3","plugins/node/opentelemetry-instrumentation-net":"0.32.3","plugins/node/opentelemetry-instrumentation-pg":"0.37.1","plugins/node/opentelemetry-instrumentation-pino":"0.34.3","plugins/node/opentelemetry-instrumentation-redis":"0.35.4","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.5","plugins/node/opentelemetry-instrumentation-restify":"0.34.2","plugins/node/opentelemetry-instrumentation-router":"0.33.3","plugins/node/opentelemetry-instrumentation-winston":"0.33.0","plugins/web/opentelemetry-instrumentation-document-load":"0.34.0","plugins/web/opentelemetry-instrumentation-long-task":"0.34.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.34.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.4","detectors/node/opentelemetry-resource-detector-aws":"1.3.4","detectors/node/opentelemetry-resource-detector-azure":"0.2.2","detectors/node/opentelemetry-resource-detector-container":"0.3.4","detectors/node/opentelemetry-resource-detector-gcp":"0.29.4","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.5.4","metapackages/auto-instrumentations-node":"0.40.2","metapackages/auto-instrumentations-web":"0.34.0","packages/opentelemetry-host-metrics":"0.34.0","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.4","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.35.0","plugins/node/instrumentation-amqplib":"0.33.4","plugins/node/instrumentation-cucumber":"0.2.0","plugins/node/instrumentation-dataloader":"0.5.3","plugins/node/instrumentation-fs":"0.8.3","plugins/node/instrumentation-lru-memoizer":"0.33.4","plugins/node/instrumentation-mongoose":"0.33.4","plugins/node/instrumentation-socket.io":"0.34.4","plugins/node/instrumentation-tedious":"0.6.4","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.37.3","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.37.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.34.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.34.1","plugins/node/opentelemetry-instrumentation-connect":"0.32.3","plugins/node/opentelemetry-instrumentation-dns":"0.32.4","plugins/node/opentelemetry-instrumentation-express":"0.34.0","plugins/node/opentelemetry-instrumentation-fastify":"0.32.5","plugins/node/opentelemetry-instrumentation-generic-pool":"0.32.4","plugins/node/opentelemetry-instrumentation-graphql":"0.36.0","plugins/node/opentelemetry-instrumentation-hapi":"0.33.2","plugins/node/opentelemetry-instrumentation-ioredis":"0.36.0","plugins/node/opentelemetry-instrumentation-knex":"0.32.3","plugins/node/opentelemetry-instrumentation-koa":"0.36.3","plugins/node/opentelemetry-instrumentation-memcached":"0.32.4","plugins/node/opentelemetry-instrumentation-mongodb":"0.38.0","plugins/node/opentelemetry-instrumentation-mysql":"0.34.4","plugins/node/opentelemetry-instrumentation-mysql2":"0.34.4","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.33.3","plugins/node/opentelemetry-instrumentation-net":"0.32.4","plugins/node/opentelemetry-instrumentation-pg":"0.37.1","plugins/node/opentelemetry-instrumentation-pino":"0.34.4","plugins/node/opentelemetry-instrumentation-redis":"0.35.4","plugins/node/opentelemetry-instrumentation-redis-4":"0.35.5","plugins/node/opentelemetry-instrumentation-restify":"0.34.2","plugins/node/opentelemetry-instrumentation-router":"0.33.3","plugins/node/opentelemetry-instrumentation-winston":"0.33.0","plugins/web/opentelemetry-instrumentation-document-load":"0.34.0","plugins/web/opentelemetry-instrumentation-long-task":"0.34.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.34.0","plugins/web/opentelemetry-plugin-react-load":"0.30.0","propagators/opentelemetry-propagator-aws-xray":"1.3.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.27.1","propagators/opentelemetry-propagator-instana":"0.3.1","propagators/opentelemetry-propagator-ot-trace":"0.27.1"}
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [0.2.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.1...resource-detector-azure-v0.2.2) (2023-12-07)


### Bug Fixes

* **resource-detector-azure:** only detect Azure Functions when FUNCTIONS_EXTENSION_VERSION is defined ([#1846](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1846)) ([8f2a195](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/8f2a195d405c173ed7b817db63a1735af424a3e8))

## [0.2.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.0...resource-detector-azure-v0.2.1) (2023-11-22)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-azure",
"version": "0.2.1",
"version": "0.2.2",
"description": "OpenTelemetry SDK resource detector for Azure",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down
15 changes: 15 additions & 0 deletions metapackages/auto-instrumentations-node/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,21 @@
* @opentelemetry/resource-detector-container bumped from ^0.3.3 to ^0.3.4
* @opentelemetry/resource-detector-gcp bumped from ^0.29.3 to ^0.29.4

### Dependencies

* The following workspace dependencies were updated
* dependencies
* @opentelemetry/instrumentation-aws-lambda bumped from ^0.37.2 to ^0.37.3
* @opentelemetry/instrumentation-aws-sdk bumped from ^0.37.0 to ^0.37.1
* @opentelemetry/instrumentation-bunyan bumped from ^0.33.0 to ^0.34.0
* @opentelemetry/instrumentation-cucumber bumped from ^0.1.2 to ^0.2.0
* @opentelemetry/instrumentation-express bumped from ^0.33.3 to ^0.34.0
* @opentelemetry/instrumentation-fastify bumped from ^0.32.4 to ^0.32.5
* @opentelemetry/instrumentation-koa bumped from ^0.36.2 to ^0.36.3
* @opentelemetry/instrumentation-mongodb bumped from ^0.37.3 to ^0.38.0
* @opentelemetry/instrumentation-net bumped from ^0.32.3 to ^0.32.4
* @opentelemetry/instrumentation-pino bumped from ^0.34.3 to ^0.34.4

## [0.40.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.39.4...auto-instrumentations-node-v0.40.0) (2023-11-13)


Expand Down
22 changes: 11 additions & 11 deletions metapackages/auto-instrumentations-node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/auto-instrumentations-node",
"version": "0.40.1",
"version": "0.40.2",
"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",
Expand Down Expand Up @@ -51,35 +51,35 @@
"dependencies": {
"@opentelemetry/instrumentation": "^0.45.1",
"@opentelemetry/instrumentation-amqplib": "^0.33.4",
"@opentelemetry/instrumentation-aws-lambda": "^0.37.2",
"@opentelemetry/instrumentation-aws-sdk": "^0.37.0",
"@opentelemetry/instrumentation-bunyan": "^0.33.0",
"@opentelemetry/instrumentation-aws-lambda": "^0.37.3",
"@opentelemetry/instrumentation-aws-sdk": "^0.37.1",
"@opentelemetry/instrumentation-bunyan": "^0.34.0",
"@opentelemetry/instrumentation-cassandra-driver": "^0.34.1",
"@opentelemetry/instrumentation-connect": "^0.32.3",
"@opentelemetry/instrumentation-cucumber": "^0.1.2",
"@opentelemetry/instrumentation-cucumber": "^0.2.0",
"@opentelemetry/instrumentation-dataloader": "^0.5.3",
"@opentelemetry/instrumentation-dns": "^0.32.4",
"@opentelemetry/instrumentation-express": "^0.33.3",
"@opentelemetry/instrumentation-express": "^0.34.0",
"@opentelemetry/instrumentation-fs": "^0.8.3",
"@opentelemetry/instrumentation-fastify": "^0.32.4",
"@opentelemetry/instrumentation-fastify": "^0.32.5",
"@opentelemetry/instrumentation-generic-pool": "^0.32.4",
"@opentelemetry/instrumentation-graphql": "^0.36.0",
"@opentelemetry/instrumentation-grpc": "^0.45.1",
"@opentelemetry/instrumentation-hapi": "^0.33.2",
"@opentelemetry/instrumentation-http": "^0.45.1",
"@opentelemetry/instrumentation-ioredis": "^0.36.0",
"@opentelemetry/instrumentation-knex": "^0.32.3",
"@opentelemetry/instrumentation-koa": "^0.36.2",
"@opentelemetry/instrumentation-koa": "^0.36.3",
"@opentelemetry/instrumentation-lru-memoizer": "^0.33.4",
"@opentelemetry/instrumentation-memcached": "^0.32.4",
"@opentelemetry/instrumentation-mongodb": "^0.37.3",
"@opentelemetry/instrumentation-mongodb": "^0.38.0",
"@opentelemetry/instrumentation-mongoose": "^0.33.4",
"@opentelemetry/instrumentation-mysql": "^0.34.4",
"@opentelemetry/instrumentation-mysql2": "^0.34.4",
"@opentelemetry/instrumentation-nestjs-core": "^0.33.3",
"@opentelemetry/instrumentation-net": "^0.32.3",
"@opentelemetry/instrumentation-net": "^0.32.4",
"@opentelemetry/instrumentation-pg": "^0.37.1",
"@opentelemetry/instrumentation-pino": "^0.34.3",
"@opentelemetry/instrumentation-pino": "^0.34.4",
"@opentelemetry/instrumentation-redis": "^0.35.4",
"@opentelemetry/instrumentation-redis-4": "^0.35.5",
"@opentelemetry/instrumentation-restify": "^0.34.2",
Expand Down
17 changes: 12 additions & 5 deletions metapackages/auto-instrumentations-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,19 @@
},
"main": "build/src/index.js",
"module": "build/esm/index.js",
"esnext": "build/esnext/index.js",
"types": "build/src/index.d.ts",
"repository": "open-telemetry/opentelemetry-js-contrib",
"scripts": {
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json",
"compile": "tsc --build tsconfig.json tsconfig.esm.json",
"clean": "tsc --build --clean tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
"compile": "tsc --build tsconfig.json tsconfig.esm.json tsconfig.esnext.json",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"precompile": "tsc --version && lerna run version:update --scope @opentelemetry/auto-instrumentations-web --include-dependencies",
"prewatch": "npm run precompile",
"prepublishOnly": "npm run compile",
"test:browser": "nyc karma start --single-run",
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json"
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json tsconfig.esnext.json"
},
"bugs": {
"url": "https://github.com/open-telemetry/opentelemetry-js-contrib/issues"
Expand Down Expand Up @@ -69,6 +70,12 @@
"files": [
"build/src/**/*.js",
"build/src/**/*.js.map",
"build/src/**/*.d.ts"
"build/src/**/*.d.ts",
"build/esm/**/*.js",
"build/esm/**/*.js.map",
"build/esm/**/*.d.ts",
"build/esnext/**/*.js",
"build/esnext/**/*.js.map",
"build/esnext/**/*.d.ts"
]
}
}
10 changes: 10 additions & 0 deletions metapackages/auto-instrumentations-web/tsconfig.esnext.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"extends": "../../tsconfig.base.esnext.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esnext",
"skipLibCheck": true,
"tsBuildInfoFile": "build/esnext/tsconfig.esnext.tsbuildinfo"
},
"include": ["src/**/*.ts"]
}
Loading

0 comments on commit a5bb350

Please sign in to comment.