From ce816172e77567c87aa216f7d72fe9385e14bd41 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 7 Aug 2024 13:00:02 +0200 Subject: [PATCH 1/6] [chore][CONTRIBUTING.md] Outline roles for moving contributors to emeritus --- CONTRIBUTING.md | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7eb68c3b5a95..b051b56e64ed 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -393,7 +393,13 @@ Example label comment: /label receiver/prometheus help-wanted -exporter/prometheus ``` -## Becoming a Code Owner +## Membership, Roles, and Responsibilities + +### Membership levels + +See the [OpenTelemetry membership guide](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md) for information on how to become a member of the OpenTelemetry organization and the different roles available. In addition to the roles listed there we also have a Collector-specific role: code owners. + +### Becoming a Code Owner A Code Owner is responsible for a component within Collector Contrib, as indicated by the [CODEOWNERS file](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/.github/CODEOWNERS). That responsibility includes maintaining the component, triaging and responding to issues, and reviewing pull requests. @@ -406,7 +412,7 @@ Sometimes a component may be in need of a new or additional Code Owner. A few re Code Ownership does not have to be a full-time job. If you can find a couple hours to help out on a recurring basis, please consider pursuing Code Ownership. -### Requirements +#### Requirements If you would like to help and become a Code Owner you must meet the following requirements: @@ -415,7 +421,7 @@ If you would like to help and become a Code Owner you must meet the following re Code Ownership is ultimately up to the judgement of the existing Code Owners and Collector Contrib Maintainers. Meeting the above requirements is not a guarantee to be granted Code Ownership. -### How to become a Code Owner +#### How to become a Code Owner To become a Code Owner, open a PR with the following changes: @@ -426,6 +432,14 @@ To become a Code Owner, open a PR with the following changes: Be sure to tag the existing Code Owners, if any, within the PR to ensure they receive a notification. +### Emeritus roles + +Contributors that are stepping down or reducing their role in the project are encouraged to move to [emeritus](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager). + +In the event that a contributor steps down without prior notice, the maintainers will attempt to contact the contributor via both Github and the CNCF Slack to confirm their status. After two weeks, if the contributor is an approver or maintainer, they may be removed from the Github review auto-assignment. If the contributor does not respond within a period of one month, they may be moved to emeritus status at the discretion of the maintainers. + +In case of disagreement, this will be submitted to a majority vote among the maintainers (possibly excluding the contributor in question). + ## Makefile Guidelines When adding or modifying the `Makefile`'s in this repository, consider the following design guidelines. From 20fd76856b1047b019407f903fdf35bc61716230 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 7 Aug 2024 14:30:54 +0200 Subject: [PATCH 2/6] Clarify how to give prior notice and what disagreements we are talking about --- CONTRIBUTING.md | 6 +++--- main.yaml | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 main.yaml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b051b56e64ed..df44063789cf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -434,11 +434,11 @@ Be sure to tag the existing Code Owners, if any, within the PR to ensure they re ### Emeritus roles -Contributors that are stepping down or reducing their role in the project are encouraged to move to [emeritus](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager). +Contributors that are stepping down or reducing their role in the project are encouraged to move to [emeritus](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager). In case of temporary absences, contributors are encouraged to let maintainers know via Github or the CNCF Slack and to mark themselves as 'Busy' on Github. -In the event that a contributor steps down without prior notice, the maintainers will attempt to contact the contributor via both Github and the CNCF Slack to confirm their status. After two weeks, if the contributor is an approver or maintainer, they may be removed from the Github review auto-assignment. If the contributor does not respond within a period of one month, they may be moved to emeritus status at the discretion of the maintainers. +In the event that a contributor steps down without prior notice, the maintainers will attempt to contact the contributor via both Github and the CNCF Slack to confirm their status. After two weeks, if the contributor is an approver or maintainer, they may be removed from the Github review auto-assignment. If the contributor does not respond within a period of two months, they may be moved to emeritus status at the discretion of the maintainers. -In case of disagreement, this will be submitted to a majority vote among the maintainers (possibly excluding the contributor in question). +If there is no agreement regarding whether to move a contributor to emeritus or remove them to auto-assignments, this will be submitted to a majority vote among the maintainers (possibly excluding the contributor in question). ## Makefile Guidelines diff --git a/main.yaml b/main.yaml new file mode 100644 index 000000000000..6334d7cd7dff --- /dev/null +++ b/main.yaml @@ -0,0 +1,20 @@ +extensions: + zpages: {} + #basicauth/otlp: + #client_auth: + # username: "${OTLP_USER}" + # password: "${GRAFANA_ACCESS_TOKEN}" + +receivers: + nop: + +exporters: + otlp: + endpoint: "aaa${OTLP_USER}" + +service: + extensions: #[basicauth/otlp, zpages] + pipelines: + traces: + receivers: [nop] + exporters: [nop] From 54e3025ca0aa44a6a991153888b45cece7a14a31 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 7 Aug 2024 15:00:15 +0200 Subject: [PATCH 3/6] Feedback from SIG meeting --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df44063789cf..9d07208d98f7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -434,11 +434,11 @@ Be sure to tag the existing Code Owners, if any, within the PR to ensure they re ### Emeritus roles -Contributors that are stepping down or reducing their role in the project are encouraged to move to [emeritus](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager). In case of temporary absences, contributors are encouraged to let maintainers know via Github or the CNCF Slack and to mark themselves as 'Busy' on Github. +Contributors that are stepping down or reducing their role in the project are encouraged to move to [emeritus](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager). In case of long temporary absences, contributors are encouraged to let maintainers know on the CNCF Slack #otel-collector-dev channel and to mark themselves as 'Busy' on Github. -In the event that a contributor steps down without prior notice, the maintainers will attempt to contact the contributor via both Github and the CNCF Slack to confirm their status. After two weeks, if the contributor is an approver or maintainer, they may be removed from the Github review auto-assignment. If the contributor does not respond within a period of two months, they may be moved to emeritus status at the discretion of the maintainers. +In the event that a contributor steps down without prior notice, the maintainers will attempt to contact the contributor via both Github and the CNCF Slack to confirm their status. After two weeks, if the contributor is an approver or maintainer, they may be removed from the Github review auto-assignment. -If there is no agreement regarding whether to move a contributor to emeritus or remove them to auto-assignments, this will be submitted to a majority vote among the maintainers (possibly excluding the contributor in question). +If the contributor does not respond within a period of two months, they may be moved to emeritus status at the discretion of the maintainers, following a majority vote among the maintainers (possibly excluding the contributor in question). ## Makefile Guidelines From 5b76abcb5f85655f7c1675ec5670e454007d1eec Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 7 Aug 2024 15:00:35 +0200 Subject: [PATCH 4/6] Delete main.yaml --- main.yaml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 main.yaml diff --git a/main.yaml b/main.yaml deleted file mode 100644 index 6334d7cd7dff..000000000000 --- a/main.yaml +++ /dev/null @@ -1,20 +0,0 @@ -extensions: - zpages: {} - #basicauth/otlp: - #client_auth: - # username: "${OTLP_USER}" - # password: "${GRAFANA_ACCESS_TOKEN}" - -receivers: - nop: - -exporters: - otlp: - endpoint: "aaa${OTLP_USER}" - -service: - extensions: #[basicauth/otlp, zpages] - pipelines: - traces: - receivers: [nop] - exporters: [nop] From 65e53f2740b4d925f9c2a5dcb6035cf1afeba2ff Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 7 Aug 2024 16:30:36 +0200 Subject: [PATCH 5/6] Apply suggestions from code review Co-authored-by: Yang Song --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9d07208d98f7..a362fe72b159 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -436,7 +436,7 @@ Be sure to tag the existing Code Owners, if any, within the PR to ensure they re Contributors that are stepping down or reducing their role in the project are encouraged to move to [emeritus](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager). In case of long temporary absences, contributors are encouraged to let maintainers know on the CNCF Slack #otel-collector-dev channel and to mark themselves as 'Busy' on Github. -In the event that a contributor steps down without prior notice, the maintainers will attempt to contact the contributor via both Github and the CNCF Slack to confirm their status. After two weeks, if the contributor is an approver or maintainer, they may be removed from the Github review auto-assignment. +In the event that a contributor becomes inactive without prior notice, the maintainers will attempt to contact the contributor via both Github and the CNCF Slack to confirm their status. After two weeks, if the contributor is an approver or maintainer, they may be removed from the Github review auto-assignment. If the contributor does not respond within a period of two months, they may be moved to emeritus status at the discretion of the maintainers, following a majority vote among the maintainers (possibly excluding the contributor in question). From d8d52734bb3123e624143a83d6da2b0f75504d18 Mon Sep 17 00:00:00 2001 From: Pablo Baeyens Date: Wed, 7 Aug 2024 16:57:03 +0200 Subject: [PATCH 6/6] Reword to make otel-collector-dev an example --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a362fe72b159..c773d1953779 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -434,7 +434,7 @@ Be sure to tag the existing Code Owners, if any, within the PR to ensure they re ### Emeritus roles -Contributors that are stepping down or reducing their role in the project are encouraged to move to [emeritus](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager). In case of long temporary absences, contributors are encouraged to let maintainers know on the CNCF Slack #otel-collector-dev channel and to mark themselves as 'Busy' on Github. +Contributors who are unable to meet the responsibilities of their role are encouraged to move to [emeritus](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#emeritus-maintainerapprovertriager). In case of long temporary absences, contributors are encouraged to let maintainers know on the CNCF Slack (e.g. on the #otel-collector-dev channel or privately via DM) and to mark themselves as 'Busy' on Github. In the event that a contributor becomes inactive without prior notice, the maintainers will attempt to contact the contributor via both Github and the CNCF Slack to confirm their status. After two weeks, if the contributor is an approver or maintainer, they may be removed from the Github review auto-assignment.