Skip to content

Commit

Permalink
Merge branch 'main' into mx-psi/codeowner-requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
mx-psi authored Jan 8, 2025
2 parents a607b68 + 70fc33e commit 8b96cc9
Show file tree
Hide file tree
Showing 302 changed files with 4,680 additions and 2,635 deletions.
25 changes: 0 additions & 25 deletions .chloggen/fix-sharedcomponent-memory-issue.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/pdata-1-5-0.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/profiles-pdata-1-5-0.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions .chloggen/remove-connectorprofiles.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions .chloggen/remove-consumererrorprofiles.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions .chloggen/remove-consumerprofiles.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions .chloggen/remove-exporterhelperprofiles.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions .chloggen/remove-exporterprofiles.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions .chloggen/remove-pipelineprofiles.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions .chloggen/remove-processorhelperprofiles.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions .chloggen/remove-processorprofiles.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions .chloggen/remove-receiverprofiles.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/remove_net_interface_warn.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ exporter/nopexporter @open-telemetry/collector-approvers @evan-bradle
pdata/ @open-telemetry/collector-approvers @BogdanDrutu @dmitryax
receiver/nopreceiver @open-telemetry/collector-approvers @evan-bradley
service/internal/graph @open-telemetry/collector-approvers @djaglowski
extension/experimental/storage @open-telemetry/collector-approvers @swiatekm
extension/xextension @open-telemetry/collector-approvers @swiatekm

# Profiling-related modules
pdata/pprofile @open-telemetry/collector-approvers @mx-psi @dmathieu
Expand Down
11 changes: 11 additions & 0 deletions .github/lychee.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
include-fragments = true

accept = ["200..=299", "429"]

exclude = [
"^http(s)?://localhost",
"^http(s)?://example.com"
]

# better to be safe and avoid failures
max-retries = 6
12 changes: 10 additions & 2 deletions .github/workflows/build-and-test-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ permissions: read-all

jobs:
windows-unittest:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
os: [windows-2022, windows-2025]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Repo
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand All @@ -41,7 +45,11 @@ jobs:
run: make gotest

windows-service-test:
runs-on: windows-latest
strategy:
fail-fast: false
matrix:
os: [windows-2022, windows-2025]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout Repo
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ jobs:
- name: Run Unit Tests
run: |
make -j4 gotest-with-junit
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
with:
name: test-results-${{ runner.os }}-${{ matrix.runner }}-${{ matrix.go-version }}
path: internal/tools/testresults/
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
- name: Run Unit Tests With Coverage
run: make gotest-with-cover
- name: Upload coverage report
uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # 5.1.1
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # 5.1.2
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,8 @@ jobs:
# In order to validate any links in the yaml file, render the config to markdown
- name: Render .chloggen changelog entries
run: make chlog-preview > changelog_preview.md
- name: Install markdown-link-check
run: npm ci
- name: Run markdown-link-check
run: |
npx --no -- markdown-link-check \
--verbose \
--config .github/workflows/check_links_config.json \
changelog_preview.md \
|| { echo "Check that anchor links are lowercase"; exit 1; }
- name: Link Checker
id: lychee
uses: lycheeverse/lychee-action@f796c8b7d468feb9b8c0a46da3fac0af6874d374
with:
args: "--verbose --no-progress ./changelog_preview.md --config .github/lychee.toml"
19 changes: 9 additions & 10 deletions .github/workflows/check-links.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ concurrency:

permissions: read-all

env:
# renovate: datasource=github-releases depName=tcort/markdown-link-check
MD_LINK_CHECK_VERSION: "3.12.2"

jobs:
changedfiles:
name: changed files
Expand Down Expand Up @@ -45,13 +49,8 @@ jobs:
with:
fetch-depth: 0

- name: Install markdown-link-check
run: npm ci

- name: Run markdown-link-check
run: |
npx --no -- markdown-link-check \
--verbose \
--config .github/workflows/check_links_config.json \
${{needs.changedfiles.outputs.files}} \
|| { echo "Check that anchor links are lowercase"; exit 1; }
- name: Link Checker
id: lychee
uses: lycheeverse/lychee-action@f796c8b7d468feb9b8c0a46da3fac0af6874d374
with:
args: "--verbose --no-progress ${{needs.changedfiles.outputs.files}} --config .github/lychee.toml"
2 changes: 1 addition & 1 deletion .github/workflows/check-merge-freeze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# This condition is to avoid blocking the PR causing the freeze in the first place.
if: |
(!startsWith(github.event.pull_request.title || github.event.merge_group.head_commit.message, '[chore] Prepare release')) ||
(github.event.pull_request.user.login || github.event.merge_group.head_commit.author.name) != 'opentelemetrybot'
(!(github.event.pull_request.user.login == 'opentelemetrybot' || github.event.merge_group.head_commit.author.name == 'OpenTelemetry Bot'))
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
Expand Down
Loading

0 comments on commit 8b96cc9

Please sign in to comment.