Skip to content

Commit

Permalink
Merge branch 'main' into add_k8s_components_ownership
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrsMark authored Dec 6, 2024
2 parents aad5e8c + d797bf5 commit 6eab588
Show file tree
Hide file tree
Showing 49 changed files with 1,121 additions and 162 deletions.
27 changes: 27 additions & 0 deletions .chloggen/add_doris_to_build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 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: dorisexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Mark the Doris exporter as Alpha.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [33479]

# (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:

# 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: [user]
27 changes: 27 additions & 0 deletions .chloggen/exporter_prometheusremotewriteexporter_exemplar-int.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: exporter/prometheusremotewrite

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fix exemplar handling when the exemplar is an integer value.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [36657]

# (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: Send metrics with exemplars as integer values now are correctly handled.

# 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: [user]
27 changes: 27 additions & 0 deletions .chloggen/split-emf-log-when-buckets-larger-than-100.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: awsemfexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Split EMF log to multiple log splits when buckets larger than 100.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [242]

# (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:

# 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: []
2 changes: 1 addition & 1 deletion .github/workflows/add-codeowners-to-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
add-owners-to-pr:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor != 'dependabot[bot]' && github.repository_owner == 'open-telemetry' }}
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/add-labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
add-labels:
if: ${{ !github.event.issue.pull_request && startsWith(github.event.comment.body, '/label') && github.repository_owner == 'open-telemetry' }}

runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/auto-assign-owners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ concurrency:

jobs:
add-owner:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor != 'dependabot[bot]' }}
steps:
- name: run
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/auto-update-jmx-metrics-component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:

jobs:
check-versions:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
outputs:
latest-version: ${{ steps.check-versions.outputs.latest-version }}
already-added: ${{ steps.check-versions.outputs.already-added }}
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
echo "already-opened=$already_opened" >> $GITHUB_OUTPUT
update-jmx-metrics-component:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: |
needs.check-versions.outputs.already-added != 'true' &&
needs.check-versions.outputs.already-opened != 'true'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
run: make -j2 gotest GROUP=${{ matrix.group }}
arm-unittest:
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [arm-unittest-matrix]
steps:
- name: Print result
Expand Down
45 changes: 20 additions & 25 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ concurrency:
jobs:
setup-environment:
timeout-minutes: 30
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor != 'dependabot[bot]' }}
steps:
- uses: actions/checkout@v4
Expand All @@ -45,15 +45,15 @@ jobs:
if: steps.go-cache.outputs.cache-hit != 'true'
run: make install-tools
check-collector-module-version:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
- run: make genotelcontribcol
- name: Check Collector Module Version
run: ./.github/workflows/scripts/check-collector-module-version.sh
check-codeowners:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
- cmd-0
- cmd-1
- other
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
run: GOOS=${{ matrix.goos }} GOARCH=amd64 make -j2 golint GROUP=${{ matrix.group }}
lint:
if: ${{ github.actor != 'dependabot[bot]' && always() }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment, lint-matrix]
steps:
- name: Print result
Expand Down Expand Up @@ -156,7 +156,7 @@ jobs:
- pkg
- cmd-0
- cmd-1
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
timeout-minutes: 30
steps:
- name: Checkout Repo
Expand All @@ -182,7 +182,7 @@ jobs:
- name: Run `govulncheck`
run: make -j2 gogovulncheck GROUP=${{ matrix.group }}
checks:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -229,11 +229,6 @@ jobs:
run: |
make gendistributions
git diff -s --exit-code || (echo 'Generated code is out of date, please run "make gendistributions" and commit the changes in this PR.' && exit 1)
- name: Gen CODEOWNERS
if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) && github.repository == 'open-telemetry/opentelemetry-collector-contrib'
run: |
GITHUB_TOKEN=${{ secrets.READ_ORG_AND_USER_TOKEN }} make gengithub
git diff -s --exit-code || (echo 'Generated code is out of date, please apply this diff and commit the changes in this PR.' && git diff && exit 1)
- name: CodeGen
run: |
make -j2 generate
Expand All @@ -252,7 +247,7 @@ jobs:
fail-fast: false
matrix:
go-version: ["1.23.0", "1.22.8"] # 1.20 is interpreted as 1.2 without quotes
runner: [ubuntu-latest]
runner: [ubuntu-24.04]
group:
- receiver-0
- receiver-1
Expand Down Expand Up @@ -313,7 +308,7 @@ jobs:
path: ${{ matrix.group }}-coverage.txt
unittest:
if: ${{ github.actor != 'dependabot[bot]' && always() }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment, unittest-matrix]
steps:
- name: Print result
Expand All @@ -328,7 +323,7 @@ jobs:
false
fi
coverage:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [unittest]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -362,7 +357,7 @@ jobs:
- pkg
- cmd-0
- cmd-1
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand All @@ -385,7 +380,7 @@ jobs:

integration-tests:
if: ${{ github.actor != 'dependabot[bot]' && always() }}
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment, integration-tests-matrix]
steps:
- name: Print result
Expand All @@ -401,7 +396,7 @@ jobs:
fi
correctness-traces:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand All @@ -428,7 +423,7 @@ jobs:
- name: Correctness
run: make -C testbed run-correctness-traces-tests
correctness-metrics:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -456,7 +451,7 @@ jobs:
run: make -C testbed run-correctness-metrics-tests

build-examples:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
Expand All @@ -465,7 +460,7 @@ jobs:
run: make build-examples

cross-compile:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [setup-environment]
strategy:
fail-fast: false
Expand Down Expand Up @@ -535,7 +530,7 @@ jobs:
path: ./bin/*

publish-check:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [lint, unittest, integration-tests]
steps:
- uses: actions/checkout@v4
Expand All @@ -549,7 +544,7 @@ jobs:
id: check
run: ./.github/workflows/scripts/verify-dist-files-exist.sh
publish-dev:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [lint, unittest, integration-tests]
if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) && github.repository == 'open-telemetry/opentelemetry-collector-contrib'
steps:
Expand Down Expand Up @@ -612,7 +607,7 @@ jobs:
docker push otel/opentelemetry-collector-contrib-dev:$GITHUB_SHA
docker push otel/opentelemetry-collector-contrib-dev:latest
publish-stable:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [lint, unittest, integration-tests]
if: startsWith(github.ref, 'refs/tags/v') && github.repository == 'open-telemetry/opentelemetry-collector-contrib'
steps:
Expand All @@ -630,7 +625,7 @@ jobs:
# This job updates the "next release" milestone
# to the latest released version and creates a new milestone
# named "next release" in its place
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [publish-stable]
if: startsWith(github.ref, 'refs/tags/v') && github.repository == 'open-telemetry/opentelemetry-collector-contrib'
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ concurrency:

jobs:
changelog:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
if: ${{ github.actor != 'dependabot[bot]' }}
env:
PR_HEAD: ${{ github.event.pull_request.head.sha }}
Expand Down
60 changes: 60 additions & 0 deletions .github/workflows/check-codeowners.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: codeowners
on:
push:
branches: [main]
tags:
- "v[0-9]+.[0-9]+.[0-9]+*"
pull_request_target:
types:
- opened
- synchronize
- edited
- reopened
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

# Do not cancel this workflow on main. See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/16616
concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
setup-environment:
timeout-minutes: 30
runs-on: ubuntu-latest
if: ${{ github.actor != 'dependabot[bot]' }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.22.8"
cache: false
- name: Cache Go
id: go-cache
timeout-minutes: 5
uses: actions/cache@v4
with:
path: |
~/go/bin
~/go/pkg/mod
./.tools
key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
check-codeowners:
runs-on: ubuntu-latest
needs: [setup-environment]
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v4
with:
ref: ${{github.event.pull_request.head.ref}}
repository: ${{github.event.pull_request.head.repo.full_name}}
path: pr
- name: Gen CODEOWNERS
if: github.repository == 'open-telemetry/opentelemetry-collector-contrib'
run: |
make githubgen-install
cd pr
GITHUB_TOKEN=${{ secrets.READ_ORG_AND_USER_TOKEN }} githubgen
git diff -s --exit-code || (echo 'Generated code is out of date, please apply this diff and commit the changes in this PR.' && git diff && exit 1)
Loading

0 comments on commit 6eab588

Please sign in to comment.