Skip to content

Commit

Permalink
Merge branch 'main' into add-docker-cgroup-containerid
Browse files Browse the repository at this point in the history
  • Loading branch information
abhee11 authored Mar 15, 2022
2 parents 5dbab22 + 491588f commit 2c6ddc0
Show file tree
Hide file tree
Showing 13 changed files with 67 additions and 11 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.26.2","detectors/node/opentelemetry-resource-detector-aws":"1.0.3","detectors/node/opentelemetry-resource-detector-gcp":"0.26.2","detectors/node/opentelemetry-resource-detector-github":"0.26.1","metapackages/auto-instrumentations-node":"0.27.3","metapackages/auto-instrumentations-web":"0.27.2","packages/opentelemetry-browser-extension-autoinjection":"0.27.4","packages/opentelemetry-host-metrics":"0.27.1","packages/opentelemetry-id-generator-aws-xray":"1.0.1","packages/opentelemetry-test-utils":"0.29.0","plugins/node/instrumentation-amqplib":"0.27.0","plugins/node/instrumentation-fs":"0.1.0","plugins/node/instrumentation-tedious":"0.1.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.29.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.5.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.27.1","plugins/node/opentelemetry-instrumentation-cassandra":"0.27.1","plugins/node/opentelemetry-instrumentation-connect":"0.27.1","plugins/node/opentelemetry-instrumentation-dns":"0.27.1","plugins/node/opentelemetry-instrumentation-express":"0.28.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.27.2","plugins/node/opentelemetry-instrumentation-graphql":"0.27.4","plugins/node/opentelemetry-instrumentation-hapi":"0.27.1","plugins/node/opentelemetry-instrumentation-ioredis":"0.28.0","plugins/node/opentelemetry-instrumentation-knex":"0.27.1","plugins/node/opentelemetry-instrumentation-koa":"0.28.1","plugins/node/opentelemetry-instrumentation-memcached":"0.27.1","plugins/node/opentelemetry-instrumentation-mongodb":"0.29.0","plugins/node/opentelemetry-instrumentation-mysql":"0.28.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.29.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.28.3","plugins/node/opentelemetry-instrumentation-net":"0.27.1","plugins/node/opentelemetry-instrumentation-pg":"0.28.0","plugins/node/opentelemetry-instrumentation-pino":"0.28.1","plugins/node/opentelemetry-instrumentation-redis":"0.29.0","plugins/node/opentelemetry-instrumentation-restify":"0.27.2","plugins/node/opentelemetry-instrumentation-router":"0.27.1","plugins/node/opentelemetry-instrumentation-winston":"0.27.2","plugins/web/opentelemetry-instrumentation-document-load":"0.27.1","plugins/web/opentelemetry-instrumentation-user-interaction":"0.28.1","plugins/web/opentelemetry-plugin-react-load":"0.26.1","propagators/opentelemetry-propagator-aws-xray":"1.0.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.25.1","propagators/opentelemetry-propagator-ot-trace":"0.25.1","plugins/node/opentelemetry-instrumentation-fastify":"0.26.0","packages/opentelemetry-propagation-utils":"0.27.0","plugins/web/opentelemetry-instrumentation-long-task":"0.28.0"}
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.26.2","detectors/node/opentelemetry-resource-detector-aws":"1.0.3","detectors/node/opentelemetry-resource-detector-gcp":"0.26.2","detectors/node/opentelemetry-resource-detector-github":"0.26.1","metapackages/auto-instrumentations-node":"0.28.0","metapackages/auto-instrumentations-web":"0.27.2","packages/opentelemetry-browser-extension-autoinjection":"0.27.4","packages/opentelemetry-host-metrics":"0.27.1","packages/opentelemetry-id-generator-aws-xray":"1.0.1","packages/opentelemetry-test-utils":"0.29.0","plugins/node/instrumentation-amqplib":"0.28.0","plugins/node/instrumentation-fs":"0.2.0","plugins/node/instrumentation-tedious":"0.1.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.30.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.6.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.27.1","plugins/node/opentelemetry-instrumentation-cassandra":"0.27.1","plugins/node/opentelemetry-instrumentation-connect":"0.27.1","plugins/node/opentelemetry-instrumentation-dns":"0.27.1","plugins/node/opentelemetry-instrumentation-express":"0.28.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.27.2","plugins/node/opentelemetry-instrumentation-graphql":"0.27.4","plugins/node/opentelemetry-instrumentation-hapi":"0.27.1","plugins/node/opentelemetry-instrumentation-ioredis":"0.28.0","plugins/node/opentelemetry-instrumentation-knex":"0.27.1","plugins/node/opentelemetry-instrumentation-koa":"0.28.1","plugins/node/opentelemetry-instrumentation-memcached":"0.27.1","plugins/node/opentelemetry-instrumentation-mongodb":"0.29.0","plugins/node/opentelemetry-instrumentation-mysql":"0.28.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.29.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.28.3","plugins/node/opentelemetry-instrumentation-net":"0.27.1","plugins/node/opentelemetry-instrumentation-pg":"0.28.0","plugins/node/opentelemetry-instrumentation-pino":"0.28.1","plugins/node/opentelemetry-instrumentation-redis":"0.29.0","plugins/node/opentelemetry-instrumentation-restify":"0.27.2","plugins/node/opentelemetry-instrumentation-router":"0.27.1","plugins/node/opentelemetry-instrumentation-winston":"0.27.3","plugins/web/opentelemetry-instrumentation-document-load":"0.27.1","plugins/web/opentelemetry-instrumentation-user-interaction":"0.28.1","plugins/web/opentelemetry-plugin-react-load":"0.26.1","propagators/opentelemetry-propagator-aws-xray":"1.0.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.25.1","propagators/opentelemetry-propagator-ot-trace":"0.25.1","plugins/node/opentelemetry-instrumentation-fastify":"0.26.0","packages/opentelemetry-propagation-utils":"0.27.0","plugins/web/opentelemetry-instrumentation-long-task":"0.28.0"}
17 changes: 17 additions & 0 deletions metapackages/auto-instrumentations-node/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,23 @@
* @opentelemetry/instrumentation-redis bumped from ^0.28.0 to ^0.29.0
* @opentelemetry/instrumentation-winston bumped from ^0.27.0 to ^0.27.2

## [0.28.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.27.3...auto-instrumentations-node-v0.28.0) (2022-03-14)


### Features

* amqplib instrumentation ([#892](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/892)) ([f6c16b6](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/f6c16b6e03f0984af79131e2607b6095350d796c))


### Dependencies

* The following workspace dependencies were updated
* dependencies
* @opentelemetry/instrumentation-amqplib bumped from ^0.27.0 to ^0.28.0
* @opentelemetry/instrumentation-aws-lambda bumped from ^0.29.0 to ^0.30.0
* @opentelemetry/instrumentation-aws-sdk bumped from ^0.5.1 to ^0.6.0
* @opentelemetry/instrumentation-winston bumped from ^0.27.2 to ^0.27.3

### [0.27.3](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/auto-instrumentations-node-v0.27.2...auto-instrumentations-node-v0.27.3) (2022-02-06)


Expand Down
10 changes: 5 additions & 5 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.27.4",
"version": "0.28.0",
"description": "Metapackage which bundles opentelemetry node core and contrib instrumentations",
"author": "OpenTelemetry Authors",
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib#readme",
Expand Down Expand Up @@ -44,9 +44,9 @@
},
"dependencies": {
"@opentelemetry/instrumentation": "^0.27.0",
"@opentelemetry/instrumentation-amqplib": "^0.27.0",
"@opentelemetry/instrumentation-aws-lambda": "^0.29.0",
"@opentelemetry/instrumentation-aws-sdk": "^0.5.1",
"@opentelemetry/instrumentation-amqplib": "^0.28.0",
"@opentelemetry/instrumentation-aws-lambda": "^0.30.0",
"@opentelemetry/instrumentation-aws-sdk": "^0.6.0",
"@opentelemetry/instrumentation-bunyan": "^0.27.0",
"@opentelemetry/instrumentation-cassandra-driver": "^0.27.0",
"@opentelemetry/instrumentation-connect": "^0.27.0",
Expand All @@ -71,6 +71,6 @@
"@opentelemetry/instrumentation-pino": "^0.28.0",
"@opentelemetry/instrumentation-redis": "^0.29.0",
"@opentelemetry/instrumentation-restify": "^0.27.2",
"@opentelemetry/instrumentation-winston": "^0.27.2"
"@opentelemetry/instrumentation-winston": "^0.27.3"
}
}
9 changes: 9 additions & 0 deletions plugins/node/instrumentation-amqplib/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Changelog

## [0.28.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-amqplib-v0.27.0...instrumentation-amqplib-v0.28.0) (2022-03-14)


### Features

* amqplib instrumentation ([#892](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/892)) ([f6c16b6](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/f6c16b6e03f0984af79131e2607b6095350d796c))
* upstream mocha instrumentation testing plugin from ext-js [#621](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/621) ([#669](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/669)) ([a5170c4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/a5170c494706a2bec3ba51e59966d0ca8a41d00e))
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-amqplib/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/instrumentation-amqplib",
"version": "0.27.0",
"version": "0.28.0",
"description": "OpenTelemetry automatic instrumentation for the `amqplib` package",
"keywords": [
"amqplib",
Expand Down
9 changes: 9 additions & 0 deletions plugins/node/instrumentation-fs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Changelog

## [0.2.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-fs-v0.1.0...instrumentation-fs-v0.2.0) (2022-03-14)


### Features

* implement auto-instrumentation for `fs` ([#872](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/872)) ([c3fa161](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/c3fa16170f96d18d071a84d75c920a4726ab2825))
* upstream mocha instrumentation testing plugin from ext-js [#621](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/621) ([#669](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/669)) ([a5170c4](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/a5170c494706a2bec3ba51e59966d0ca8a41d00e))
2 changes: 1 addition & 1 deletion plugins/node/instrumentation-fs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/instrumentation-fs",
"version": "0.1.0",
"version": "0.2.0",
"description": "OpenTelemetry automatic instrumentation package for fs",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [0.30.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-lambda-v0.29.0...instrumentation-aws-lambda-v0.30.0) (2022-03-14)


### Features

* support baggage propagation in aws lambda custom context extraction ([#843](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/843)) ([da792fe](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/da792fe3c629354cf9e8faeca48c17e73dffc6be))

## [0.29.0](https://www.github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-lambda-v0.28.1...instrumentation-aws-lambda-v0.29.0) (2022-02-06)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/instrumentation-aws-lambda",
"version": "0.29.0",
"version": "0.30.0",
"description": "OpenTelemetry AWS Lambda automatic instrumentation package.",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## [0.6.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.5.1...instrumentation-aws-sdk-v0.6.0) (2022-03-14)


### Features

* **aws-sdk:** lambda client instrumentation ([#916](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/916)) ([dc6c2b5](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/dc6c2b5121977814f854b674ec3e519f689637c9))

### [0.5.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-aws-sdk-v0.5.0...instrumentation-aws-sdk-v0.5.1) (2022-03-02)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/instrumentation-aws-sdk",
"version": "0.5.1",
"version": "0.6.0",
"description": "OpenTelemetry automatic instrumentation for the `aws-sdk` package",
"keywords": [
"aws",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

### [0.27.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-winston-v0.27.2...instrumentation-winston-v0.27.3) (2022-03-14)


### Bug Fixes

* avoid leaking winston types ([#932](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/932)) ([31c4886](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/31c4886e168c24496a2c60721eb0d9e3b8732d27))

### [0.27.2](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/instrumentation-winston-v0.27.1...instrumentation-winston-v0.27.2) (2022-03-02)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/instrumentation-winston",
"version": "0.27.2",
"version": "0.27.3",
"description": "OpenTelemetry instrumentation for winston",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down

0 comments on commit 2c6ddc0

Please sign in to comment.