From b413985383dc9d50128a5bfa453e166884098bf7 Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Fri, 1 Sep 2023 16:11:18 +0200 Subject: [PATCH 1/4] Multiple spec updates based on .NET GA review --- specification/configuration.md | 4 ++-- specification/repository.md | 6 ++---- specification/templates/.github/CODEOWNERS | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/specification/configuration.md b/specification/configuration.md index ee06710..9168351 100644 --- a/specification/configuration.md +++ b/specification/configuration.md @@ -214,8 +214,8 @@ are required. name or link to relevant documentation. E.g. ```txt - service.name attribute is not set, your service is unnamed and will be difficult to identify. - set your service name using the OTEL_SERVICE_NAME environment variable. + The service.name resource attribute is not set, your service is unnamed and will be difficult to identify. + Set your service name using the OTEL_SERVICE_NAME or OTEL_RESOURCE_ATTRIBUTES environment variable. E.g. `OTEL_SERVICE_NAME=""` ``` diff --git a/specification/repository.md b/specification/repository.md index 05e3fe4..e7c7dcd 100644 --- a/specification/repository.md +++ b/specification/repository.md @@ -22,12 +22,10 @@ approval is granted, GDI repositories MUST NOT cut a GA release. - MUST grant `Admin` [permission level](https://docs.github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization) - to maintainers team + to maintainers team and the `gdi-instrumentation-admins` team - MUST grant `Write` [permission level](https://docs.github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization) - to approvers team and the `signalfx/docs`, - `signalfx/gdi-specification-approvers` - `signalfx/gdi-specification-maintainers` teams + to approvers team and the `signalfx/gdi-docs` and `signalfx/gdi-specification-maintainers` teams - MUST NOT grant `Write`, `Maintain`, `Admin` [permission level](https://docs.github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization) to any other team diff --git a/specification/templates/.github/CODEOWNERS b/specification/templates/.github/CODEOWNERS index 3db156f..0d01ac0 100644 --- a/specification/templates/.github/CODEOWNERS +++ b/specification/templates/.github/CODEOWNERS @@ -14,4 +14,4 @@ *.md @signalfx/gdi-TEAM-maintainers @signalfx/gdi-TEAM-approvers @signalfx/gdi-docs *.rst @signalfx/gdi-TEAM-maintainers @signalfx/gdi-TEAM-approvers @signalfx/gdi-docs docs/ @signalfx/gdi-TEAM-maintainers @signalfx/gdi-TEAM-approvers @signalfx/gdi-docs -README* @signalfx/gdi-TEAM-maintainers @signalfx/gdi-TEAM-approvers @signalfx/gdi-docs @signalfx/gdi-specification-approvers @signalfx/gdi-specification-maintainers +README* @signalfx/gdi-TEAM-maintainers @signalfx/gdi-TEAM-approvers @signalfx/gdi-docs @signalfx/gdi-specification-maintainers From 97ae5fbc6408adef16bf2273e154d4211aa113de Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Mon, 4 Sep 2023 08:43:54 +0200 Subject: [PATCH 2/4] Apply suggestions from code review Co-authored-by: jason plumb <75337021+breedx-splk@users.noreply.github.com> --- specification/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/configuration.md b/specification/configuration.md index 9168351..ba8f256 100644 --- a/specification/configuration.md +++ b/specification/configuration.md @@ -214,7 +214,7 @@ are required. name or link to relevant documentation. E.g. ```txt - The service.name resource attribute is not set, your service is unnamed and will be difficult to identify. + The service.name resource attribute is not set. Your service is unnamed and will be difficult to identify. Set your service name using the OTEL_SERVICE_NAME or OTEL_RESOURCE_ATTRIBUTES environment variable. E.g. `OTEL_SERVICE_NAME=""` ``` From c1edf52b4474e448d5417a02915fab65168c2bd3 Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Fri, 1 Sep 2023 16:21:38 +0200 Subject: [PATCH 3/4] markdownlint --- specification/repository.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/repository.md b/specification/repository.md index e7c7dcd..9d5c790 100644 --- a/specification/repository.md +++ b/specification/repository.md @@ -25,7 +25,8 @@ approval is granted, GDI repositories MUST NOT cut a GA release. to maintainers team and the `gdi-instrumentation-admins` team - MUST grant `Write` [permission level](https://docs.github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization) - to approvers team and the `signalfx/gdi-docs` and `signalfx/gdi-specification-maintainers` teams + to approvers team and the `signalfx/gdi-docs` and + `signalfx/gdi-specification-maintainers` teams - MUST NOT grant `Write`, `Maintain`, `Admin` [permission level](https://docs.github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization) to any other team From 2b28fd4aa5b70b23ecb9e74be1cd76a0d3f44946 Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Tue, 5 Sep 2023 11:38:30 +0200 Subject: [PATCH 4/4] remove the gdi-specification-maintainers requirement as well --- specification/repository.md | 3 +-- specification/templates/.github/CODEOWNERS | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/specification/repository.md b/specification/repository.md index 9d5c790..8de0b05 100644 --- a/specification/repository.md +++ b/specification/repository.md @@ -25,8 +25,7 @@ approval is granted, GDI repositories MUST NOT cut a GA release. to maintainers team and the `gdi-instrumentation-admins` team - MUST grant `Write` [permission level](https://docs.github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization) - to approvers team and the `signalfx/gdi-docs` and - `signalfx/gdi-specification-maintainers` teams + to approvers team and the `signalfx/gdi-docs` team - MUST NOT grant `Write`, `Maintain`, `Admin` [permission level](https://docs.github.com/en/organizations/managing-access-to-your-organizations-repositories/repository-permission-levels-for-an-organization) to any other team diff --git a/specification/templates/.github/CODEOWNERS b/specification/templates/.github/CODEOWNERS index 0d01ac0..bc73022 100644 --- a/specification/templates/.github/CODEOWNERS +++ b/specification/templates/.github/CODEOWNERS @@ -14,4 +14,4 @@ *.md @signalfx/gdi-TEAM-maintainers @signalfx/gdi-TEAM-approvers @signalfx/gdi-docs *.rst @signalfx/gdi-TEAM-maintainers @signalfx/gdi-TEAM-approvers @signalfx/gdi-docs docs/ @signalfx/gdi-TEAM-maintainers @signalfx/gdi-TEAM-approvers @signalfx/gdi-docs -README* @signalfx/gdi-TEAM-maintainers @signalfx/gdi-TEAM-approvers @signalfx/gdi-docs @signalfx/gdi-specification-maintainers +README* @signalfx/gdi-TEAM-maintainers @signalfx/gdi-TEAM-approvers @signalfx/gdi-docs