Skip to content

Commit a0443ce

Browse files
hilmarfhilmarf
authored
Merge branch 'open-telemetry:main' into main
2 parents d45b534 + e25488e commit a0443ce

File tree

713 files changed

+22442
-22127
lines changed

Some content is hidden

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

713 files changed

+22442
-22127
lines changed

‎.github/actions/setup-go-tools/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ runs:
4444

4545
- name: Cache .tools
4646
if: inputs.install-tools == 'true'
47-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
47+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5
4848
id: tools-cache
4949
with:
5050
path: ${{ inputs.repo-path }}/.tools

‎.github/workflows/auto-assign-owners.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
if: ${{ github.actor != 'dependabot[bot]' && github.event.pull_request.draft == false }}
2121
steps:
2222
- name: run
23-
uses: kentaro-m/auto-assign-action@f4648c0a9fdb753479e9e75fc251f507ce17bb7e # v2.0.0
23+
uses: kentaro-m/auto-assign-action@a6d59add3a817df08cafa9b166367768d2c337f8 # v2.0.1
2424
with:
2525
configuration-path: ".github/auto_assign.yml"
2626
repo-token: '${{ secrets.GITHUB_TOKEN }}'

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,10 @@ jobs:
183183
make generate-gh-issue-templates
184184
git diff --exit-code '.github/ISSUE_TEMPLATE' || (echo 'Dropdowns in issue templates are out of date, please run "make generate-gh-issue-templates" and commit the changes in this PR.' && exit 1)
185185
- run: ./.github/workflows/scripts/check-disk-space.sh
186+
- name: Check config schemas
187+
run: |
188+
make generate-schemas
189+
git diff --exit-code '*.schema.yaml' || (echo 'Config schemas are out of date, please run "make generate-schemas" and commit the changes in this PR.' && exit 1)
186190
unittest-matrix:
187191
strategy:
188192
fail-fast: false
@@ -214,7 +218,7 @@ jobs:
214218
with:
215219
go-version: oldstable
216220
- name: Cache Test Build
217-
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5
221+
uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5
218222
with:
219223
path: ~/.cache/go-build
220224
key: go-test-build-${{ runner.os }}-${{ matrix.go-version }}-${{ matrix.runner }}-${{ hashFiles('**/go.sum') }}

‎Makefile‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,14 @@ clean:
699699
generate-gh-issue-templates:
700700
$(GITHUBGEN) issue-templates
701701

702+
.PHONY: generate-schemas
703+
generate-schemas:
704+
./cmd/schemagen/run_schemagen_dir.sh ./receiver
705+
./cmd/schemagen/run_schemagen_dir.sh -i datadogexporter ./exporter
706+
./cmd/schemagen/run_schemagen_dir.sh ./processor
707+
./cmd/schemagen/run_schemagen_dir.sh -i encoding,observer,opampcustommessages,storage ./extension
708+
./cmd/schemagen/run_schemagen_dir.sh ./connector
709+
702710
.PHONY: checks
703711
checks:
704712
$(MAKE) checkdoc
@@ -712,4 +720,5 @@ checks:
712720
$(MAKE) gendistributions
713721
$(MAKE) -j4 generate
714722
$(MAKE) multimod-verify
723+
# $(MAKE) generate-schemas Uncomment when schema generation is complete
715724
git diff --exit-code || (echo 'Some files need committing' && git status && exit 1)

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,4 +166,7 @@ is a maintainer they are responsible for merging the PR as well.
166166
The facilitator is not required to perform a thorough review, but they are encouraged to
167167
enforce Collector best practices and consistency across the codebase and component
168168
behavior. The facilitators will typically rely on codeowner's detailed review of the code
169-
when making the final approval decision.
169+
when making the final approval decision.
170+
171+
Marking the PR with the `ready to merge` label should only happen (by triagers/approvers/maintainers)
172+
once there is at least one approval from an approver, as per the description above.

‎cmd/codecovgen/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ require (
1515
)
1616

1717
// Can be removed after 0.144.0 release
18-
replace go.opentelemetry.io/collector/internal/componentalias => go.opentelemetry.io/collector/internal/componentalias v0.0.0-20260115162016-5e41fb551263
18+
replace go.opentelemetry.io/collector/internal/componentalias => go.opentelemetry.io/collector/internal/componentalias v0.0.0-20260119125341-0550b08ddcc5

‎cmd/golden/go.mod‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.143.0
77
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.143.0
88
github.com/stretchr/testify v1.11.1
9-
go.opentelemetry.io/collector/component v1.49.1-0.20260115162016-5e41fb551263
10-
go.opentelemetry.io/collector/component/componenttest v0.143.1-0.20260115162016-5e41fb551263
11-
go.opentelemetry.io/collector/config/configoptional v1.49.1-0.20260115162016-5e41fb551263
12-
go.opentelemetry.io/collector/confmap v1.49.1-0.20260115162016-5e41fb551263
13-
go.opentelemetry.io/collector/consumer v1.49.1-0.20260115162016-5e41fb551263
14-
go.opentelemetry.io/collector/pdata v1.49.1-0.20260115162016-5e41fb551263
15-
go.opentelemetry.io/collector/receiver v1.49.1-0.20260115162016-5e41fb551263
16-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.143.1-0.20260115162016-5e41fb551263
9+
go.opentelemetry.io/collector/component v1.49.1-0.20260119125341-0550b08ddcc5
10+
go.opentelemetry.io/collector/component/componenttest v0.143.1-0.20260119125341-0550b08ddcc5
11+
go.opentelemetry.io/collector/config/configoptional v1.49.1-0.20260119125341-0550b08ddcc5
12+
go.opentelemetry.io/collector/confmap v1.49.1-0.20260119125341-0550b08ddcc5
13+
go.opentelemetry.io/collector/consumer v1.49.1-0.20260119125341-0550b08ddcc5
14+
go.opentelemetry.io/collector/pdata v1.49.1-0.20260119125341-0550b08ddcc5
15+
go.opentelemetry.io/collector/receiver v1.49.1-0.20260119125341-0550b08ddcc5
16+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.143.1-0.20260119125341-0550b08ddcc5
1717
go.opentelemetry.io/otel/metric v1.39.0
1818
go.opentelemetry.io/otel/trace v1.39.0
1919
go.uber.org/goleak v1.3.0
@@ -49,30 +49,31 @@ require (
4949
github.com/pmezard/go-difflib v1.0.0 // indirect
5050
github.com/rs/cors v1.11.1 // indirect
5151
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
52-
go.opentelemetry.io/collector v0.143.1-0.20260115162016-5e41fb551263 // indirect
53-
go.opentelemetry.io/collector/client v1.49.1-0.20260115162016-5e41fb551263 // indirect
54-
go.opentelemetry.io/collector/component/componentstatus v0.143.1-0.20260115162016-5e41fb551263 // indirect
55-
go.opentelemetry.io/collector/config/configauth v1.49.1-0.20260115162016-5e41fb551263 // indirect
56-
go.opentelemetry.io/collector/config/configcompression v1.49.1-0.20260115162016-5e41fb551263 // indirect
57-
go.opentelemetry.io/collector/config/configgrpc v0.143.1-0.20260115162016-5e41fb551263 // indirect
58-
go.opentelemetry.io/collector/config/confighttp v0.143.1-0.20260115162016-5e41fb551263 // indirect
59-
go.opentelemetry.io/collector/config/configmiddleware v1.49.1-0.20260115162016-5e41fb551263 // indirect
60-
go.opentelemetry.io/collector/config/confignet v1.49.1-0.20260115162016-5e41fb551263 // indirect
61-
go.opentelemetry.io/collector/config/configopaque v1.49.1-0.20260115162016-5e41fb551263 // indirect
62-
go.opentelemetry.io/collector/config/configtls v1.49.1-0.20260115162016-5e41fb551263 // indirect
63-
go.opentelemetry.io/collector/confmap/xconfmap v0.143.1-0.20260115162016-5e41fb551263 // indirect
64-
go.opentelemetry.io/collector/consumer/consumererror v0.143.1-0.20260115162016-5e41fb551263 // indirect
65-
go.opentelemetry.io/collector/consumer/xconsumer v0.143.1-0.20260115162016-5e41fb551263 // indirect
66-
go.opentelemetry.io/collector/extension/extensionauth v1.49.1-0.20260115162016-5e41fb551263 // indirect
67-
go.opentelemetry.io/collector/extension/extensionmiddleware v0.143.1-0.20260115162016-5e41fb551263 // indirect
68-
go.opentelemetry.io/collector/featuregate v1.49.1-0.20260115162016-5e41fb551263 // indirect
69-
go.opentelemetry.io/collector/internal/componentalias v0.0.0-20260115162016-5e41fb551263 // indirect
70-
go.opentelemetry.io/collector/internal/sharedcomponent v0.143.1-0.20260115162016-5e41fb551263 // indirect
71-
go.opentelemetry.io/collector/internal/telemetry v0.143.1-0.20260115162016-5e41fb551263 // indirect
72-
go.opentelemetry.io/collector/pdata/pprofile v0.143.1-0.20260115162016-5e41fb551263 // indirect
73-
go.opentelemetry.io/collector/pipeline v1.49.1-0.20260115162016-5e41fb551263 // indirect
74-
go.opentelemetry.io/collector/receiver/receiverhelper v0.143.1-0.20260115162016-5e41fb551263 // indirect
75-
go.opentelemetry.io/collector/receiver/xreceiver v0.143.1-0.20260115162016-5e41fb551263 // indirect
52+
go.opentelemetry.io/collector v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
53+
go.opentelemetry.io/collector/client v1.49.1-0.20260119125341-0550b08ddcc5 // indirect
54+
go.opentelemetry.io/collector/component/componentstatus v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
55+
go.opentelemetry.io/collector/config/configauth v1.49.1-0.20260119125341-0550b08ddcc5 // indirect
56+
go.opentelemetry.io/collector/config/configcompression v1.49.1-0.20260119125341-0550b08ddcc5 // indirect
57+
go.opentelemetry.io/collector/config/configgrpc v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
58+
go.opentelemetry.io/collector/config/confighttp v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
59+
go.opentelemetry.io/collector/config/configmiddleware v1.49.1-0.20260119125341-0550b08ddcc5 // indirect
60+
go.opentelemetry.io/collector/config/confignet v1.49.1-0.20260119125341-0550b08ddcc5 // indirect
61+
go.opentelemetry.io/collector/config/configopaque v1.49.1-0.20260119125341-0550b08ddcc5 // indirect
62+
go.opentelemetry.io/collector/config/configtls v1.49.1-0.20260119125341-0550b08ddcc5 // indirect
63+
go.opentelemetry.io/collector/confmap/xconfmap v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
64+
go.opentelemetry.io/collector/consumer/consumererror v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
65+
go.opentelemetry.io/collector/consumer/xconsumer v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
66+
go.opentelemetry.io/collector/extension/extensionauth v1.49.1-0.20260119125341-0550b08ddcc5 // indirect
67+
go.opentelemetry.io/collector/extension/extensionmiddleware v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
68+
go.opentelemetry.io/collector/featuregate v1.49.1-0.20260119125341-0550b08ddcc5 // indirect
69+
go.opentelemetry.io/collector/internal/componentalias v0.0.0-20260119125341-0550b08ddcc5 // indirect
70+
go.opentelemetry.io/collector/internal/sharedcomponent v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
71+
go.opentelemetry.io/collector/internal/telemetry v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
72+
go.opentelemetry.io/collector/pdata/pprofile v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
73+
go.opentelemetry.io/collector/pipeline v1.49.1-0.20260119125341-0550b08ddcc5 // indirect
74+
go.opentelemetry.io/collector/pipeline/xpipeline v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
75+
go.opentelemetry.io/collector/receiver/receiverhelper v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
76+
go.opentelemetry.io/collector/receiver/xreceiver v0.143.1-0.20260119125341-0550b08ddcc5 // indirect
7677
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
7778
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
7879
go.opentelemetry.io/otel v1.39.0 // indirect
@@ -97,4 +98,4 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden =>
9798
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
9899

99100
// Can be removed after 0.144.0 release
100-
replace go.opentelemetry.io/collector/internal/componentalias => go.opentelemetry.io/collector/internal/componentalias v0.0.0-20260115162016-5e41fb551263
101+
replace go.opentelemetry.io/collector/internal/componentalias => go.opentelemetry.io/collector/internal/componentalias v0.0.0-20260119125341-0550b08ddcc5

0 commit comments

Comments
 (0)