Skip to content

Commit 5f5c477

Browse files
Merge branch 'main' into components_cmd_add_providers
2 parents c23d264 + ffcef93 commit 5f5c477

File tree

168 files changed

+1613
-1520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+1613
-1520
lines changed
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: internal/sharedcomponent
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fixed bug where sharedcomponent would use too much memory remembering all the previously reported statuses
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [11826]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: []

.chloggen/pdata-1-5-0.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: pdata
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Upgrade pdata to opentelemetry-proto v1.5.0
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [11932]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [api]

.chloggen/profiles-pdata-1-5-0.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: pdata/pprofile
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove duplicate Attributes field from profile
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [11932]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [api]

.github/workflows/api-compatibility.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ on:
1010
branches:
1111
- main
1212

13-
permissions:
14-
contents: read
13+
permissions: read-all
1514

1615
jobs:
1716
Check-Compatibility:

.github/workflows/build-and-test-arm.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ env:
1313
# We limit cache download as a whole to 5 minutes.
1414
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
1515

16-
permissions:
17-
contents: read
16+
permissions: read-all
1817

1918
# Do not cancel this workflow on main. See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/16616
2019
concurrency:

.github/workflows/build-and-test-windows.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref_name }}
1313
cancel-in-progress: true
1414

15-
permissions:
16-
contents: read
15+
permissions: read-all
1716

1817
jobs:
1918
windows-unittest:

.github/workflows/build-and-test.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ on:
88
types: [checks_requested]
99
pull_request:
1010

11-
permissions:
12-
contents: read
11+
permissions: read-all
1312

1413
concurrency:
1514
group: ${{ github.workflow }}-${{ github.ref_name }}
@@ -169,7 +168,12 @@ jobs:
169168
key: unittest-${{ runner.os }}-${{ matrix.runner }}-go-build-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
170169
- name: Run Unit Tests
171170
run: |
172-
make -j4 gotest
171+
make -j4 gotest-with-junit
172+
- uses: actions/upload-artifact@v4
173+
with:
174+
name: test-results-${{ runner.os }}-${{ matrix.runner }}-${{ matrix.go-version }}
175+
path: internal/tools/testresults/
176+
retention-days: 4
173177
unittest:
174178
if: always()
175179
runs-on: ubuntu-latest
@@ -214,7 +218,7 @@ jobs:
214218
- name: Run Unit Tests With Coverage
215219
run: make gotest-with-cover
216220
- name: Upload coverage report
217-
uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # 5.1.1
221+
uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # 5.1.2
218222
env:
219223
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
220224

.github/workflows/builder-integration-test.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@ on:
1515

1616
# manual execution
1717
workflow_dispatch:
18-
18+
1919
merge_group:
2020
types: [checks_requested]
2121

2222
concurrency:
2323
group: ${{ github.workflow }}-${{ github.ref_name }}
2424
cancel-in-progress: true
2525

26-
permissions:
27-
contents: read
26+
permissions: read-all
2827

2928
jobs:
3029
integration-test:

.github/workflows/changelog.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,11 @@ concurrency:
1616
group: ${{ github.workflow }}-${{ github.ref_name }}
1717
cancel-in-progress: true
1818

19-
permissions:
20-
contents: read
19+
permissions: read-all
20+
21+
env:
22+
# renovate: datasource=github-releases depName=tcort/markdown-link-check
23+
MD_LINK_CHECK_VERSION: "3.12.2"
2124

2225
jobs:
2326
changelog:
@@ -79,7 +82,7 @@ jobs:
7982
- name: Render .chloggen changelog entries
8083
run: make chlog-preview > changelog_preview.md
8184
- name: Install markdown-link-check
82-
run: npm install
85+
run: npm install -g markdown-link-check@${{ env.MD_LINK_CHECK_VERSION }}
8386
- name: Run markdown-link-check
8487
run: |
8588
npx --no -- markdown-link-check \

.github/workflows/check-links.yaml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ concurrency:
1010
group: ${{ github.workflow }}-${{ github.ref_name }}
1111
cancel-in-progress: true
1212

13-
permissions:
14-
contents: read
13+
permissions: read-all
14+
15+
env:
16+
# renovate: datasource=github-releases depName=tcort/markdown-link-check
17+
MD_LINK_CHECK_VERSION: "3.12.2"
1518

1619
jobs:
1720
changedfiles:
@@ -29,13 +32,13 @@ jobs:
2932
- name: Get changed files
3033
id: changes
3134
run: |
32-
files=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main $PR_HEAD) $PR_HEAD | grep .md$ | xargs)
33-
34-
if [ -z "$files" ] && git diff --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD | grep -q "package.json"; then
35-
files="**/*.md"
36-
fi
35+
files=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main $PR_HEAD) $PR_HEAD | grep .md$ | xargs)
36+
37+
if [ -z "$files" ] && git diff --name-only $(git merge-base origin/main $PR_HEAD) $PR_HEAD | grep -q "package.json"; then
38+
files="**/*.md"
39+
fi
3740
38-
echo "files=$files" >> $GITHUB_OUTPUT
41+
echo "files=$files" >> $GITHUB_OUTPUT
3942
check-links:
4043
runs-on: ubuntu-latest
4144
needs: changedfiles
@@ -47,12 +50,12 @@ jobs:
4750
fetch-depth: 0
4851

4952
- name: Install markdown-link-check
50-
run: npm install
53+
run: npm install -g markdown-link-check@${{ env.MD_LINK_CHECK_VERSION }}
5154

5255
- name: Run markdown-link-check
5356
run: |
5457
npx --no -- markdown-link-check \
5558
--verbose \
5659
--config .github/workflows/check_links_config.json \
5760
${{needs.changedfiles.outputs.files}} \
58-
|| { echo "Check that anchor links are lowercase"; exit 1; }
61+
|| { echo "Check that anchor links are lowercase"; exit 1; }

0 commit comments

Comments
 (0)