Skip to content

Commit b2d8b15

Browse files
trentmtrentm
authored
Merge branch 'main' into doc-github
2 parents bf595ec + 88514d9 commit b2d8b15

File tree

155 files changed

+5390
-1209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+5390
-1209
lines changed

‎.github/component_owners.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ components:
123123
- rauno56
124124
plugins/node/opentelemetry-instrumentation-router:
125125
- rauno56
126+
plugins/node/opentelemetry-instrumentation-undici:
127+
- david-luna
128+
- trentm
126129
plugins/node/opentelemetry-instrumentation-winston:
127130
- seemk
128131
plugins/web/opentelemetry-instrumentation-document-load:

‎.release-please-manifest.json

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,63 @@
1-
{"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"}
1+
{
2+
"detectors/node/opentelemetry-resource-detector-alibaba-cloud": "0.28.8",
3+
"detectors/node/opentelemetry-resource-detector-aws": "1.4.1",
4+
"detectors/node/opentelemetry-resource-detector-azure": "0.2.6",
5+
"detectors/node/opentelemetry-resource-detector-container": "0.3.8",
6+
"detectors/node/opentelemetry-resource-detector-gcp": "0.29.8",
7+
"detectors/node/opentelemetry-resource-detector-github": "0.28.1",
8+
"detectors/node/opentelemetry-resource-detector-instana": "0.8.0",
9+
"metapackages/auto-instrumentations-node": "0.44.0",
10+
"metapackages/auto-instrumentations-web": "0.38.0",
11+
"packages/opentelemetry-host-metrics": "0.35.0",
12+
"packages/opentelemetry-id-generator-aws-xray": "1.2.1",
13+
"packages/opentelemetry-propagation-utils": "0.30.8",
14+
"packages/opentelemetry-redis-common": "0.36.1",
15+
"packages/opentelemetry-sql-common": "0.40.0",
16+
"packages/opentelemetry-test-utils": "0.38.0",
17+
"packages/winston-transport": "0.2.0",
18+
"plugins/node/instrumentation-amqplib": "0.36.0",
19+
"plugins/node/instrumentation-cucumber": "0.5.0",
20+
"plugins/node/instrumentation-dataloader": "0.8.0",
21+
"plugins/node/instrumentation-fs": "0.11.0",
22+
"plugins/node/instrumentation-lru-memoizer": "0.36.0",
23+
"plugins/node/instrumentation-mongoose": "0.37.0",
24+
"plugins/node/instrumentation-runtime-node": "0.3.0",
25+
"plugins/node/instrumentation-socket.io": "0.38.0",
26+
"plugins/node/instrumentation-tedious": "0.9.0",
27+
"plugins/node/instrumentation-undici": "0.1.0",
28+
"plugins/node/opentelemetry-instrumentation-aws-lambda": "0.40.0",
29+
"plugins/node/opentelemetry-instrumentation-aws-sdk": "0.40.0",
30+
"plugins/node/opentelemetry-instrumentation-bunyan": "0.37.0",
31+
"plugins/node/opentelemetry-instrumentation-cassandra": "0.37.0",
32+
"plugins/node/opentelemetry-instrumentation-connect": "0.35.0",
33+
"plugins/node/opentelemetry-instrumentation-dns": "0.35.0",
34+
"plugins/node/opentelemetry-instrumentation-express": "0.37.0",
35+
"plugins/node/opentelemetry-instrumentation-fastify": "0.35.0",
36+
"plugins/node/opentelemetry-instrumentation-generic-pool": "0.35.0",
37+
"plugins/node/opentelemetry-instrumentation-graphql": "0.39.0",
38+
"plugins/node/opentelemetry-instrumentation-hapi": "0.36.0",
39+
"plugins/node/opentelemetry-instrumentation-ioredis": "0.39.0",
40+
"plugins/node/opentelemetry-instrumentation-knex": "0.35.0",
41+
"plugins/node/opentelemetry-instrumentation-koa": "0.39.0",
42+
"plugins/node/opentelemetry-instrumentation-memcached": "0.35.0",
43+
"plugins/node/opentelemetry-instrumentation-mongodb": "0.42.0",
44+
"plugins/node/opentelemetry-instrumentation-mysql": "0.37.0",
45+
"plugins/node/opentelemetry-instrumentation-mysql2": "0.37.0",
46+
"plugins/node/opentelemetry-instrumentation-nestjs-core": "0.36.0",
47+
"plugins/node/opentelemetry-instrumentation-net": "0.35.0",
48+
"plugins/node/opentelemetry-instrumentation-pg": "0.40.0",
49+
"plugins/node/opentelemetry-instrumentation-pino": "0.37.0",
50+
"plugins/node/opentelemetry-instrumentation-redis": "0.38.0",
51+
"plugins/node/opentelemetry-instrumentation-redis-4": "0.38.0",
52+
"plugins/node/opentelemetry-instrumentation-restify": "0.37.0",
53+
"plugins/node/opentelemetry-instrumentation-router": "0.36.0",
54+
"plugins/node/opentelemetry-instrumentation-winston": "0.36.0",
55+
"plugins/web/opentelemetry-instrumentation-document-load": "0.37.0",
56+
"plugins/web/opentelemetry-instrumentation-long-task": "0.37.0",
57+
"plugins/web/opentelemetry-instrumentation-user-interaction": "0.37.0",
58+
"plugins/web/opentelemetry-plugin-react-load": "0.30.0",
59+
"propagators/opentelemetry-propagator-aws-xray": "1.3.1",
60+
"propagators/opentelemetry-propagator-grpc-census-binary": "0.27.1",
61+
"propagators/opentelemetry-propagator-instana": "0.3.1",
62+
"propagators/opentelemetry-propagator-ot-trace": "0.27.1"
63+
}

‎detectors/node/opentelemetry-resource-detector-alibaba-cloud/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,15 @@
7272
* devDependencies
7373
* @opentelemetry/contrib-test-utils bumped from ^0.36.0 to ^0.37.0
7474

75+
## [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)
76+
77+
78+
### Dependencies
79+
80+
* The following workspace dependencies were updated
81+
* devDependencies
82+
* @opentelemetry/contrib-test-utils bumped from ^0.37.0 to ^0.38.0
83+
7584
## [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)
7685

7786

‎detectors/node/opentelemetry-resource-detector-alibaba-cloud/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-alibaba-cloud",
3-
"version": "0.28.7",
3+
"version": "0.28.8",
44
"description": "OpenTelemetry resource detector for Alibaba Cloud",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -40,7 +40,7 @@
4040
},
4141
"devDependencies": {
4242
"@opentelemetry/api": "^1.0.0",
43-
"@opentelemetry/contrib-test-utils": "^0.37.0",
43+
"@opentelemetry/contrib-test-utils": "^0.38.0",
4444
"@types/mocha": "8.2.3",
4545
"@types/node": "18.6.5",
4646
"@types/sinon": "10.0.18",

‎detectors/node/opentelemetry-resource-detector-aws/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,15 @@
6666
* devDependencies
6767
* @opentelemetry/contrib-test-utils bumped from ^0.35.1 to ^0.36.0
6868

69+
## [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)
70+
71+
72+
### Dependencies
73+
74+
* The following workspace dependencies were updated
75+
* devDependencies
76+
* @opentelemetry/contrib-test-utils bumped from ^0.37.0 to ^0.38.0
77+
6978
## [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)
7079

7180

‎detectors/node/opentelemetry-resource-detector-aws/README.md

Lines changed: 78 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,84 @@ const tracerProvider = new NodeTracerProvider({ resource });
3333

3434
## Available detectors
3535

36-
- `awsBeanstalkDetector`: Populates `service` for processes running on [AWS Elastic Beanstalk](https://aws.amazon.com/elasticbeanstalk/)
37-
- `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
38-
- `awsEcsDetector`: Populates `container` for containers running on [Amazon ECS](https://aws.amazon.com/ecs/)
39-
- `awsEksDetector`: Populates `container` and `k8s.cluster_name` for containers running on [Amazon EKS](https://aws.amazon.com/eks/)
40-
- `k8s.cluster_name` is not always available depending on the configuration of CloudWatch monitoring for the EKS cluster
41-
- `awsLambdaDetector`: Populates `faas` and `cloud` for functions running on [AWS Lambda](https://aws.amazon.com/lambda/)
42-
- `faas.id` is currently not populated as it is not provided by the runtime at startup
36+
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)
37+
38+
### AWS Beanstalk Detector
39+
40+
Populates `service` for processes running on [AWS Elastic Beanstalk](https://aws.amazon.com/elasticbeanstalk/)
41+
42+
| Resource Attribute | Description |
43+
|---------------------|--------------------------------------------------------------------------|
44+
| cloud.platform | The cloud platform. In this context, it's always "aws_elastic_beanstalk" |
45+
| cloud.provider | The cloud provider. In this context, it's always "aws" |
46+
| service.instance.id | Value of `deployment_id` from config file `environment.conf` |
47+
| service.name | The service name. In this context, it's always "aws_elastic_beanstalk" |
48+
| service.namespace | Value of `environment_name` from config file `environment.conf` |
49+
| service.version | Value of `version_label` from config file `environment.conf` |
50+
51+
### AWS EC2 Detector
52+
53+
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.
54+
55+
| Resource Attribute | Description |
56+
|-------------------------|---------------------------------------------------------------------------------------|
57+
| cloud.account.id | Value of `accountId` from `/latest/dynamic/instance-identity/document` request |
58+
| cloud.availability_zone | Value of `availabilityZone` from `/latest/dynamic/instance-identity/document` request |
59+
| cloud.platform | The cloud platform. In this context, it's always "aws_ec2" |
60+
| cloud.provider | The cloud provider. In this context, it's always "aws" |
61+
| cloud.region | Value of `region` from `/latest/dynamic/instance-identity/document` request |
62+
| host.id | Value of `instanceId` from `/latest/dynamic/instance-identity/document` request |
63+
| host.name | Value of `hostname` from `/latest/dynamic/instance-identity/document` request |
64+
| host.type | Value of `instanceType` from `/latest/dynamic/instance-identity/document` request |
65+
66+
### AWS ECS Detector
67+
68+
Populates `container` for containers running on [Amazon ECS](https://aws.amazon.com/ecs/).
69+
70+
| Resource Attribute | Description |
71+
|-------------------------|----------------------------------------------------------------------------------------|
72+
| 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` |
73+
| 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 |
74+
| aws.ecs.launchtype | Value of `LaunchType` from `ECS_CONTAINER_METADATA_URI_V4/task` request |
75+
| aws.ecs.task.arn | Value of `TaskARN` from `ECS_CONTAINER_METADATA_URI_V4/task` request |
76+
| aws.ecs.task.family | Value of `Family` from `ECS_CONTAINER_METADATA_URI_V4/task` request |
77+
| aws.ecs.task.revision | Value of `Revision` from `ECS_CONTAINER_METADATA_URI_V4/task` request |
78+
| 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 |
79+
| aws.log.group.names | Value of `awslogs-group` from logs metadata. Logs metadata values come from `LogOptions` on `ECS_CONTAINER_METADATA_URI_V4` request |
80+
| 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` |
81+
| aws.log.stream.names | Value of `awslogs-stream` from logs metadata |
82+
| cloud.account.id | Parsed value from the `TaskARN` |
83+
| cloud.availability_zone | Value of `AvailabilityZone` from `ECS_CONTAINER_METADATA_URI_V4/task` request. This value is not available in all Fargate runtimes |
84+
| cloud.platform | The cloud platform. In this context, it's always "aws_ecs" |
85+
| cloud.provider | The cloud provider. In this context, it's always "aws" |
86+
| cloud.region | Parsed value from the `TaskARN` |
87+
| container.id | Value of from file `/proc/self/cgroup` |
88+
| container.name | The hostname of the operating system |
89+
90+
### AWS EKS Detector
91+
92+
Populates `container` and `k8s.cluster_name` for containers running on [Amazon EKS](https://aws.amazon.com/eks/).
93+
`k8s.cluster_name` is not always available depending on the configuration of CloudWatch monitoring for the EKS cluster.
94+
95+
| Resource Attribute | Description |
96+
|--------------------|-----------------------------------------------------------------------------------------------------|
97+
| cloud.platform | The cloud platform. In this context, it's always "aws_eks" |
98+
| cloud.provider | The cloud provider. In this context, it's always "aws" |
99+
| container.id | Value from config file `/proc/self/cgroup` |
100+
| k8s.cluster.name | Value of `cluster.name` from `/api/v1/namespaces/amazon-cloudwatch/configmaps/cluster-info` request |
101+
102+
### AWS Lambda Detector
103+
104+
Populates `faas` and `cloud` for functions running on [AWS Lambda](https://aws.amazon.com/lambda/).
105+
`faas.id` is currently not populated as it is not provided by the runtime at startup.
106+
107+
| Resource Attribute | Description |
108+
|--------------------|---------------------------------------------------------------------|
109+
| cloud.platform | The cloud platform. In this context, it's always "aws_lambda" |
110+
| cloud.provider | The cloud provider. In this context, it's always "aws" |
111+
| cloud.region | Value of Process Environment Variable `AWS_REGION` |
112+
| faas.name | Value of Process Environment Variable `AWS_LAMBDA_FUNCTION_NAME` |
113+
| faas.version | Value of Process Environment Variable `AWS_LAMBDA_FUNCTION_VERSION` |
43114

44115
## Useful links
45116

‎detectors/node/opentelemetry-resource-detector-aws/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@opentelemetry/resource-detector-aws",
3-
"version": "1.4.0",
3+
"version": "1.4.1",
44
"description": "OpenTelemetry SDK resource detector for AWS",
55
"main": "build/src/index.js",
66
"types": "build/src/index.d.ts",
@@ -39,7 +39,7 @@
3939
},
4040
"devDependencies": {
4141
"@opentelemetry/api": "^1.0.0",
42-
"@opentelemetry/contrib-test-utils": "^0.37.0",
42+
"@opentelemetry/contrib-test-utils": "^0.38.0",
4343
"@types/mocha": "8.2.3",
4444
"@types/node": "18.6.5",
4545
"@types/sinon": "10.0.18",
@@ -57,7 +57,7 @@
5757
"dependencies": {
5858
"@opentelemetry/core": "^1.0.0",
5959
"@opentelemetry/resources": "^1.0.0",
60-
"@opentelemetry/semantic-conventions": "^1.0.0"
60+
"@opentelemetry/semantic-conventions": "^1.22.0"
6161
},
6262
"homepage": "https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/detectors/node/opentelemetry-resource-detector-aws#readme"
6363
}

0 commit comments

Comments
 (0)