Skip to content

Commit 12264df

Browse files
bchen528bchen528
committed
Merge branch 'becky/multi-bearer-support' of github.com:bchen528/opentelemetry-collector-contrib into becky/multi-bearer-support
2 parents 1da31b4 + 6707cc2 commit 12264df

File tree

710 files changed

+22211
-19179
lines changed

Some content is hidden

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

710 files changed

+22211
-19179
lines changed

‎.chloggen/firehose-encoding-extension.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: awsfirehosereceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add support for encoding extensions
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [37113]
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: Adds `encoding` config setting, and deprecates the `record_type` setting.
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

‎.chloggen/iisreceiver-add-application_pool-metrics.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: iisreceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Added state and uptime metrics for application pools
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [34924]
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+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

‎.chloggen/improve-log-transformers-logs.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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. filelogreceiver)
7+
component: pkg/stanza
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add entry's timestamp and attributes to errors logs from log transformers processors
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [37285]
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+
When a log transformer processor fails to process an log entry it will include entry's timestamp and attributes in its own logs.
20+
With this information the user can more easily identify the log file and find the entry that's having issues.
21+
22+
# If your change doesn't affect end users or the exported elements of any package,
23+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
24+
# Optional: The change log or logs in which this entry should be included.
25+
# e.g. '[user]' or '[user, api]'
26+
# Include 'user' if the change is relevant to end users.
27+
# Include 'api' if there is a change to a library API.
28+
# Default: '[user]'
29+
change_logs: [user]

‎.chloggen/kubeadm-uid.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: processor/resourcedetection
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Add k8s.cluster.uid to kubeadm detector"
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [38207]
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+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

‎.chloggen/pkg-datadog-static-api-key-validation.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: pkg/datadog
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: StaticAPIKeyCheck available in pkg/datadog to validate Datadog api is key not empty and no invalid characters
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [38223]
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: refactor of existing logic for export
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [api]

‎.chloggen/s3provider-mdatagen.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: confmap/provider/s3
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Promote to alpha stability
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [38227]
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+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

‎.chloggen/statsd-public-config.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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. filelogreceiver)
7+
component: receiver/statsd
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Make all types within the config struct public
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [38186]
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: This allows programmatically generating the receiver's config using the module's public types.
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [api]

‎.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ processor/k8sattributesprocessor/ @open-telemetry
187187
processor/logdedupprocessor/ @open-telemetry/collector-contrib-approvers @MikeGoldsmith @djaglowski
188188
processor/logstransformprocessor/ @open-telemetry/collector-contrib-approvers @dehaansa
189189
processor/metricsgenerationprocessor/ @open-telemetry/collector-contrib-approvers @Aneurysm9
190-
processor/metricstarttimeprocessor/ @open-telemetry/collector-contrib-approvers @dashpole
190+
processor/metricstarttimeprocessor/ @open-telemetry/collector-contrib-approvers @dashpole @ridwanmsharif
191191
processor/metricstransformprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax
192192
processor/probabilisticsamplerprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling @jmacd
193193
processor/redactionprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax @mx-psi @TylerHelmuth

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

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,6 @@ jobs:
6868
run: make install-tools
6969
- name: Run Unit Tests
7070
run: make -j2 gotest GROUP=${{ matrix.group }}
71-
- name: Run Unit Tests With JUnit and Coverage
72-
run: make gotest-with-junit-and-cover GROUP=${{ matrix.group }}
73-
- uses: actions/upload-artifact@v4
74-
with:
75-
name: test-results-${{ runner.os }}-${{ matrix.group }}
76-
path: internal/tools/testresults/
77-
retention-days: 4
7871
arm-unittest:
7972
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
8073
runs-on: ubuntu-24.04
@@ -91,27 +84,3 @@ jobs:
9184
echo "One or more matrix jobs failed."
9285
false
9386
fi
94-
95-
arm-flakytests-generate-issues:
96-
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
97-
runs-on: ubuntu-24.04
98-
needs: [arm-unittest-matrix]
99-
steps:
100-
- uses: actions/checkout@v4
101-
- uses: actions/download-artifact@v4
102-
with:
103-
merge-multiple: true
104-
pattern: test-results-*
105-
path: ./internal/tools/testresults/
106-
- name: Install Tools
107-
run: make install-tools
108-
- name: Generate Issues
109-
run: |
110-
# We want to start by generating issues of a single component
111-
# As we mature the usage of issuegenerator, we can extend it to
112-
# generate issues for multiple components.
113-
#
114-
# We'll start with the hostmetricsreceiver.
115-
mkdir -p ./internal/tools/testresults/hostmetricsreceiver
116-
mv ./internal/tools/testresults/github.spider-man.dpdns.org-open-telemetry-opentelemetry-collector-contrib-receiver-hostmetricsreceiver-junit.xml ./internal/tools/testresults/hostmetricsreceiver/
117-
./tools/issuegenerator -path ./internal/tools/testresults/hostmetricsreceiver/

‎.github/workflows/build-and-test-darwin.yaml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,6 @@ jobs:
8282
run: unzip testbinaries.zip
8383
- name: Run Unit Tests
8484
run: make -j2 gorunbuilttest GROUP=cgo
85-
- name: Run Unit Tests With JUnit and Coverage
86-
run: make gotest-with-junit-and-cover
87-
- uses: actions/upload-artifact@v4
88-
with:
89-
name: test-results-${{ runner.os }}
90-
path: internal/tools/testresults/
91-
retention-days: 4
9285
darwin-unittest:
9386
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Darwin') || github.event_name == 'push' || github.event_name == 'merge_group') }}
9487
runs-on: macos-latest
@@ -105,26 +98,3 @@ jobs:
10598
echo "One or more matrix jobs failed."
10699
false
107100
fi
108-
darwin-flakytests-generate-issues:
109-
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
110-
runs-on: ubuntu-24.04
111-
needs: [darwin-unittest-matrix]
112-
steps:
113-
- uses: actions/checkout@v4
114-
- uses: actions/download-artifact@v4
115-
with:
116-
merge-multiple: true
117-
pattern: test-results-*
118-
path: ./internal/tools/testresults/
119-
- name: Install Tools
120-
run: make install-tools
121-
- name: Generate Issues
122-
run: |
123-
# We want to start by generating issues of a single component
124-
# As we mature the usage of issuegenerator, we can extend it to
125-
# generate issues for multiple components.
126-
#
127-
# We'll start with the hostmetricsreceiver.
128-
mkdir -p ./internal/tools/testresults/hostmetricsreceiver
129-
mv ./internal/tools/testresults/github.spider-man.dpdns.org-open-telemetry-opentelemetry-collector-contrib-receiver-hostmetricsreceiver-junit.xml ./internal/tools/testresults/hostmetricsreceiver/
130-
./tools/issuegenerator -path ./internal/tools/testresults/hostmetricsreceiver/

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

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,6 @@ jobs:
7979
run: make "$(${PWD} -replace '\\', '/')/.tools/gotestsum"
8080
- name: Run Unit tests
8181
run: make -j2 gotest GROUP=${{ matrix.group }}
82-
- name: Run Unit Tests With JUnit and Coverage
83-
run: make gotest-with-junit-and-cover GROUP=${{ matrix.group }}
84-
- uses: actions/upload-artifact@v4
85-
with:
86-
name: test-results-${{ runner.os }}-${{ matrix.group }}
87-
path: internal/tools/testresults/
88-
retention-days: 4
8982
windows-unittest:
9083
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push' || github.event_name == 'merge_group') }}
9184
runs-on: windows-latest
@@ -103,27 +96,3 @@ jobs:
10396
echo "One or more matrix jobs failed."
10497
false
10598
fi
106-
107-
windows-flakytests-generate-issues:
108-
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
109-
runs-on: ubuntu-24.04
110-
needs: [windows-unittest-matrix]
111-
steps:
112-
- uses: actions/checkout@v4
113-
- uses: actions/download-artifact@v4
114-
with:
115-
merge-multiple: true
116-
pattern: test-results-*
117-
path: ./internal/tools/testresults/
118-
- name: Install Tools
119-
run: make install-tools
120-
- name: Generate Issues
121-
run: |
122-
# We want to start by generating issues of a single component
123-
# As we mature the usage of issuegenerator, we can extend it to
124-
# generate issues for multiple components.
125-
#
126-
# We'll start with the hostmetricsreceiver.
127-
mkdir -p ./internal/tools/testresults/hostmetricsreceiver
128-
mv ./internal/tools/testresults/github.spider-man.dpdns.org-open-telemetry-opentelemetry-collector-contrib-receiver-hostmetricsreceiver-junit.xml ./internal/tools/testresults/hostmetricsreceiver/
129-
./tools/issuegenerator -path ./internal/tools/testresults/hostmetricsreceiver/

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

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -286,22 +286,31 @@ jobs:
286286
path: ~/.cache/go-build
287287
key: go-test-build-${{ runner.os }}-${{ matrix.go-version }}-${{ matrix.runner }}-${{ hashFiles('**/go.sum') }}
288288
- name: Run Unit Tests
289-
if: startsWith( matrix.go-version, '1.23' ) != true
289+
id: tests
290+
if: github.ref != 'refs/heads/main' # Runs on every PR and both go versions
290291
run: make gotest GROUP=${{ matrix.group }}
291292
- name: Run Unit Tests With JUnit and Coverage
292-
if: startsWith( matrix.go-version, '1.23' ) # only run junit/coverage on one version
293+
id: tests-with-junit
294+
if: startsWith( matrix.go-version, '~1.23' ) && github.ref == 'refs/heads/main' && github.event_name == 'push' # only run junit/coverage on one version and only on main
295+
continue-on-error: true # Allow uploading artifacts even if the test fails
293296
run: make gotest-with-junit-and-cover GROUP=${{ matrix.group }}
294297
- uses: actions/upload-artifact@v4
295-
if: startsWith( matrix.go-version, '1.23' ) # only upload artifact for one version
298+
if: startsWith( matrix.go-version, '~1.23' ) && github.ref == 'refs/heads/main' && github.event_name == 'push' # only upload artifact for one version and only on main
296299
with:
297300
name: coverage-artifacts-${{ matrix.go-version }}-${{ matrix.runner }}-${{ matrix.group }}
298301
path: ${{ matrix.group }}-coverage.txt
299302
- uses: actions/upload-artifact@v4
300-
if: startsWith( matrix.go-version, '1.23' ) # only upload artifact for one version
303+
if: startsWith( matrix.go-version, '~1.23' ) && github.ref == 'refs/heads/main' && github.event_name == 'push' # only upload artifact for one version and only on main
301304
with:
302305
name: test-results-${{ matrix.go-version }}-${{ matrix.runner }}-${{ matrix.group }}
303306
path: internal/tools/testresults/
304307
retention-days: 4
308+
- name: Fail workflow if tests fails
309+
if: steps.tests-with-junit.outcome == 'failure' || steps.tests.outcome == 'failure'
310+
run: |
311+
echo "Tests failed. Failing workflow."
312+
exit 1
313+
305314
unittest:
306315
if: ${{ github.actor != 'dependabot[bot]' && always() }}
307316
runs-on: ubuntu-24.04
@@ -648,27 +657,3 @@ jobs:
648657
return
649658
}
650659
}
651-
652-
flakytests-generate-issues:
653-
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
654-
runs-on: ubuntu-24.04
655-
needs: [unittest-matrix]
656-
steps:
657-
- uses: actions/checkout@v4
658-
- uses: actions/download-artifact@v4
659-
with:
660-
merge-multiple: true
661-
pattern: test-results-*
662-
path: ./internal/tools/testresults/
663-
- name: Install Tools
664-
run: make install-tools
665-
- name: Generate Issues
666-
run: |
667-
# We want to start by generating issues of a single component
668-
# As we mature the usage of issuegenerator, we can extend it to
669-
# generate issues for multiple components.
670-
#
671-
# We'll start with the hostmetricsreceiver.
672-
mkdir -p ./internal/tools/testresults/hostmetricsreceiver
673-
mv ./internal/tools/testresults/github.spider-man.dpdns.org-open-telemetry-opentelemetry-collector-contrib-receiver-hostmetricsreceiver-junit.xml ./internal/tools/testresults/hostmetricsreceiver/
674-
./tools/issuegenerator -path ./internal/tools/testresults/hostmetricsreceiver/

0 commit comments

Comments
 (0)