Merge branch 'main' into fix/ioredis-types

open-telemetry · Apr 10, 2024 · be847fd · be847fd
2 parents dbf3421 + eaa99f8
commit be847fd
Show file tree

Hide file tree

Showing 145 changed files with 4,690 additions and 544 deletions.
diff --git a/.github/component_owners.yml b/.github/component_owners.yml
@@ -123,6 +123,9 @@ components:
     - rauno56
   plugins/node/opentelemetry-instrumentation-router:
     - rauno56
+  plugins/node/opentelemetry-instrumentation-undici:
+    - david-luna
+    - trentm
   plugins/node/opentelemetry-instrumentation-winston:
     - seemk
   plugins/web/opentelemetry-instrumentation-document-load:

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1 +1,63 @@
-{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.28.7","detectors/node/opentelemetry-resource-detector-aws":"1.4.0","detectors/node/opentelemetry-resource-detector-azure":"0.2.5","detectors/node/opentelemetry-resource-detector-container":"0.3.7","detectors/node/opentelemetry-resource-detector-gcp":"0.29.7","detectors/node/opentelemetry-resource-detector-github":"0.28.1","detectors/node/opentelemetry-resource-detector-instana":"0.7.0","metapackages/auto-instrumentations-node":"0.43.0","metapackages/auto-instrumentations-web":"0.37.0","packages/opentelemetry-host-metrics":"0.35.0","packages/opentelemetry-id-generator-aws-xray":"1.2.1","packages/opentelemetry-propagation-utils":"0.30.7","packages/opentelemetry-redis-common":"0.36.1","packages/opentelemetry-sql-common":"0.40.0","packages/opentelemetry-test-utils":"0.37.0","packages/winston-transport": "0.1.0","plugins/node/instrumentation-amqplib":"0.35.0","plugins/node/instrumentation-cucumber":"0.4.0","plugins/node/instrumentation-dataloader":"0.7.0","plugins/node/instrumentation-fs":"0.10.0","plugins/node/instrumentation-lru-memoizer":"0.35.0","plugins/node/instrumentation-mongoose":"0.36.0","plugins/node/instrumentation-runtime-node":"0.2.1","plugins/node/instrumentation-socket.io":"0.37.0","plugins/node/instrumentation-tedious":"0.8.0","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.39.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.39.1","plugins/node/opentelemetry-instrumentation-bunyan":"0.36.0","plugins/node/opentelemetry-instrumentation-cassandra":"0.36.0","plugins/node/opentelemetry-instrumentation-connect":"0.34.0","plugins/node/opentelemetry-instrumentation-dns":"0.34.0","plugins/node/opentelemetry-instrumentation-express":"0.36.1","plugins/node/opentelemetry-instrumentation-fastify":"0.34.0","plugins/node/opentelemetry-instrumentation-generic-pool":"0.34.0","plugins/node/opentelemetry-instrumentation-graphql":"0.38.1","plugins/node/opentelemetry-instrumentation-hapi":"0.35.0","plugins/node/opentelemetry-instrumentation-ioredis":"0.38.0","plugins/node/opentelemetry-instrumentation-knex":"0.34.0","plugins/node/opentelemetry-instrumentation-koa":"0.38.0","plugins/node/opentelemetry-instrumentation-memcached":"0.34.0","plugins/node/opentelemetry-instrumentation-mongodb":"0.41.0","plugins/node/opentelemetry-instrumentation-mysql":"0.36.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.36.0","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.35.0","plugins/node/opentelemetry-instrumentation-net":"0.34.0","plugins/node/opentelemetry-instrumentation-pg":"0.39.1","plugins/node/opentelemetry-instrumentation-pino":"0.36.0","plugins/node/opentelemetry-instrumentation-redis":"0.37.0","plugins/node/opentelemetry-instrumentation-redis-4":"0.37.0","plugins/node/opentelemetry-instrumentation-restify":"0.36.0","plugins/node/opentelemetry-instrumentation-router":"0.35.0","plugins/node/opentelemetry-instrumentation-winston":"0.35.0","plugins/web/opentelemetry-instrumentation-document-load":"0.36.0","plugins/web/opentelemetry-instrumentation-long-task":"0.36.0","plugins/web/opentelemetry-instrumentation-user-interaction":"0.36.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.8",
+  "detectors/node/opentelemetry-resource-detector-aws": "1.4.1",
+  "detectors/node/opentelemetry-resource-detector-azure": "0.2.6",
+  "detectors/node/opentelemetry-resource-detector-container": "0.3.8",
+  "detectors/node/opentelemetry-resource-detector-gcp": "0.29.8",
+  "detectors/node/opentelemetry-resource-detector-github": "0.28.1",
+  "detectors/node/opentelemetry-resource-detector-instana": "0.8.0",
+  "metapackages/auto-instrumentations-node": "0.44.0",
+  "metapackages/auto-instrumentations-web": "0.38.0",
+  "packages/opentelemetry-host-metrics": "0.35.0",
+  "packages/opentelemetry-id-generator-aws-xray": "1.2.1",
+  "packages/opentelemetry-propagation-utils": "0.30.8",
+  "packages/opentelemetry-redis-common": "0.36.1",
+  "packages/opentelemetry-sql-common": "0.40.0",
+  "packages/opentelemetry-test-utils": "0.38.0",
+  "packages/winston-transport": "0.2.0",
+  "plugins/node/instrumentation-amqplib": "0.36.0",
+  "plugins/node/instrumentation-cucumber": "0.5.0",
+  "plugins/node/instrumentation-dataloader": "0.8.0",
+  "plugins/node/instrumentation-fs": "0.11.0",
+  "plugins/node/instrumentation-lru-memoizer": "0.36.0",
+  "plugins/node/instrumentation-mongoose": "0.37.0",
+  "plugins/node/instrumentation-runtime-node": "0.3.0",
+  "plugins/node/instrumentation-socket.io": "0.38.0",
+  "plugins/node/instrumentation-tedious": "0.9.0",
+  "plugins/node/instrumentation-undici": "0.1.0",
+  "plugins/node/opentelemetry-instrumentation-aws-lambda": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-aws-sdk": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-bunyan": "0.37.0",
+  "plugins/node/opentelemetry-instrumentation-cassandra": "0.37.0",
+  "plugins/node/opentelemetry-instrumentation-connect": "0.35.0",
+  "plugins/node/opentelemetry-instrumentation-dns": "0.35.0",
+  "plugins/node/opentelemetry-instrumentation-express": "0.37.0",
+  "plugins/node/opentelemetry-instrumentation-fastify": "0.35.0",
+  "plugins/node/opentelemetry-instrumentation-generic-pool": "0.35.0",
+  "plugins/node/opentelemetry-instrumentation-graphql": "0.39.0",
+  "plugins/node/opentelemetry-instrumentation-hapi": "0.36.0",
+  "plugins/node/opentelemetry-instrumentation-ioredis": "0.39.0",
+  "plugins/node/opentelemetry-instrumentation-knex": "0.35.0",
+  "plugins/node/opentelemetry-instrumentation-koa": "0.39.0",
+  "plugins/node/opentelemetry-instrumentation-memcached": "0.35.0",
+  "plugins/node/opentelemetry-instrumentation-mongodb": "0.42.0",
+  "plugins/node/opentelemetry-instrumentation-mysql": "0.37.0",
+  "plugins/node/opentelemetry-instrumentation-mysql2": "0.37.0",
+  "plugins/node/opentelemetry-instrumentation-nestjs-core": "0.36.0",
+  "plugins/node/opentelemetry-instrumentation-net": "0.35.0",
+  "plugins/node/opentelemetry-instrumentation-pg": "0.40.0",
+  "plugins/node/opentelemetry-instrumentation-pino": "0.37.0",
+  "plugins/node/opentelemetry-instrumentation-redis": "0.38.0",
+  "plugins/node/opentelemetry-instrumentation-redis-4": "0.38.0",
+  "plugins/node/opentelemetry-instrumentation-restify": "0.37.0",
+  "plugins/node/opentelemetry-instrumentation-router": "0.36.0",
+  "plugins/node/opentelemetry-instrumentation-winston": "0.36.0",
+  "plugins/web/opentelemetry-instrumentation-document-load": "0.37.0",
+  "plugins/web/opentelemetry-instrumentation-long-task": "0.37.0",
+  "plugins/web/opentelemetry-instrumentation-user-interaction": "0.37.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"
+}
diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md
@@ -72,6 +72,15 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.36.0 to ^0.37.0
 
+## [0.28.8](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.7...resource-detector-alibaba-cloud-v0.28.8) (2024-04-03)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.37.0 to ^0.38.0
+
 ## [0.28.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.28.0...resource-detector-alibaba-cloud-v0.28.1) (2023-08-14)
 
 

diff --git a/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json b/detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-alibaba-cloud",
-  "version": "0.28.7",
+  "version": "0.28.8",
   "description": "OpenTelemetry resource detector for Alibaba Cloud",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -40,7 +40,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.37.0",
+    "@opentelemetry/contrib-test-utils": "^0.38.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.18",

diff --git a/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md
@@ -66,6 +66,15 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.35.1 to ^0.36.0
 
+## [1.4.1](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.4.0...resource-detector-aws-v1.4.1) (2024-04-03)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.37.0 to ^0.38.0
+
 ## [1.4.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-aws-v1.3.6...resource-detector-aws-v1.4.0) (2024-03-06)
 
 

diff --git a/detectors/node/opentelemetry-resource-detector-aws/README.md b/detectors/node/opentelemetry-resource-detector-aws/README.md
@@ -33,13 +33,84 @@ const tracerProvider = new NodeTracerProvider({ resource });
 
 ## Available detectors
 
-- `awsBeanstalkDetector`: Populates `service` for processes running on [AWS Elastic Beanstalk](https://aws.amazon.com/elasticbeanstalk/)
-- `awsEc2Detector`: Populates `cloud` and `host` for processes running on [Amazon EC2](https://aws.amazon.com/ec2/), including abstractions such as ECS on EC2. Notably, it does not populate anything on AWS Fargate
-- `awsEcsDetector`: Populates `container` for containers running on [Amazon ECS](https://aws.amazon.com/ecs/)
-- `awsEksDetector`: Populates `container` and `k8s.cluster_name` for containers running on [Amazon EKS](https://aws.amazon.com/eks/)
-  - `k8s.cluster_name` is not always available depending on the configuration of CloudWatch monitoring for the EKS cluster
-- `awsLambdaDetector`: Populates `faas` and `cloud` for functions running on [AWS Lambda](https://aws.amazon.com/lambda/)
-  - `faas.id` is currently not populated as it is not provided by the runtime at startup
+This package uses `@opentelemetry/semantic-conventions` version `1.22+`, which implements Semantic Convention [Version 1.7.0](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.7.0/semantic_conventions/README.md)
+
+### AWS Beanstalk Detector
+
+Populates `service` for processes running on [AWS Elastic Beanstalk](https://aws.amazon.com/elasticbeanstalk/)
+
+| Resource Attribute  | Description                                                              |
+|---------------------|--------------------------------------------------------------------------|
+| cloud.platform      | The cloud platform. In this context, it's always "aws_elastic_beanstalk" |
+| cloud.provider      | The cloud provider. In this context, it's always "aws"                   |
+| service.instance.id | Value of `deployment_id` from config file `environment.conf`             |
+| service.name        | The service name. In this context, it's always "aws_elastic_beanstalk"   |
+| service.namespace   | Value of `environment_name` from config file `environment.conf`          |
+| service.version     | Value of `version_label` from config file `environment.conf`             |
+
+### AWS EC2 Detector
+
+Populates `cloud` and `host` for processes running on [Amazon EC2](https://aws.amazon.com/ec2/), including abstractions such as ECS on EC2. Notably, it does not populate anything on AWS Fargate.
+
+| Resource Attribute      | Description                                                                           |
+|-------------------------|---------------------------------------------------------------------------------------|
+| cloud.account.id        | Value of `accountId` from `/latest/dynamic/instance-identity/document` request        |
+| cloud.availability_zone | Value of `availabilityZone` from `/latest/dynamic/instance-identity/document` request |
+| cloud.platform          | The cloud platform. In this context, it's always "aws_ec2"                            |
+| cloud.provider          | The cloud provider. In this context, it's always "aws"                                |
+| cloud.region            | Value of `region` from `/latest/dynamic/instance-identity/document` request           |
+| host.id                 | Value of `instanceId` from `/latest/dynamic/instance-identity/document` request       |
+| host.name               | Value of `hostname` from `/latest/dynamic/instance-identity/document` request         |
+| host.type               | Value of `instanceType` from `/latest/dynamic/instance-identity/document` request     |
+
+### AWS ECS Detector
+
+Populates `container` for containers running on [Amazon ECS](https://aws.amazon.com/ecs/).
+
+| Resource Attribute      | Description                                                                            |
+|-------------------------|----------------------------------------------------------------------------------------|
+| aws.ecs.container.arn   | Value of `ContainerARN` from the request to the metadata Uri. The Metadata Uri is stored on the Environment Variable `ECS_CONTAINER_METADATA_URI_V4`  |
+| aws.ecs.cluster.arn     | Value in the format `${baseArn}:cluster/${cluster}`, with `baseArn` and `cluster` from a `ECS_CONTAINER_METADATA_URI_V4/task` request, with values from `TaskARN` and `Cluster` respectively |
+| aws.ecs.launchtype      | Value of `LaunchType` from `ECS_CONTAINER_METADATA_URI_V4/task` request                |
+| aws.ecs.task.arn        | Value of `TaskARN` from `ECS_CONTAINER_METADATA_URI_V4/task` request                   |
+| aws.ecs.task.family     | Value of `Family` from `ECS_CONTAINER_METADATA_URI_V4/task` request                    |
+| aws.ecs.task.revision   | Value of `Revision` from `ECS_CONTAINER_METADATA_URI_V4/task` request                  |
+| aws.log.group.arns      | Value on format `arn:aws:logs:${logsRegion}:${awsAccount}:log-group:${logsGroupName}`, with `logsRegions` and `logsGroupName` from logs metadata, values of `awslogs-region` and `awslogs-group` respectively, and `awsAccount` parsed value from the `TaskARN`. Logs metadata values come from `LogOptions` on `ECS_CONTAINER_METADATA_URI_V4` request |
+| aws.log.group.names     | Value of `awslogs-group` from logs metadata. Logs metadata values come from `LogOptions` on `ECS_CONTAINER_METADATA_URI_V4` request |
+| aws.log.stream.arns     | Value on format `arn:aws:logs:${logsRegion}:${awsAccount}:log-group:${logsGroupName}:log-stream:${logsStreamName}`, with `logsRegions`, `logsGroupName` and `logsStreamName` from logs metadata, values of `awslogs-region`, `awslogs-group` and `awslogs-stream` respectively, and `awsAccount` parsed value from the `TaskARN` |
+| aws.log.stream.names    | Value of `awslogs-stream` from logs metadata |
+| cloud.account.id        | Parsed value from the `TaskARN` |
+| cloud.availability_zone | Value of `AvailabilityZone` from `ECS_CONTAINER_METADATA_URI_V4/task` request. This value is not available in all Fargate runtimes |
+| cloud.platform          | The cloud platform. In this context, it's always "aws_ecs"                             |
+| cloud.provider          | The cloud provider. In this context, it's always "aws"                                 |
+| cloud.region            | Parsed value from the `TaskARN`                                                        |
+| container.id            | Value of from file `/proc/self/cgroup`                                                 |
+| container.name          | The hostname of the operating system                                                   |
+
+### AWS EKS Detector
+
+Populates `container` and `k8s.cluster_name` for containers running on [Amazon EKS](https://aws.amazon.com/eks/).
+`k8s.cluster_name` is not always available depending on the configuration of CloudWatch monitoring for the EKS cluster.
+
+| Resource Attribute | Description                                                                                         |
+|--------------------|-----------------------------------------------------------------------------------------------------|
+| cloud.platform     | The cloud platform. In this context, it's always "aws_eks"                                          |
+| cloud.provider     | The cloud provider. In this context, it's always "aws"                                              |
+| container.id       | Value from config file `/proc/self/cgroup`                                                          |
+| k8s.cluster.name   | Value of `cluster.name` from `/api/v1/namespaces/amazon-cloudwatch/configmaps/cluster-info` request |
+
+### AWS Lambda Detector
+
+Populates `faas` and `cloud` for functions running on [AWS Lambda](https://aws.amazon.com/lambda/).
+`faas.id` is currently not populated as it is not provided by the runtime at startup.
+
+| Resource Attribute | Description                                                         |
+|--------------------|---------------------------------------------------------------------|
+| cloud.platform     | The cloud platform. In this context, it's always "aws_lambda"       |
+| cloud.provider     | The cloud provider. In this context, it's always "aws"              |
+| cloud.region       | Value of Process Environment Variable `AWS_REGION`                  |
+| faas.name          | Value of Process Environment Variable `AWS_LAMBDA_FUNCTION_NAME`    |
+| faas.version       | Value of Process Environment Variable `AWS_LAMBDA_FUNCTION_VERSION` |
 
 ## Useful links
 

diff --git a/detectors/node/opentelemetry-resource-detector-aws/package.json b/detectors/node/opentelemetry-resource-detector-aws/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@opentelemetry/resource-detector-aws",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "OpenTelemetry SDK resource detector for AWS",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",
@@ -39,7 +39,7 @@
   },
   "devDependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/contrib-test-utils": "^0.37.0",
+    "@opentelemetry/contrib-test-utils": "^0.38.0",
     "@types/mocha": "8.2.3",
     "@types/node": "18.6.5",
     "@types/sinon": "10.0.18",

diff --git a/detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md b/detectors/node/opentelemetry-resource-detector-azure/CHANGELOG.md
@@ -12,6 +12,15 @@
   * devDependencies
     * @opentelemetry/contrib-test-utils bumped from ^0.36.0 to ^0.37.0
 
+## [0.2.6](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.5...resource-detector-azure-v0.2.6) (2024-04-03)
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * devDependencies
+    * @opentelemetry/contrib-test-utils bumped from ^0.37.0 to ^0.38.0
+
 ## [0.2.3](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-azure-v0.2.2...resource-detector-azure-v0.2.3) (2024-01-04)