diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 24157bb68c1..f1ceb67a6d0 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -12,3 +12,4 @@ For non-trivial changes, follow the [change proposal process](https://github.com * [ ] [`CHANGELOG.md`](https://github.com/open-telemetry/opentelemetry-specification/blob/main/CHANGELOG.md) file updated for non-trivial changes * For trivial changes, include `[chore]` in the PR title to skip the changelog check * [ ] [Spec compliance matrix](https://github.com/open-telemetry/opentelemetry-specification/blob/main/spec-compliance-matrix/template.yaml) updated if necessary +* [ ] [Declarative config data model](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/data-model.md#overview) is updated if SDK config surface is changed diff --git a/CHANGELOG.md b/CHANGELOG.md index cd4c67266ed..4f27c51511f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,8 @@ release. - Declarative configuration: add in-development guidance for exposing the effective `Resource` returned by `Create`. ([#4948](https://github.com/open-telemetry/opentelemetry-specification/issues/4948)) +- Require spec changes to consider declarative config schema + ([#4916](https://github.com/open-telemetry/opentelemetry-specification/pull/4916)) ### Supplementary Guidelines diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 13041cd014a..a4aee86c615 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -42,6 +42,13 @@ Smaller changes can follow a shorter process: support of that SIG's maintainers. For example, this may be an unmerged PR with an indication of maintainers' intent to merge in the event the corresponding specification PR is merged. +- If the change adds or modifies the configuration surface area of SDK + components, the PR description must provide links to corresponding proposed + changes to + the [declarative configuration schema](https://github.com/open-telemetry/opentelemetry-configuration). + Approval and merging of such PRs should result in merging the corresponding + schema PR. This ensures that proposals are evaluated holistically and that the + schema stays in sync with the specification. Trivial changes, such as clarifications, wording changes, spelling/grammar corrections, etc. can be made directly via pull requests and do not require an associated