From f83becdf51938a5d7f3afb2392ab877cc234e225 Mon Sep 17 00:00:00 2001 From: Bhanu Bandi Date: Thu, 19 Oct 2023 11:22:32 -0400 Subject: [PATCH 1/9] added a new chloggen for cwa --- .chloggen-aws/TEMPLATE.yaml | 23 ++ .chloggen-aws/changelog-aws.yaml | 26 ++ .chloggen-aws/changelog-aws1.yaml | 29 ++ .chloggen-aws/config.yaml | 23 ++ .github/workflows/changelog.yml | 97 +++++ .github/workflows/prepare-release-cwa-aws.yml | 38 ++ .../release-prepare-release-cwa-aws.sh | 65 +++ CHANGELOG-AWS.md | 10 + CONTRIBUTING-AWS.md | 389 ++++++++++++++++++ Makefile | 16 + Makefile.Common | 1 + 11 files changed, 717 insertions(+) create mode 100644 .chloggen-aws/TEMPLATE.yaml create mode 100755 .chloggen-aws/changelog-aws.yaml create mode 100755 .chloggen-aws/changelog-aws1.yaml create mode 100644 .chloggen-aws/config.yaml create mode 100644 .github/workflows/changelog.yml create mode 100644 .github/workflows/prepare-release-cwa-aws.yml create mode 100755 .github/workflows/scripts/release-prepare-release-cwa-aws.sh create mode 100644 CHANGELOG-AWS.md create mode 100644 CONTRIBUTING-AWS.md diff --git a/.chloggen-aws/TEMPLATE.yaml b/.chloggen-aws/TEMPLATE.yaml new file mode 100644 index 000000000000..3b370bb1f340 --- /dev/null +++ b/.chloggen-aws/TEMPLATE.yaml @@ -0,0 +1,23 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# e.g. '[aws]' +# Include 'aws' if the change is done done by cwa +# Default: '[user]' +change_logs: [aws] \ No newline at end of file diff --git a/.chloggen-aws/changelog-aws.yaml b/.chloggen-aws/changelog-aws.yaml new file mode 100755 index 000000000000..cb97069a7346 --- /dev/null +++ b/.chloggen-aws/changelog-aws.yaml @@ -0,0 +1,26 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'new_component' + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: changelog + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Added a chloggen for cwa" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: Added a new changelog directory that stores the changelog yaml files created by the cwa team with (make chlog-new-aws) + Added a new CHANGELOG-AWS.md file for cwa team. + make chlog-update-aws will update the CHANGELOG-AWS.md file with the .chloggen-aws files and delete the .chloggen-aws directory yaml after updating. + + +# e.g. '[aws]' +# Include 'aws' if the change is done done by cwa +# Default: '[user]' +change_logs: [aws] \ No newline at end of file diff --git a/.chloggen-aws/changelog-aws1.yaml b/.chloggen-aws/changelog-aws1.yaml new file mode 100755 index 000000000000..6fcdd103ae06 --- /dev/null +++ b/.chloggen-aws/changelog-aws1.yaml @@ -0,0 +1,29 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'new_component' + +# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) +component: changelog + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: "Added a chloggen for cwa" + +# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. +issues: [] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: Added a new changelog directory that stores the changelog yaml files created by the cwa team with (make chlog-new-aws) + Added a new CHANGELOG-AWS.md file for cwa team. + make chlog-update-aws will update the CHANGELOG-AWS.md file with the .chloggen-aws files and delete the .chloggen-aws directory yaml after updating. + +# If your change doesn't affect end users or the exported elements of any package, +# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [aws] \ No newline at end of file diff --git a/.chloggen-aws/config.yaml b/.chloggen-aws/config.yaml new file mode 100644 index 000000000000..4df7ee351e28 --- /dev/null +++ b/.chloggen-aws/config.yaml @@ -0,0 +1,23 @@ +# The directory that stores individual changelog entries. +# Each entry is stored in a dedicated yaml file. +# - 'chloggen new' will copy the 'template_yaml' to this directory as a new entry file. +# - 'chloggen validate' will validate that all entry files are valid. +# - 'chloggen update' will read and delete all entry files in this directory, and update 'changelog_md'. +# Specify as relative path from root of repo. +# (Optional) Default: .chloggen +entries_dir: .chloggen-aws + +# This file is used as the input for individual changelog entries. +# Specify as relative path from root of repo. +# (Optional) Default: .chloggen/TEMPLATE.yaml +template_yaml: .chloggen-aws/TEMPLATE.yaml + +# The CHANGELOG file or files to which 'chloggen update' will write new entries +# (Optional) Default filename: CHANGELOG.md +change_logs: + aws: CHANGELOG-AWS.md + +# The default change_log or change_logs to which an entry should be added. +# If 'change_logs' is specified in this file, and no value is specified for 'default_change_logs', +# then 'change_logs' MUST be specified in every entry file. +default_change_logs: [aws] diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml new file mode 100644 index 000000000000..5127645a5fcc --- /dev/null +++ b/.github/workflows/changelog.yml @@ -0,0 +1,97 @@ +# This action requires that any PR targeting the main branch should add a +# yaml file to the ./.chloggen/ directory. If a CHANGELOG entry is not required, +# or if performing maintance on the Changelog, add either \"[chore]\" to the title of +# the pull request or add the \"Skip Changelog\" label to disable this action. + +name: changelog + +on: + pull_request: + types: [opened, synchronize, reopened, labeled, unlabeled] + branches: + - main + - branches/** + +env: + # Make sure to exit early if cache segment download times out after 2 minutes. + # We limit cache download as a whole to 5 minutes. + SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2 + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref }} + cancel-in-progress: true + +jobs: + changelog: + runs-on: ubuntu-latest + if: ${{ github.actor != 'dependabot[bot]' }} + env: + PR_HEAD: ${{ github.event.pull_request.head.sha }} + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: actions/setup-go@v4 + with: + go-version: ~1.20.10 + cache: false + - name: Cache Go + id: go-cache + timeout-minutes: 5 + uses: actions/cache@v3 + with: + path: | + ~/go/bin + ~/go/pkg/mod + key: changelog-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + - name: Ensure no changes to the CHANGELOG-AWS.md + if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}} + run: | + if [[ $(git diff --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD ./CHANGELOG-AWS.md) ]] + then + echo "CHANGELOG-AWS.md should not be directly modified." + echo "Please add a .yaml file to the ./.chloggen-aws/ directory." + echo "See CONTRIBUTING-AWS.md for more details." + echo "Alternately, add either \"[chore]\" to the title of the pull request or add the \"Skip Changelog\" label if this job should be skipped." + false + else + echo "CHANGELOG-AWS.md were not modified." + fi + - name: Ensure ./.chloggen-aws/*.yaml addition(s) + if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}} + run: | + if [[ 1 -gt $(git diff --diff-filter=A --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD ./.chloggen-aws | grep -c \\.yaml) ]] + then + ls ./.chloggen-aws + echo "No changelog entry was added to the ./.chloggen-aws/ directory." + echo "Please add a .yaml file to the ./.chloggen-aws/ directory." + echo "See CONTRIBUTING-AWS.md for more details." + echo "Alternately, add either \"[chore]\" to the title of the pull request or add the \"Skip Changelog\" label if this job should be skipped." + false + else + ls ./.chloggen-aws + echo "A changelog entry was added to the ./.chloggen-aws/ directory." + fi + + - name: Validate ./.chloggen/*.yaml changes + run: | + make chlog-validate-aws \ + || { echo "New ./.chloggen-aws/*.yaml file failed validation."; exit 1; } + + +# In order to validate any links in the yaml file, render the config to markdown + - name: Render .chloggen changelog entries + if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}} + run: make chlog-preview-aws > changelog_preview.md + - name: Install markdown-link-check + if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}} + run: npm install -g markdown-link-check + - name: Run markdown-link-check + if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}} + run: | + markdown-link-check \ + --verbose \ + --config .github/workflows/check_links_config.json \ + changelog_preview.md \ + || { echo "Check that anchor links are lowercase"; exit 1; } \ No newline at end of file diff --git a/.github/workflows/prepare-release-cwa-aws.yml b/.github/workflows/prepare-release-cwa-aws.yml new file mode 100644 index 000000000000..c0a118e05fda --- /dev/null +++ b/.github/workflows/prepare-release-cwa-aws.yml @@ -0,0 +1,38 @@ +name: Automation - Prepare Release + +on: + workflow_dispatch: + # Determine the version number that will be assigned to the release. During the beta phase, we increment + # the minor version number and set the patch number to 0. + inputs: + candidate-beta: + required: true + description: Release candidate version (beta, like 0.70.0) + + current-beta: + required: true + description: Current version (beta, like 0.69.1) +jobs: + # Releasing opentelemetry-collector-contrib + prepare-release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + repository: 'open-telemetry/opentelemetry-collector' + path: opentelemetry-collector + - uses: actions/checkout@v4 + with: + path: opentelemetry-collector-contrib + - uses: actions/setup-go@v4 + with: + go-version: ~1.20.8 + cache: false + - name: Prepare release for contrib + working-directory: opentelemetry-collector-contrib + env: + GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} + REPO: open-telemetry/opentelemetry-collector-contrib + CANDIDATE_BETA: ${{ inputs.candidate-beta }} + CURRENT_BETA: ${{ inputs.current-beta }} + run: ./.github/workflows/scripts/release-prepare-release-cwa-aws.sh diff --git a/.github/workflows/scripts/release-prepare-release-cwa-aws.sh b/.github/workflows/scripts/release-prepare-release-cwa-aws.sh new file mode 100755 index 000000000000..498d3045d1c8 --- /dev/null +++ b/.github/workflows/scripts/release-prepare-release-cwa-aws.sh @@ -0,0 +1,65 @@ +#!/bin/bash -ex + +# Copyright The OpenTelemetry Authors +# SPDX-License-Identifier: Apache-2.0 + +PATTERN="^[0-9]+\.[0-9]+\.[0-9]+.*" +if ! [[ ${CURRENT_BETA} =~ $PATTERN ]] +then + echo "CURRENT_BETA should follow a semver format and not be led by a v" + exit 1 +fi + +if ! [[ ${CANDIDATE_BETA} =~ $PATTERN ]] +then + echo "CANDIDATE_BETA should follow a semver format and not be led by a v" + exit 1 +fi + +make chlog-update-aws VERSION="v${CANDIDATE_BETA}" +git config user.name opentelemetrybot +git config user.email 107717825+opentelemetrybot@users.noreply.github.com + +BRANCH="prepare-release-prs/${CANDIDATE_BETA}" +git checkout -b "${BRANCH}" +git add --all +git commit -m "changelog update ${CANDIDATE_BETA}" + +sed -i.bak "s/${CURRENT_BETA}/${CANDIDATE_BETA}/g" versions.yaml +find . -name "*.bak" -type f -delete +git add versions.yaml +git commit -m "update version.yaml ${CANDIDATE_BETA}" + +sed -i.bak "s/v${CURRENT_BETA}/v${CANDIDATE_BETA}/g" ./cmd/oteltestbedcol/builder-config.yaml +sed -i.bak "s/v${CURRENT_BETA}/v${CANDIDATE_BETA}/g" ./cmd/otelcontribcol/builder-config.yaml +sed -i.bak "s/${CURRENT_BETA}-dev/${CANDIDATE_BETA}-dev/g" ./cmd/otelcontribcol/builder-config.yaml +sed -i.bak "s/${CURRENT_BETA}-dev/${CANDIDATE_BETA}-dev/g" ./cmd/oteltestbedcol/builder-config.yaml + +find . -name "*.bak" -type f -delete +make genotelcontribcol +make genoteltestbedcol +git add . +git commit -m "builder config changes ${CANDIDATE_BETA}" || (echo "no builder config changes to commit") + +make multimod-prerelease +git add . +git commit -m "make multimod-prerelease changes ${CANDIDATE_BETA}" || (echo "no multimod changes to commit") + +make multimod-sync +git add . +git commit -m "make multimod-sync changes ${CANDIDATE_BETA}" || (echo "no multimod changes to commit") + +make gotidy +git add . +git commit -m "make gotidy changes ${CANDIDATE_BETA}" || (echo "no gotidy changes to commit") +make otelcontribcol + +git push origin "${BRANCH}" + +gh pr create --title "[chore] Prepare release ${CANDIDATE_BETA}" --body " +The following commands were run to prepare this release: +- make chlog-update VERSION=v${CANDIDATE_BETA} +- sed -i.bak s/${CURRENT_BETA}/${CANDIDATE_BETA}/g versions.yaml +- make multimod-prerelease +- make multimod-sync +" diff --git a/CHANGELOG-AWS.md b/CHANGELOG-AWS.md new file mode 100644 index 000000000000..1bd0a2a9c393 --- /dev/null +++ b/CHANGELOG-AWS.md @@ -0,0 +1,10 @@ + + +# GO AWS cloudwatch agent Changelog + +This changelog includes only clodwatch agent developer-facing changes. +Please checkout contributing file [CONTRIBUTING.md](./CONTRIBUTING.md) + + + + diff --git a/CONTRIBUTING-AWS.md b/CONTRIBUTING-AWS.md new file mode 100644 index 000000000000..b765e997980e --- /dev/null +++ b/CONTRIBUTING-AWS.md @@ -0,0 +1,389 @@ +# Contributing + +If you would like to contribute please read OpenTelemetry Collector [contributing +guidelines](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md) before you begin your +work. + +## Pull-request title + +The title for your pull-request should contain the component type and name in brackets, plus a short statement for your +change. For instance: + + [processor/tailsampling] fix AND policy + +## Changelog + +### Overview + +There are two Changelogs for this repository: + +- `CHANGELOG-AWS.md` is intended for cwa team to track the changes. +### When to add a Changelog Entry + +When ever we make any changes to the contrib repo, before raising the pull request we have to create a yaml file in .changelog-aws referencing the template in the directory. + +**Examples** + +Changelog entry required: +- Changes to the configuration of the collector or any component +- Changes to the telemetry emitted from and/or processed by the collector +- Changes to the prerequisites or assumptions for running a collector +- Changes to an API exported by a collector package +- Meaningful changes to the performance of the collector + +Judgement call: +- Major changes to documentation +- Major changes to tests or test frameworks +- Changes to developer tooling in the repo + +No changelog entry: +- Typical documentation updates +- Refactorings with no meaningful change in functionality +- Most changes to tests +- Chores, such as enabling linters, or minor changes to the CI process + +### Adding a Changelog Entry + +The [CHANGELOG-AWS.md](./CHANGELOG-AWS.md) files in this repo is autogenerated from `.yaml` files in the `./.chloggen-aws` directory. + +The name of your file must be unique since the last release. + +During the collector release process, all `./chloggen-aws/*.yaml` files are transcribed into `CHANGELOG-aws.md` and then deleted. + +**Recommended Steps** +1. Create an entry file using `make chlog-new-aws`. This generates a file based on your current branch (e.g. `./.chloggen-aws/my-branch.yaml`) +2. Fill in all fields in the new file +3. Run `make chlog-validate-aws` to ensure the new file is valid +4. Commit and push the file + +Alternately, copy `./.chloggen-aws/TEMPLATE.yaml`, or just create your file from scratch. + +## Portable Code + +In order to ensure compatibility with different operating systems, code should be portable. Below are some guidelines to follow when writing portable code: + +* Avoid using platform-specific libraries, features etc. Please opt for portable multi-platform solutions. + +* Avoid hard-coding platform-specific values. Use environment variables or configuration files for storing platform-specific values. + + For example, avoid using hard-coded file path + ``` + filePath := "C:\Users\Bob\Documents\sampleData.csv" + ``` + + Instead environment variable or configuration file can be used. + ``` + filePath := os.Getenv("DATA_FILE_PATH") + ``` + or + ``` + filePath := Configuration.Get("data_file_path") + ``` + +* Be mindful of + - Standard file systems and file paths such as forward slashes (/) instead of backward slashes (\\) in Windows. Use the [`path/filepath` package](https://pkg.go.dev/path/filepath) when working with filepaths. + - Consistent line ending formats such as Unix (LF) or Windows (CRLF). + +* Test your implementation thoroughly on different platforms if possible and fix any issues. + +With above guidelines, you can write code that is more portable and easier to maintain across different platforms. + +## Adding New Components + +**Before** any code is written, [open an +issue](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/new?assignees=&labels=new+component&template=new_component.md&title=New%20component) +providing the following information: + +* Who's the sponsor for your component. A sponsor is an approver who will be in charge of being the official reviewer of + the code and become a code owner for the component. For vendor-specific components, it's good to have a volunteer + sponsor. If you can't find one, we'll assign one in a round-robin fashion. A vendor-specific component directly interfaces + with a vendor-specific API and is expected to be maintained by a representative of the same vendor. For non-vendor specific + components, having a sponsor means that your use case has been validated. +* Some information about your component, such as the reasoning behind it, use-cases, telemetry data types supported, and + anything else you think is relevant for us to make a decision about accepting the component. +* The configuration options your component will accept. This will help us understand what it does and have an idea of + how the implementation might look like. + +Components refer to connectors, exporters, extensions, processors, and receivers. The key criteria to implementing a component is to: + +* Implement the [component.Component](https://pkg.go.dev/go.opentelemetry.io/collector/component#Component) interface +* Provide a configuration structure which defines the configuration of the component +* Provide the implementation which performs the component operation +* Have a `metadata.yaml` file and its generated code (using [mdatadgen](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/cmd/mdatagen/README.md)). + +Familiarize yourself with the interface of the component that you want to write, and use existing implementations as reference. +[Building a Trace Receiver](https://opentelemetry.io/docs/collector/trace-receiver/) tutorial provides a detailed example of building a component. + +*NOTICE:* The Collector is in Beta stage and as such the interfaces may undergo breaking changes. Component creators +must be available to update or review their components when such changes happen, otherwise the component will be +excluded from the default builds. + +Generally, maintenance of components is the responsibility of contributors who authored them. If the original author or +some other contributor does not maintain the component it may be excluded from the default build. The component **will** +be excluded if it causes build problems, has failing tests or otherwise causes problems to the rest of the repository +and the rest of contributors. + +- Create your component under the proper folder and use Go standard package naming recommendations. +- Use a boiler-plate Makefile that just references the one at top level, ie.: `include ../../Makefile.Common` - this + allows you to build your component with required build configurations for the contrib repo while avoiding building the + full repo during development. +- Each component has its own go.mod file. This allows custom builds of the collector to take a limited sets of + dependencies - so run `go mod` commands as appropriate for your component. +- Implement the needed interface on your component by importing the appropriate component from the core repo. Follow the + pattern of existing components regarding config and factory source files and tests. +- Implement your component as appropriate. Provide end-to-end tests (or mock backend/client as appropriate). Target is + to get 80% or more of code coverage. +- Add a README.md on the root of your component describing its configuration and usage, likely referencing some of the + yaml files used in the component tests. We also suggest that the yaml files used in tests have comments for all + available configuration settings so users can copy and modify them as needed. +- Run `make crosslink` to update intra-repository dependencies. It will add a `replace` directive to `go.mod` file of every intra-repository dependant. This is necessary for your component to be included in the contrib executable. +- Add your component to `versions.yaml`. +- All components included in the distribution must be included in [`cmd/otelcontribcol/builder-config.yaml`](./cmd/otelcontribcol/builder-config.yaml) + and in the respective testing harnesses. To align with the test goal of the project, components must be testable within the framework defined within + the folder. If a component can not be properly tested within the existing framework, it must increase the non testable + components number with a comment within the PR explaining as to why it can not be tested. +- Create a `metadata.yaml` file with at minimum the required fields defined in [metadata-schema.yaml](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/cmd/mdatagen/metadata-schema.yaml). +Here is a minimal representation: +``` +type: + +status: + class: + stability: + development: [] + codeowners: + active: [, ] +``` +- Run `make generate-gh-issue-templates` to add your component to the dropdown list in the issue templates. +- For README.md, you can start with the following: +``` +# +<!-- status autogenerated section --> +<!-- end autogenerated section --> +``` +- Create a `doc.go` file with a generate pragma. For a `fooreceiver`, the file will look like: +``` +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +//go:generate mdatagen metadata.yaml + +// Package fooreceiver bars. +package fooreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fooreceiver" +``` +- Type `make update-codeowners`. This will trigger the regeneration of the `.github/CODEOWNERS` file and the [metadata generator](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/cmd/mdatagen/README.md#using-the-metadata-generator) to generate the associated code/documentation. + +When submitting a component to the community, consider breaking it down into separate PRs as follows: + +* **First PR** should include the overall structure of the new component: + * Readme, configuration, and factory implementation usually using the helper + factory structs. + * This PR is usually trivial to review, so the size limit does not apply to + it. + * The component should use [`In Development` Stability](https://github.com/open-telemetry/opentelemetry-collector#development) in its README. +* **Second PR** should include the concrete implementation of the component. If the + size of this PR is larger than the recommended size consider splitting it in + multiple PRs. +* **Last PR** should mark the new component as `Alpha` stability and add it to the `cmd/otelcontribcol` + binary by updating the `cmd/otelcontribcol/components.go` file. The component must be enabled + only after sufficient testing and only when it meets [`Alpha` stability requirements](https://github.com/open-telemetry/opentelemetry-collector#alpha). +* Once a new component has been added to the executable, please add the component + to the [OpenTelemetry.io registry](https://github.com/open-telemetry/opentelemetry.io#adding-a-project-to-the-opentelemetry-registry). + +### Releasing New Components +After a component has been approved and merged, and has been enabled in `internal/components/`, it must be added to the +[OpenTelemetry Collector Contrib's release manifest.yaml](https://github.com/open-telemetry/opentelemetry-collector-releases/blob/main/distributions/otelcol-contrib/manifest.yaml) +to be included in the distributed otelcol-contrib binaries and docker images. + +### Rotating sponsors + +The following GitHub users are the currently available sponsors, either by being an approver or a maintainer of the contrib repository. The list is ordered based on a random sort of the list of sponsors done live at the Collector SIG meeting on 27-Apr-2022 and serves as the seed for the round-robin selection of sponsors, as described in the section above. + +* [@djaglowski](https://github.com/djaglowski) +* [@codeboten](https://github.com/codeboten) +* [@Aneurysm9](https://github.com/Aneurysm9) +* [@mx-psi](https://github.com/mx-psi) +* [@dmitryax](https://github.com/dmitryax) +* [@evan-bradley](https://github.com/evan-bradley) +* [@MovieStoreGuy](https://github.com/MovieStoreGuy) +* [@bogdandrutu](https://github.com/bogdandrutu) +* [@jpkrohling](https://github.com/jpkrohling) +* [@dashpole](https://github.com/dashpole) +* [@TylerHelmuth](https://github.com/TylerHelmuth) + +Whenever a sponsor is picked from the top of this list, please move them to the bottom. + +## Adding metrics to existing receivers +Following these steps for contributing additional metrics to existing receivers. + - Read instructions [here](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CONTRIBUTING.md#fork) on how to + fork, build and create PRs. The only difference is to change repository name from `opentelemetry-collector` to `opentelemetry-collector-contrib` + - Edit `metadata.yaml` of your metrics receiver to add new metrics, e.g.: `redisreceiver/metadata.yaml` + - To generate new metrics on top of this updated YAML file. + - Run `cd receiver/redisreceiver` + - Run `go generate ./...` +- Review the changed files and merge the changes into your forked repo. +- Create PR from Github web console following the instructions above. + +## General Recommendations +Below are some recommendations that apply to typical components. These are not rigid rules and there are exceptions but +in general try to follow them. + +- Avoid introducing batching, retries or worker pools directly on receivers and exporters. Typically, these are general + cases that can be better handled via processors (that also can be reused by other receivers and exporters). +- When implementing exporters try to leverage the exporter helpers from the core repo, see [exporterhelper + package](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/exporterhelper). This will + ensure that the exporter provides [zPages](https://opencensus.io/zpages/) and a standard set of metrics. +- `replace` statements in `go.mod` files can be automatically inserted by running `make crosslink`. For more information + on the `crosslink` tool see the README [here](https://github.com/open-telemetry/opentelemetry-go-build-tools/tree/main/crosslink). + +## Issue Triaging + +To help provide a consistent process for seeing issues through to completion, this section details some guidelines and +definitions to keep in mind when triaging issues. + +### Roles + +Determining the root cause of issues is a shared responsibility between those with triager permissions, code owners, +OpenTelemetry community members, issue authors, and anyone else who would like to contribute. + +#### Triagers + +Contributors with [triager](https://github.com/open-telemetry/opentelemetry-collector-contrib/#contributing) permissions can help move +issues along by adding missing component labels, which help organize issues and trigger automations to notify code owners. They can +also use their familiarity with the Collector and its components to investigate issues themselves. Alternatively, they may point issue +authors to another resource or someone else who may know more. + +#### Code Owners + +In many cases, the code owners for an issue are the best resource to help determine the root cause of a bug or whether an enhancement +is fit to be added to a component. Code owners will be notified by repository automations when: + +- a component label is added to an issue +- an issue is opened +- the issue becomes stale + +Code owners may not have triager permissions on the repository, +so they can help triage through investigation and by participating in discussions. They can also help organize issues by +[adding labels via comments](#adding-labels-via-comments). + +#### Community Members + +Community members or interested parties are welcome to help triage issues by investigating the root cause of bugs, adding input for +features they would like to see, or participating in design discussions. + +### Triage process + +Triaging an issue requires getting the issue into a state where there is enough information available on the issue or understanding +between the involved parties to allow work to begin or for the issue to be closed. Facilitating this may involve, but is not limited to: + +- Determining whether the issue is related to the code or documentation, or whether the issue can be resolved without any changes. +- Ensuring that a bug can be reproduced, and if possible, the behavior can be traced back to the offending code or documentation. +- Determining whether a feature request belongs in a component, should be accomplished through other means, or isn't appropriate for a component at this time. +- Guiding any interested parties to another person or resource that may be more knowledgeable about an issue. +- Suggesting an issue for discussion at a SIG meeting if a synchronous discussion would be more productive. + +#### Issue assignment + +Issues are assigned for someone to work on by a triager when someone volunteers to work on an issue. Assignment is intended to prevent duplicate work by making it visible who is +working on a particular task. A person who is assigned to the issue may be assigned to help triage the issue and implement it, or can be assigned after the issue has already been +triaged and is ready for work. If someone who is assigned to an issue is no longer able to work on it, they may request to be unassigned from the issue. + +### Label Definitions + +| Label | When to apply | +| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `bug` | Something that is advertised or intended to work isn't working as expected. | +| `enhancement` | Something that isn't an advertised feature that would be useful to users or maintainers. | +| `flaky test` | A test unexpectedly failed during CI, showing that there is a problem with the tests or test setup that is causing the tests to intermittently fail. | +| `good first issue` | Implementing this issue would not require specialized or in-depth knowledge about the component and is ideal for a new or first-time contributor to take. | +| `help wanted` | The code owners for this component do not expect to have time to work on it soon, and would welcome help from contributors. | +| `discussion needed` | This issue needs more input from the maintainers or community before work can be started. | +| `needs triage` | This label is added automatically, and can be removed when a triager or code owner deems that an issue is either ready for work or should not need any work. | +| `waiting for author` | Can be applied when input is required from the author before the issue can move any further. | +| `priority:p0` | A critical security vulnerability or Collector panic using a default or common configuration unrelated to a specific component. | +| `priority:p1` | An urgent issue that should be worked on quickly, before most other issues. | +| `priority:p2` | A standard bug or enhancement. | +| `priority:p3` | A technical improvement, lower priority bug, or other minor issue. Generally something that is considered a "nice to have." | +| `release:blocker` | This issue must be resolved before the next Collector version can be released. | +| `Sponsor Needed` | A new component has been proposed, but implementation is not ready to begin. This can be because a sponsor has not yet been decided, or because some details on the component still need to be decided. | +| `Accepted Component` | A sponsor has elected to take on a component and implementation is ready to begin. | +| `Vendor Specific Component` | This should be applied to any component proposal where the functionality for the component is particular to a vendor. | + +### Adding Labels via Comments + +In order to facilitate proper label usage and to empower Code Owners, you are able to add labels to issues via comments. To add a label through a comment, post a new comment on an issue starting with `/label`, followed by a space-separated list of your desired labels. Supported labels come from the table below, or correspond to a component defined in the [CODEOWNERS file](.github/CODEOWNERS). + +The following general labels are supported: + +| Label | Label in Comment | +|----------------------|----------------------| +| `good first issue` | `good-first-issue` | +| `help wanted` | `help-wanted` | +| `discussion needed` | `discussion-needed` | +| `needs triage` | `needs-triage` | +| `waiting for author` | `waiting-for-author` | + +To delete a label, prepend the label with `-`. Note that you must make a new comment to modify labels; you cannot edit an existing comment. + +Example label comment: + +``` +/label receiver/prometheus help-wanted -exporter/prometheus +``` + +## 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, responding to issues, and reviewing pull requests. + +Sometimes a component may be in need of a new or additional Code Owner. A few reasons this situation may arise would be: +- The component was never assigned a Code Owner. +- A previous Code Owner stepped down. +- An existing Code Owner has become unresponsive. See [unmaintained stability status](https://github.com/open-telemetry/opentelemetry-collector#unmaintained). +- The existing Code Owners are actively looking for new Code Owners to help. + +If you would like to help and become a Code Owner you must meet the following requirements: + +1. [Be a member of the OpenTelemetry organization.](https://github.com/open-telemetry/community/blob/main/community-membership.md#member) +2. (Code Owner Discretion) It is best to have resolved an issue related to the component, contributed directly to the component, and/or review component PRs. How much interaction with the component is required before becoming a Code Owner is up to any existing Code Owners. + +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. + +To become a Code Owner, open a PR with the CODEOWNERS file modified, adding your GitHub username to the component's row. Be sure to tag the existing Code Owners, if any, within the PR to ensure they receive a notification. + +### Makefile Guidelines + +When adding or modifying the `Makefile`'s in this repository, consider the following design guidelines. + +Make targets are organized according to whether they apply to the entire repository, or only to an individual module. +The [Makefile](./Makefile) SHOULD contain "repo-level" targets. (i.e. targets that apply to the entire repo.) +Likewise, `Makefile.Common` SHOULD contain "module-level" targets. (i.e. targets that apply to one module at a time.) +Each module should have a `Makefile` at its root that includes `Makefile.Common`. + +#### Module-level targets + +Module-level targets SHOULD NOT act on nested modules. For example, running `make lint` at the root of the repo will +*only* evaluate code that is part of the `go.opentelemetry.io/collector` module. This excludes nested modules such as +`go.opentelemetry.io/collector/component`. + +Each module-level target SHOULD have a corresponding repo-level target. For example, `make golint` will run `make lint` +in each module. In this way, the entire repository is covered. The root `Makefile` contains some "for each module" targets +that can wrap a module-level target into a repo-level target. + +#### Repo-level targets + +Whenever reasonable, targets SHOULD be implemented as module-level targets (and wrapped with a repo-level target). +However, there are many valid justifications for implementing a standalone repo-level target. + +1. The target naturally applies to the repo as a whole. (e.g. Building the collector.) +2. Interaction between modules would be problematic. +3. A necessary tool does not provide a mechanism for scoping its application. (e.g. `porto` cannot be limited to a specific module.) +4. The "for each module" pattern would result in incomplete coverage of the codebase. (e.g. A target that scans all file, not just `.go` files.) + +#### Default targets + +The default module-level target (i.e. running `make` in the context of an individual module), should run a substantial set of module-level +targets for an individual module. Ideally, this would include *all* module-level targets, but exceptions should be made if a particular +target would result in unacceptable latency in the local development loop. + +The default repo-level target (i.e. running `make` at the root of the repo) should meaningfully validate the entire repo. This should include +running the default common target for each module as well as additional repo-level targets. diff --git a/Makefile b/Makefile index 9562d95f6f7f..1bbed1fce597 100644 --- a/Makefile +++ b/Makefile @@ -288,6 +288,22 @@ chlog-preview: $(CHLOGGEN) chlog-update: $(CHLOGGEN) $(CHLOGGEN) update --config $(CHLOGGEN_CONFIG) --version $(VERSION) +.PHONY: chlog-new-aws +chlog-new-aws: $(CHLOGGEN) + $(CHLOGGEN) new --config $(CHLOGGEN_CONFIG_AWS) --filename $(FILENAME) + +.PHONY: chlog-validate-aws +chlog-validate-aws: $(CHLOGGEN) + $(CHLOGGEN) validate --config $(CHLOGGEN_CONFIG_AWS) + +.PHONY: chlog-preview-aws +chlog-preview-aws: $(CHLOGGEN) + $(CHLOGGEN) update --config $(CHLOGGEN_CONFIG_AWS) --dry + +.PHONY: chlog-update-aws +chlog-update-aws: $(CHLOGGEN) + $(CHLOGGEN) update --config $(CHLOGGEN_CONFIG_AWS) --version $(VERSION) + .PHONY: genotelcontribcol genotelcontribcol: $(BUILDER) $(BUILDER) --skip-compilation --config cmd/otelcontribcol/builder-config.yaml --output-path cmd/otelcontribcol diff --git a/Makefile.Common b/Makefile.Common index 8f76bf502522..4fdf70af0b5f 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -35,6 +35,7 @@ TOOLS_PKG_NAMES := $(shell grep -E $(TOOLS_MOD_REGEX) < $(TOOLS_MOD_DIR)/tools. TOOLS_BIN_DIR := $(SRC_ROOT)/.tools TOOLS_BIN_NAMES := $(addprefix $(TOOLS_BIN_DIR)/, $(notdir $(TOOLS_PKG_NAMES))) CHLOGGEN_CONFIG := .chloggen/config.yaml +CHLOGGEN_CONFIG_AWS := .chloggen-aws/config.yaml .PHONY: install-tools install-tools: $(TOOLS_BIN_NAMES) From b47fa4237416d7fe0f61b6389cc7dad99ebbbc4c Mon Sep 17 00:00:00 2001 From: Bhanu Bandi <bhanuba@amazon.com> Date: Thu, 19 Oct 2023 12:17:51 -0400 Subject: [PATCH 2/9] added issue in yaml --- .chloggen-aws/changelog-aws.yaml | 2 +- .chloggen-aws/changelog-aws1.yaml | 29 ----------------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100755 .chloggen-aws/changelog-aws1.yaml diff --git a/.chloggen-aws/changelog-aws.yaml b/.chloggen-aws/changelog-aws.yaml index cb97069a7346..83fc45a14940 100755 --- a/.chloggen-aws/changelog-aws.yaml +++ b/.chloggen-aws/changelog-aws.yaml @@ -10,7 +10,7 @@ component: changelog note: "Added a chloggen for cwa" # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [] +issues: [125] # (Optional) One or more lines of additional information to render under the primary note. # These lines will be padded with 2 spaces and then inserted directly into the document. diff --git a/.chloggen-aws/changelog-aws1.yaml b/.chloggen-aws/changelog-aws1.yaml deleted file mode 100755 index 6fcdd103ae06..000000000000 --- a/.chloggen-aws/changelog-aws1.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: 'new_component' - -# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver) -component: changelog - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "Added a chloggen for cwa" - -# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [] - -# (Optional) One or more lines of additional information to render under the primary note. -# These lines will be padded with 2 spaces and then inserted directly into the document. -# Use pipe (|) for multiline entries. -subtext: Added a new changelog directory that stores the changelog yaml files created by the cwa team with (make chlog-new-aws) - Added a new CHANGELOG-AWS.md file for cwa team. - make chlog-update-aws will update the CHANGELOG-AWS.md file with the .chloggen-aws files and delete the .chloggen-aws directory yaml after updating. - -# If your change doesn't affect end users or the exported elements of any package, -# you should instead start your pull request title with [chore] or use the "Skip Changelog" label. -# Optional: The change log or logs in which this entry should be included. -# e.g. '[user]' or '[user, api]' -# Include 'user' if the change is relevant to end users. -# Include 'api' if there is a change to a library API. -# Default: '[user]' -change_logs: [aws] \ No newline at end of file From 59f0f77b475acd56fa575f0880a19ec2cc6f7d72 Mon Sep 17 00:00:00 2001 From: Bhanu Bandi <bhanuba@amazon.com> Date: Thu, 19 Oct 2023 12:21:19 -0400 Subject: [PATCH 3/9] added issue in yaml --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 5127645a5fcc..305eff385f58 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -10,7 +10,7 @@ on: types: [opened, synchronize, reopened, labeled, unlabeled] branches: - main - - branches/** + - * env: # Make sure to exit early if cache segment download times out after 2 minutes. From 9147506e7663c2263a694bcb695c717dd53fc430 Mon Sep 17 00:00:00 2001 From: Bhanu Bandi <bhanuba@amazon.com> Date: Thu, 19 Oct 2023 12:23:18 -0400 Subject: [PATCH 4/9] added issue in yaml --- .github/workflows/changelog.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 305eff385f58..f830f5c08092 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -10,8 +10,6 @@ on: types: [opened, synchronize, reopened, labeled, unlabeled] branches: - main - - * - env: # Make sure to exit early if cache segment download times out after 2 minutes. # We limit cache download as a whole to 5 minutes. From cb5a7917b21aedfcce15b6e892cd622b13681490 Mon Sep 17 00:00:00 2001 From: Bhanu Bandi <bhanuba@amazon.com> Date: Thu, 19 Oct 2023 12:32:12 -0400 Subject: [PATCH 5/9] edited the changelog.yml trigger --- .github/workflows/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index f830f5c08092..2747b718f602 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -9,7 +9,7 @@ on: pull_request: types: [opened, synchronize, reopened, labeled, unlabeled] branches: - - main + - aws-cwa-dev env: # Make sure to exit early if cache segment download times out after 2 minutes. # We limit cache download as a whole to 5 minutes. From 6edbcb3eced456bd91b0cea320256c7bec1149de Mon Sep 17 00:00:00 2001 From: Bhanu Bandi <bhanuba@amazon.com> Date: Thu, 19 Oct 2023 12:40:18 -0400 Subject: [PATCH 6/9] edited the changelog.yml trigger --- .github/workflows/changelog.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 2747b718f602..c7180c166783 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -61,7 +61,6 @@ jobs: run: | if [[ 1 -gt $(git diff --diff-filter=A --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD ./.chloggen-aws | grep -c \\.yaml) ]] then - ls ./.chloggen-aws echo "No changelog entry was added to the ./.chloggen-aws/ directory." echo "Please add a .yaml file to the ./.chloggen-aws/ directory." echo "See CONTRIBUTING-AWS.md for more details." @@ -77,7 +76,6 @@ jobs: make chlog-validate-aws \ || { echo "New ./.chloggen-aws/*.yaml file failed validation."; exit 1; } - # In order to validate any links in the yaml file, render the config to markdown - name: Render .chloggen changelog entries if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}} From 7135c132b3a64ab7a94dab8900c070382949e681 Mon Sep 17 00:00:00 2001 From: Bhanu Bandi <bhanuba@amazon.com> Date: Mon, 23 Oct 2023 16:27:26 -0400 Subject: [PATCH 7/9] added the auto changelog update --- .github/workflows/changelog-update.yml | 0 .github/workflows/prepare-release-cwa-aws.yml | 38 ----------- .../release-prepare-release-cwa-aws.sh | 65 ------------------- 3 files changed, 103 deletions(-) create mode 100644 .github/workflows/changelog-update.yml delete mode 100644 .github/workflows/prepare-release-cwa-aws.yml delete mode 100755 .github/workflows/scripts/release-prepare-release-cwa-aws.sh diff --git a/.github/workflows/changelog-update.yml b/.github/workflows/changelog-update.yml new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/.github/workflows/prepare-release-cwa-aws.yml b/.github/workflows/prepare-release-cwa-aws.yml deleted file mode 100644 index c0a118e05fda..000000000000 --- a/.github/workflows/prepare-release-cwa-aws.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Automation - Prepare Release - -on: - workflow_dispatch: - # Determine the version number that will be assigned to the release. During the beta phase, we increment - # the minor version number and set the patch number to 0. - inputs: - candidate-beta: - required: true - description: Release candidate version (beta, like 0.70.0) - - current-beta: - required: true - description: Current version (beta, like 0.69.1) -jobs: - # Releasing opentelemetry-collector-contrib - prepare-release: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - repository: 'open-telemetry/opentelemetry-collector' - path: opentelemetry-collector - - uses: actions/checkout@v4 - with: - path: opentelemetry-collector-contrib - - uses: actions/setup-go@v4 - with: - go-version: ~1.20.8 - cache: false - - name: Prepare release for contrib - working-directory: opentelemetry-collector-contrib - env: - GITHUB_TOKEN: ${{ secrets.OPENTELEMETRYBOT_GITHUB_TOKEN }} - REPO: open-telemetry/opentelemetry-collector-contrib - CANDIDATE_BETA: ${{ inputs.candidate-beta }} - CURRENT_BETA: ${{ inputs.current-beta }} - run: ./.github/workflows/scripts/release-prepare-release-cwa-aws.sh diff --git a/.github/workflows/scripts/release-prepare-release-cwa-aws.sh b/.github/workflows/scripts/release-prepare-release-cwa-aws.sh deleted file mode 100755 index 498d3045d1c8..000000000000 --- a/.github/workflows/scripts/release-prepare-release-cwa-aws.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -ex - -# Copyright The OpenTelemetry Authors -# SPDX-License-Identifier: Apache-2.0 - -PATTERN="^[0-9]+\.[0-9]+\.[0-9]+.*" -if ! [[ ${CURRENT_BETA} =~ $PATTERN ]] -then - echo "CURRENT_BETA should follow a semver format and not be led by a v" - exit 1 -fi - -if ! [[ ${CANDIDATE_BETA} =~ $PATTERN ]] -then - echo "CANDIDATE_BETA should follow a semver format and not be led by a v" - exit 1 -fi - -make chlog-update-aws VERSION="v${CANDIDATE_BETA}" -git config user.name opentelemetrybot -git config user.email 107717825+opentelemetrybot@users.noreply.github.com - -BRANCH="prepare-release-prs/${CANDIDATE_BETA}" -git checkout -b "${BRANCH}" -git add --all -git commit -m "changelog update ${CANDIDATE_BETA}" - -sed -i.bak "s/${CURRENT_BETA}/${CANDIDATE_BETA}/g" versions.yaml -find . -name "*.bak" -type f -delete -git add versions.yaml -git commit -m "update version.yaml ${CANDIDATE_BETA}" - -sed -i.bak "s/v${CURRENT_BETA}/v${CANDIDATE_BETA}/g" ./cmd/oteltestbedcol/builder-config.yaml -sed -i.bak "s/v${CURRENT_BETA}/v${CANDIDATE_BETA}/g" ./cmd/otelcontribcol/builder-config.yaml -sed -i.bak "s/${CURRENT_BETA}-dev/${CANDIDATE_BETA}-dev/g" ./cmd/otelcontribcol/builder-config.yaml -sed -i.bak "s/${CURRENT_BETA}-dev/${CANDIDATE_BETA}-dev/g" ./cmd/oteltestbedcol/builder-config.yaml - -find . -name "*.bak" -type f -delete -make genotelcontribcol -make genoteltestbedcol -git add . -git commit -m "builder config changes ${CANDIDATE_BETA}" || (echo "no builder config changes to commit") - -make multimod-prerelease -git add . -git commit -m "make multimod-prerelease changes ${CANDIDATE_BETA}" || (echo "no multimod changes to commit") - -make multimod-sync -git add . -git commit -m "make multimod-sync changes ${CANDIDATE_BETA}" || (echo "no multimod changes to commit") - -make gotidy -git add . -git commit -m "make gotidy changes ${CANDIDATE_BETA}" || (echo "no gotidy changes to commit") -make otelcontribcol - -git push origin "${BRANCH}" - -gh pr create --title "[chore] Prepare release ${CANDIDATE_BETA}" --body " -The following commands were run to prepare this release: -- make chlog-update VERSION=v${CANDIDATE_BETA} -- sed -i.bak s/${CURRENT_BETA}/${CANDIDATE_BETA}/g versions.yaml -- make multimod-prerelease -- make multimod-sync -" From a4f86a5c721762a0301fb39e124ae146ee51315a Mon Sep 17 00:00:00 2001 From: Bhanu Bandi <bhanuba@amazon.com> Date: Mon, 23 Oct 2023 16:42:24 -0400 Subject: [PATCH 8/9] updated the changelog-update --- .github/workflows/changelog-update.yml | 47 ++++++++++++++++++++++++++ .github/workflows/changelog.yml | 2 +- CONTRIBUTING-AWS.md | 3 +- Makefile | 2 +- 4 files changed, 50 insertions(+), 4 deletions(-) diff --git a/.github/workflows/changelog-update.yml b/.github/workflows/changelog-update.yml index e69de29bb2d1..2dbecdd0a9bf 100644 --- a/.github/workflows/changelog-update.yml +++ b/.github/workflows/changelog-update.yml @@ -0,0 +1,47 @@ +name: Update changelog + +on: + pull_request_review: + types: [ submitted ] +jobs: + update: + runs-on: ubuntu-latest + + permissions: + # Give the default GITHUB_TOKEN write permission to commit and push the + # updated CHANGELOG-AWS.md back to the repository. + # https://github.blog/changelog/2023-02-02-github-actions-updating-the-default-github_token-permissions-to-read-only/ + contents: write + steps: + - name: Checkout action + uses: actions/checkout@v3 + - name : checkout + run : | + git config --global user.name 'Github Action' + git config --global user.email 'action@github.com' + - name: Set up Go 1.x + uses: actions/setup-go@v4 + with: + go-version: ~1.21.1 + cache: false + - name: make update changelog + run: make chlog-update-aws + - name: switching from HTTPS to SSH + run: git remote set-url origin https://github.com/amazon-contributing/opentelemetry-collector-contrib.git + - name: check for changes + run: | + git branch + git status + - name: stage changed files + run: git add ./CHANGELOG-AWS.md + - name: commit changed files + run: | + git config --global user.name 'Github Action' + git config --global user.email 'action@github.com' + git commit -m "Auto updating changelog-aws.md" + - name: pull from master + run: | + git remote -v + git pull + - name: push code to aws-cwa-dev + run: git push origin aws-cwa-dev diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index c7180c166783..8e6b507beb09 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -1,4 +1,4 @@ -# This action requires that any PR targeting the main branch should add a +# This action requires that any PR targeting the aws-cwa-dev branch should add a # yaml file to the ./.chloggen/ directory. If a CHANGELOG entry is not required, # or if performing maintance on the Changelog, add either \"[chore]\" to the title of # the pull request or add the \"Skip Changelog\" label to disable this action. diff --git a/CONTRIBUTING-AWS.md b/CONTRIBUTING-AWS.md index b765e997980e..bc356d4bb660 100644 --- a/CONTRIBUTING-AWS.md +++ b/CONTRIBUTING-AWS.md @@ -48,8 +48,7 @@ The [CHANGELOG-AWS.md](./CHANGELOG-AWS.md) files in this repo is autogenerated f The name of your file must be unique since the last release. -During the collector release process, all `./chloggen-aws/*.yaml` files are transcribed into `CHANGELOG-aws.md` and then deleted. - +Once the PR has been approved and submitted the changelog-update.yml gets auto trigger to update the changelog-aws.md file. **Recommended Steps** 1. Create an entry file using `make chlog-new-aws`. This generates a file based on your current branch (e.g. `./.chloggen-aws/my-branch.yaml`) 2. Fill in all fields in the new file diff --git a/Makefile b/Makefile index 1bbed1fce597..0244e87cbeeb 100644 --- a/Makefile +++ b/Makefile @@ -302,7 +302,7 @@ chlog-preview-aws: $(CHLOGGEN) .PHONY: chlog-update-aws chlog-update-aws: $(CHLOGGEN) - $(CHLOGGEN) update --config $(CHLOGGEN_CONFIG_AWS) --version $(VERSION) + $(CHLOGGEN) update --config $(CHLOGGEN_CONFIG_AWS) --version `date +'%y.%m.%d %H:%M:%S'` .PHONY: genotelcontribcol genotelcontribcol: $(BUILDER) From a7bede20aef0697a1598c092d40824d0e860bf71 Mon Sep 17 00:00:00 2001 From: Bhanu Bandi <bhanuba@amazon.com> Date: Mon, 23 Oct 2023 17:11:12 -0400 Subject: [PATCH 9/9] updated according to PR --- .github/workflows/changelog-update.yml | 5 +++-- CHANGELOG-AWS.md | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/changelog-update.yml b/.github/workflows/changelog-update.yml index 2dbecdd0a9bf..4c954ec340d0 100644 --- a/.github/workflows/changelog-update.yml +++ b/.github/workflows/changelog-update.yml @@ -1,8 +1,9 @@ name: Update changelog on: - pull_request_review: - types: [ submitted ] + pull_request: + types: + - closed jobs: update: runs-on: ubuntu-latest diff --git a/CHANGELOG-AWS.md b/CHANGELOG-AWS.md index 1bd0a2a9c393..a6b0dce15605 100644 --- a/CHANGELOG-AWS.md +++ b/CHANGELOG-AWS.md @@ -3,7 +3,7 @@ # GO AWS cloudwatch agent Changelog This changelog includes only clodwatch agent developer-facing changes. -Please checkout contributing file [CONTRIBUTING.md](./CONTRIBUTING.md) +Please checkout contributing file [CONTRIBUTING-AWS.md](./CONTRIBUTING-AWS.md) <!-- next version -->