Skip to content

Commit

Permalink
Merge pull request open-telemetry#121 from opentelemetrybot/opentelem…
Browse files Browse the repository at this point in the history
…etrybot/merge-main

[AutoMerge][Main] Merging staged change(s) to main
  • Loading branch information
MSNev committed Jun 6, 2023
2 parents be520d3 + 717b5be commit 7c14634
Show file tree
Hide file tree
Showing 385 changed files with 17,629 additions and 17,272 deletions.
76 changes: 64 additions & 12 deletions auto-merge/contrib/.github/component_owners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,17 @@ components:
- legendecas
detectors/node/opentelemetry-resource-detector-aws:
- carolabadeer
detectors/node/opentelemetry-resource-detector-docker:
detectors/node/opentelemetry-resource-detector-container:
- abhee11
detectors/node/opentelemetry-resource-detector-gcp:
- aabmass
- punya
# Unmaintained?
detectors/node/opentelemetry-resource-detector-github: []
# Unmaintained?
detectors/node/opentelemetry-resource-detector-instana:
- basti1302
- kirrg001
metapackages/auto-instrumentations-node:
- obecny
metapackages/auto-instrumentations-web:
Expand All @@ -14,67 +23,110 @@ components:
- legendecas
packages/opentelemetry-id-generator-aws-xray:
- carolabadeer
packages/opentelemetry-sampler-aws-xray:
- carolabadeer
packages/opentelemetry-propagation-utils:
- dyladan
- pichlermarc
- legendecas
- blumamir
packages/opentelemetry-redis-common:
- haddasbronfman
packages/opentelemetry-test-utils:
- dyladan
- pichlermarc
- legendecas
- blumamir
plugins/node/instrumentation-amqplib:
- blumamir
plugins/node/instrumentation-dataloader:
- henrinormak
plugins/node/instrumentation-fs:
- rauno56
plugins/node/instrumentation-lru-memoizer:
- blumamir
plugins/node/instrumentation-mongoose:
- blumamir
plugins/node/instrumentation-socket.io:
- mottibec
- rauno56
plugins/node/instrumentation-tedious:
- rauno56
plugins/node/opentelemetry-instrumentation-aws-lambda:
- carolabadeer
plugins/node/opentelemetry-instrumentation-aws-sdk:
- carolabadeer
- blumamir
plugins/node/opentelemetry-instrumentation-bunyan:
- seemk
plugins/node/opentelemetry-instrumentation-cassandra:
- seemk
plugins/node/opentelemetry-instrumentation-connect: []
# Unmaintained?
plugins/node/opentelemetry-instrumentation-dns: []
# Unmaintained?
plugins/node/opentelemetry-instrumentation-express:
- JamieDanielson
- pkanal
plugins/node/opentelemetry-instrumentation-fastify: []
# Unmaintained?
plugins/node/opentelemetry-instrumentation-generic-pool:
- rauno56
plugins/node/opentelemetry-instrumentation-graphql:
- obecny
plugins/node/opentelemetry-instrumentation-hapi: []
# Unmaintained?
plugins/node/opentelemetry-instrumentation-ioredis:
- blumamir
- naseemkullah
plugins/node/opentelemetry-instrumentation-knex:
- rauno56
plugins/node/opentelemetry-instrumentation-lru-memoizer:
- blumamir
plugins/node/opentelemetry-instrumentation-koa: []
# Unmaintained?
plugins/node/opentelemetry-instrumentation-memcached:
- rauno56
plugins/node/opentelemetry-instrumentation-mongodb:
- osherv
plugins/node/opentelemetry-instrumentation-mongoose:
- blumamir
plugins/node/opentelemetry-instrumentation-mysql:
- haddasbronfman
plugins/node/opentelemetry-instrumentation-mysql2:
- haddasbronfman
plugins/node/opentelemetry-instrumentation-nestjs-core:
- rauno56
plugins/node/opentelemetry-instrumentation-redis:
- blumamir
plugins/node/opentelemetry-instrumentation-net:
- seemk
plugins/node/opentelemetry-instrumentation-pg:
- rauno56
plugins/node/opentelemetry-instrumentation-pino:
- seemk
plugins/node/opentelemetry-instrumentation-redis-4:
- blumamir
plugins/node/opentelemetry-instrumentation-redis:
- blumamir
plugins/node/opentelemetry-instrumentation-restify:
- rauno56
plugins/node/opentelemetry-instrumentation-router:
- rauno56
plugins/node/opentelemetry-instrumentation-pg:
- rauno56
plugins/node/opentelemetry-instrumentation-socket.io:
- mottibec
- rauno56
plugins/node/opentelemetry-instrumentation-winston:
- seemk
plugins/web/opentelemetry-instrumentation-document-load:
- obecny
plugins/web/opentelemetry-instrumentation-long-task:
- mhennoch
- t2t2
plugins/web/opentelemetry-instrumentation-user-interaction:
- obecny
plugins/web/opentelemetry-plugin-react-load: []
# Unmaintained?
propagators/opentelemetry-propagator-aws-xray:
- carolabadeer
propagators/opentelemetry-propagator-grpc-census-binary: []
# Unmaintained?
propagators/opentelemetry-propagator-instana:
- basti1302
- kirrg001
propagators/opentelemetry-propagator-ot-trace: []
# Unmaintained?

ignored-authors:
- renovate-bot
2 changes: 1 addition & 1 deletion auto-merge/contrib/.github/workflows/close-stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v7
- uses: actions/stale@v8
with:
days-before-stale: 60
days-before-close: 14
Expand Down
2 changes: 1 addition & 1 deletion auto-merge/contrib/.release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.4","detectors/node/opentelemetry-resource-detector-aws":"1.2.2","detectors/node/opentelemetry-resource-detector-container":"0.2.2","detectors/node/opentelemetry-resource-detector-gcp":"0.28.0","detectors/node/opentelemetry-resource-detector-github":"0.27.0","detectors/node/opentelemetry-resource-detector-instana":"0.4.1","metapackages/auto-instrumentations-node":"0.36.5","metapackages/auto-instrumentations-web":"0.32.0","packages/opentelemetry-host-metrics":"0.32.0","packages/opentelemetry-id-generator-aws-xray":"1.1.1","packages/opentelemetry-propagation-utils":"0.29.2","packages/opentelemetry-redis-common":"0.35.0","packages/opentelemetry-test-utils":"0.33.1","plugins/node/instrumentation-amqplib":"0.32.2","plugins/node/instrumentation-dataloader":"0.4.0","plugins/node/instrumentation-fs":"0.7.1","plugins/node/instrumentation-lru-memoizer":"0.32.1","plugins/node/instrumentation-mongoose":"0.32.1","plugins/node/instrumentation-socket.io":"0.33.1","plugins/node/instrumentation-tedious":"0.5.1","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.35.0","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.34.0","plugins/node/opentelemetry-instrumentation-bunyan":"0.31.1","plugins/node/opentelemetry-instrumentation-cassandra":"0.32.1","plugins/node/opentelemetry-instrumentation-connect":"0.31.1","plugins/node/opentelemetry-instrumentation-dns":"0.31.2","plugins/node/opentelemetry-instrumentation-express":"0.32.1","plugins/node/opentelemetry-instrumentation-fastify":"0.31.1","plugins/node/opentelemetry-instrumentation-generic-pool":"0.31.1","plugins/node/opentelemetry-instrumentation-graphql":"0.34.0","plugins/node/opentelemetry-instrumentation-hapi":"0.31.1","plugins/node/opentelemetry-instrumentation-ioredis":"0.34.0","plugins/node/opentelemetry-instrumentation-knex":"0.31.1","plugins/node/opentelemetry-instrumentation-koa":"0.34.3","plugins/node/opentelemetry-instrumentation-memcached":"0.31.1","plugins/node/opentelemetry-instrumentation-mongodb":"0.34.1","plugins/node/opentelemetry-instrumentation-mysql":"0.33.0","plugins/node/opentelemetry-instrumentation-mysql2":"0.33.1","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.32.2","plugins/node/opentelemetry-instrumentation-net":"0.31.1","plugins/node/opentelemetry-instrumentation-pg":"0.35.0","plugins/node/opentelemetry-instrumentation-pino":"0.33.1","plugins/node/opentelemetry-instrumentation-redis":"0.34.4","plugins/node/opentelemetry-instrumentation-redis-4":"0.34.3","plugins/node/opentelemetry-instrumentation-restify":"0.32.1","plugins/node/opentelemetry-instrumentation-router":"0.32.1","plugins/node/opentelemetry-instrumentation-winston":"0.31.1","plugins/web/opentelemetry-instrumentation-document-load":"0.32.0","plugins/web/opentelemetry-instrumentation-long-task":"0.32.2","plugins/web/opentelemetry-instrumentation-user-interaction":"0.32.1","plugins/web/opentelemetry-plugin-react-load":"0.28.1","propagators/opentelemetry-propagator-aws-xray":"1.2.0","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.0","propagators/opentelemetry-propagator-instana":"0.2.1","propagators/opentelemetry-propagator-ot-trace":"0.26.2"}
{"detectors/node/opentelemetry-resource-detector-alibaba-cloud":"0.27.6","detectors/node/opentelemetry-resource-detector-aws":"1.2.4","detectors/node/opentelemetry-resource-detector-container":"0.2.4","detectors/node/opentelemetry-resource-detector-gcp":"0.28.2","detectors/node/opentelemetry-resource-detector-github":"0.27.1","detectors/node/opentelemetry-resource-detector-instana":"0.4.3","metapackages/auto-instrumentations-node":"0.37.0","metapackages/auto-instrumentations-web":"0.32.2","packages/opentelemetry-host-metrics":"0.32.2","packages/opentelemetry-id-generator-aws-xray":"1.1.2","packages/opentelemetry-propagation-utils":"0.29.4","packages/opentelemetry-redis-common":"0.35.1","packages/opentelemetry-test-utils":"0.33.3","plugins/node/instrumentation-amqplib":"0.32.4","plugins/node/instrumentation-dataloader":"0.4.2","plugins/node/instrumentation-fs":"0.7.3","plugins/node/instrumentation-lru-memoizer":"0.32.3","plugins/node/instrumentation-mongoose":"0.32.3","plugins/node/instrumentation-socket.io":"0.33.3","plugins/node/instrumentation-tedious":"0.5.3","plugins/node/opentelemetry-instrumentation-aws-lambda":"0.35.2","plugins/node/opentelemetry-instrumentation-aws-sdk":"0.34.2","plugins/node/opentelemetry-instrumentation-bunyan":"0.31.3","plugins/node/opentelemetry-instrumentation-cassandra":"0.32.3","plugins/node/opentelemetry-instrumentation-connect":"0.31.3","plugins/node/opentelemetry-instrumentation-dns":"0.31.4","plugins/node/opentelemetry-instrumentation-express":"0.32.3","plugins/node/opentelemetry-instrumentation-fastify":"0.31.3","plugins/node/opentelemetry-instrumentation-generic-pool":"0.31.3","plugins/node/opentelemetry-instrumentation-graphql":"0.34.2","plugins/node/opentelemetry-instrumentation-hapi":"0.31.3","plugins/node/opentelemetry-instrumentation-ioredis":"0.34.2","plugins/node/opentelemetry-instrumentation-knex":"0.31.3","plugins/node/opentelemetry-instrumentation-koa":"0.34.5","plugins/node/opentelemetry-instrumentation-memcached":"0.31.3","plugins/node/opentelemetry-instrumentation-mongodb":"0.34.3","plugins/node/opentelemetry-instrumentation-mysql":"0.33.2","plugins/node/opentelemetry-instrumentation-mysql2":"0.33.3","plugins/node/opentelemetry-instrumentation-nestjs-core":"0.32.4","plugins/node/opentelemetry-instrumentation-net":"0.31.3","plugins/node/opentelemetry-instrumentation-pg":"0.35.2","plugins/node/opentelemetry-instrumentation-pino":"0.33.3","plugins/node/opentelemetry-instrumentation-redis":"0.34.6","plugins/node/opentelemetry-instrumentation-redis-4":"0.34.5","plugins/node/opentelemetry-instrumentation-restify":"0.32.3","plugins/node/opentelemetry-instrumentation-router":"0.32.3","plugins/node/opentelemetry-instrumentation-winston":"0.31.3","plugins/web/opentelemetry-instrumentation-document-load":"0.32.2","plugins/web/opentelemetry-instrumentation-long-task":"0.32.4","plugins/web/opentelemetry-instrumentation-user-interaction":"0.32.3","plugins/web/opentelemetry-plugin-react-load":"0.28.2","propagators/opentelemetry-propagator-aws-xray":"1.2.1","propagators/opentelemetry-propagator-grpc-census-binary":"0.26.1","propagators/opentelemetry-propagator-instana":"0.2.2","propagators/opentelemetry-propagator-ot-trace":"0.26.3"}
82 changes: 82 additions & 0 deletions auto-merge/contrib/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,27 @@

We'd love your help!

- [Report a bug or requesting feature](#report-a-bug-or-requesting-feature)
- [How to contribute](#how-to-contribute)
- [Before you start](#before-you-start)
- [Conventional commit](#conventional-commit)
- [Fork](#fork)
- [Running the tests](#running-the-tests)
- [Generating API documentation](#generating-api-documentation)
- [Generating CHANGELOG documentation](#generating-changelog-documentation)
- [Benchmarks](#benchmarks)
- [Component Ownership](#component-ownership)
- [Component Lifecycle](#component-lifecycle)
- [Unreleased](#unreleased)
- [Experimental](#experimental)
- [Beta](#beta)
- [Stable](#stable)
- [Unmaintained](#unmaintained)
- [Deprecated](#deprecated)
- [Contributing Vendor Components](#contributing-vendor-components)
- [Adding a New Vendor Component](#adding-a-new-vendor-component)
- [Removing Vendor Components](#removing-vendor-components)

## Report a bug or requesting feature

Reporting bugs is an important contribution. Please make sure to include:
Expand Down Expand Up @@ -80,6 +101,67 @@ When two or more approaches must be compared, please write a benchmark in the be

- `npm run bench` to run your benchmark.

## Component Ownership

This repository contains many components which are maintained by more than the typical set of JS maintainers and approvers.
Each component in this repository SHOULD have a component owner who is responsible for maintaining it.
The README.md for each component SHOULD contain its owner, but the source of truth for component ownership is in [.github/component_owners.yml](.github/component_owners.yml).
Component owners are generally given authority to make decisions relating to implementation and feature requests for their components, provided they follow the best practices set out by the maintainers.
Component owners MUST do their best to maintain a high level of quality, security, performance, and specification compliance within their components.
Maintainers may override the decisions of component owners, but should only do so when they feel one or more of these traits is compromised.

## Component Lifecycle

This repository contains many components in various stages of the component lifecycle.
A component may be **unreleased**, **experimental**, **beta**, **stable**, **unmaintained**, or **deprecated**; see the below definitions for each stability level.
With the exception of the stable status, it is up to each individual [component owner](#component-ownership) to determine the status of a component.
A component may only be marked stable with the approval of a member of @open-telemetry/javascript-maintainers; see the definition of stable below for more details.

### Unreleased

Unreleased components are in active development and have not yet been released to NPM.
Unreleased packages should have the property `private` in their `package.json` set to `true`.

### Experimental

Experimental packages are in active development.
They should be considered unstable and potentially unsuitable for production use.
They are released to NPM for developers and early adopters.
Experimental components MUST have their major version set to `0`.
If a component does not have an explicit status in its README.md file, it should be considered to be experimental.

### Beta

Beta packages are not yet considered stable, but an effort should be made to preserve stability across versions if possible.
They may be ready for production use, but users should understand that their APIs or the telemetry they output MAY change if required.
Beta components MUST have their major version set to `0`.

### Stable

This is the highest level of quality and maintainership guarantee provided in this repository.
Stable packages should be considered stable and ready for production use.
In order for a package to be marked stable, it must meet the following requirements:

- It MUST have a component owner that the JS maintainers feel confident will be responsive to issues and pull requests and will fulfill their responsibility competently.
If a component owner is not responsive to issues and PRs, the maintainers may assign a new owner or change the status of the component to unmaintained.
- All relevant specification relating to the component MUST be stable. For example, telemetry emitted by an instrumentation library should rely on a stable semantic convention.
- It MUST be reviewed and approved by a member of @open-telemetry/javascript-maintainers.

Stable components MUST have their major version set to `1` or greater.

### Unmaintained

A component which does not have an assigned component owner, or has a component owner who has been unresponsive to issues and pull requests may be marked as unmaintained.
Unmaintained components may continue to work and receive updates and fixes from contributors, but may not receive immediate attention if there is a problem or feature request.
A component which is unmaintained may be deprecated if there is a problem that is not fixed in a timely manner.

### Deprecated

Deprecated components are no longer maintained and there are not currently plans to maintain them.
They may not work and there are no guarantees for fixes or new features.
Their source files may be deleted from the repository.
Any packages released from their source will be marked as deprecated in NPM.

## Contributing Vendor Components

This repo is generally meant for hosting components that work with popular open-source frameworks and tools. However, it is also possible to contribute components specific to a 3rd party vendor in this repo.
Expand Down
4 changes: 4 additions & 0 deletions auto-merge/contrib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ This project includes:

**Resource Detectors**: OpenTelemetry can collect resource attributes of the entity that producing telemetry. For example, a process producing telemetry that is running in a container on Kubernetes has a Pod name, it is in a namespace and possibly is part of a Deployment which also has a name. All three of these attributes can be included in the `Resource`.

## Stability levels

Stability level for components in this repository follow the definitions in [CONTRIBUTING.md](./CONTRIBUTING.md).

## Supported Runtimes

Packages in this repository have a variable range of support for Node.JS and browser versions which for each package depend on
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
"eslint-plugin-header": "3.1.1",
"eslint-plugin-import": "2.25.4",
"eslint-plugin-json5": "0.1.4",
"gts": "3.1.0",
"html-webpack-plugin": "5.3.2",
"jimp": "0.16.1",
"jsdom": "15.2.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,26 @@
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.33.0 to ^0.33.1

### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.33.1 to ^0.33.2

## [0.27.6](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.27.5...resource-detector-alibaba-cloud-v0.27.6) (2023-05-16)


### Bug Fixes

* **eslint-config:** replace gts with prettier and eslint ([#1439](https://github.com/open-telemetry/opentelemetry-js-contrib/issues/1439)) ([2571c37](https://github.com/open-telemetry/opentelemetry-js-contrib/commit/2571c371be1b5738442200cab2415b6a04c32aab))


### Dependencies

* The following workspace dependencies were updated
* devDependencies
* @opentelemetry/contrib-test-utils bumped from ^0.33.2 to ^0.33.3

## [0.27.0](https://github.com/open-telemetry/opentelemetry-js-contrib/compare/resource-detector-alibaba-cloud-v0.26.2...resource-detector-alibaba-cloud-v0.27.0) (2022-05-14)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opentelemetry/resource-detector-alibaba-cloud",
"version": "0.27.4",
"version": "0.27.6",
"description": "OpenTelemetry resource detector for Alibaba Cloud",
"main": "build/src/index.js",
"types": "build/src/index.d.ts",
Expand Down Expand Up @@ -43,15 +43,14 @@
},
"devDependencies": {
"@opentelemetry/api": "^1.0.0",
"@opentelemetry/contrib-test-utils": "^0.33.1",
"@opentelemetry/contrib-test-utils": "^0.33.3",
"@types/mocha": "8.2.3",
"@types/node": "18.11.7",
"@types/sinon": "10.0.2",
"gts": "3.1.0",
"mocha": "7.2.0",
"nock": "12.0.3",
"nyc": "15.1.0",
"rimraf": "4.2.0",
"rimraf": "5.0.0",
"sinon": "15.0.1",
"ts-mocha": "10.0.0",
"typescript": "4.4.4"
Expand Down
Loading

0 comments on commit 7c14634

Please sign in to comment.