Skip to content

Commit a2fcf65

Browse files
juanhotencodingjuanhotencoding
authored
Merge branch 'main' into add-splunk-rolling-restart-metric
2 parents 4dee19b + 52a072f commit a2fcf65

File tree

651 files changed

+27985
-25112
lines changed

Some content is hidden

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

651 files changed

+27985
-25112
lines changed

‎.chloggen/elasticsearchexporter-scopeattr-mappingmode.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: elasticsearchexporter
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 extracting mapping mode from a scope attribute.
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: [39110]
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/fix-global-conditions-ctx-inference.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: bug_fix
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: transformprocessor
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Fix the context inferrer to also take into consideration the global OTTL conditions configuration.
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: [39455]
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, api]

‎.chloggen/kafkareceiver-generic.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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: kafkareceiver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add `max_fetch_wait` config setting
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: [39360]
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+
This setting allows you to specify the maximum time that the broker will wait for
20+
min_fetch_size bytes of data to be available before sending a response to the client.
21+
Defaults to 250ms.
22+
23+
# If your change doesn't affect end users or the exported elements of any package,
24+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
25+
# Optional: The change log or logs in which this entry should be included.
26+
# e.g. '[user]' or '[user, api]'
27+
# Include 'user' if the change is relevant to end users.
28+
# Include 'api' if there is a change to a library API.
29+
# Default: '[user]'
30+
change_logs: [user]

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,3 +709,42 @@ jobs:
709709
return
710710
}
711711
}
712+
713+
flakytests-generate-issues:
714+
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
715+
runs-on: ubuntu-24.04
716+
needs: [unittest-matrix]
717+
permissions:
718+
issues: write
719+
steps:
720+
- uses: actions/checkout@v4
721+
- uses: actions/setup-go@v5
722+
with:
723+
go-version: "1.23.7"
724+
cache: false
725+
- name: Cache Go
726+
id: go-cache
727+
timeout-minutes: 5
728+
uses: actions/cache@v4
729+
with:
730+
path: |
731+
~/go/bin
732+
~/go/pkg/mod
733+
./.tools
734+
key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
735+
- name: Install dependencies
736+
if: steps.go-cache.outputs.cache-hit != 'true'
737+
run: make -j2 gomoddownload
738+
- uses: actions/download-artifact@v4
739+
with:
740+
merge-multiple: true
741+
pattern: test-results-*
742+
path: ./internal/tools/testresults/
743+
- name: Install Tools
744+
if: steps.go-cache.outputs.cache-hit != 'true'
745+
run: make install-tools
746+
- name: Generate Issues
747+
env:
748+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
749+
run: |
750+
./.tools/issuegenerator -path ./internal/tools/testresults/

‎cmd/opampsupervisor/go.mod

Lines changed: 75 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ require (
1313
github.com/open-telemetry/opamp-go v0.19.0
1414
github.com/open-telemetry/opentelemetry-collector-contrib/testbed v0.124.1
1515
github.com/stretchr/testify v1.10.0
16-
go.opentelemetry.io/collector/component v1.30.0
17-
go.opentelemetry.io/collector/config/configopaque v1.30.0
18-
go.opentelemetry.io/collector/config/configtelemetry v0.124.0
19-
go.opentelemetry.io/collector/config/configtls v1.30.0
20-
go.opentelemetry.io/collector/confmap v1.30.0
21-
go.opentelemetry.io/collector/confmap/provider/envprovider v1.30.0
22-
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.30.0
23-
go.opentelemetry.io/collector/pdata v1.30.0
24-
go.opentelemetry.io/collector/semconv v0.124.0
25-
go.opentelemetry.io/collector/service v0.124.0
16+
go.opentelemetry.io/collector/component v1.30.1-0.20250422165940-c47951a8bf71
17+
go.opentelemetry.io/collector/config/configopaque v1.30.1-0.20250422165940-c47951a8bf71
18+
go.opentelemetry.io/collector/config/configtelemetry v0.124.1-0.20250422165940-c47951a8bf71
19+
go.opentelemetry.io/collector/config/configtls v1.30.1-0.20250422165940-c47951a8bf71
20+
go.opentelemetry.io/collector/confmap v1.30.1-0.20250422165940-c47951a8bf71
21+
go.opentelemetry.io/collector/confmap/provider/envprovider v1.30.1-0.20250422165940-c47951a8bf71
22+
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.30.1-0.20250422165940-c47951a8bf71
23+
go.opentelemetry.io/collector/pdata v1.30.1-0.20250422165940-c47951a8bf71
24+
go.opentelemetry.io/collector/semconv v0.124.1-0.20250422165940-c47951a8bf71
25+
go.opentelemetry.io/collector/service v0.124.1-0.20250422165940-c47951a8bf71
2626
go.opentelemetry.io/contrib/bridges/otelzap v0.10.0
2727
go.opentelemetry.io/contrib/otelconf v0.15.0
2828
go.opentelemetry.io/otel v1.35.0
@@ -76,7 +76,7 @@ require (
7676
github.com/jpillora/backoff v1.0.0 // indirect
7777
github.com/json-iterator/go v1.1.12 // indirect
7878
github.com/klauspost/compress v1.18.0 // indirect
79-
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
79+
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
8080
github.com/leodido/go-syslog/v4 v4.2.0 // indirect
8181
github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect
8282
github.com/lightstep/go-expohisto v1.0.0 // indirect
@@ -129,61 +129,63 @@ require (
129129
github.com/yusufpapurcu/wmi v1.2.4 // indirect
130130
go.opencensus.io v0.24.0 // indirect
131131
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
132-
go.opentelemetry.io/collector v0.124.0 // indirect
133-
go.opentelemetry.io/collector/client v1.30.0 // indirect
134-
go.opentelemetry.io/collector/component/componentstatus v0.124.0 // indirect
135-
go.opentelemetry.io/collector/component/componenttest v0.124.0 // indirect
136-
go.opentelemetry.io/collector/config/configauth v0.124.0 // indirect
137-
go.opentelemetry.io/collector/config/configcompression v1.30.0 // indirect
138-
go.opentelemetry.io/collector/config/configgrpc v0.124.0 // indirect
139-
go.opentelemetry.io/collector/config/confighttp v0.124.0 // indirect
140-
go.opentelemetry.io/collector/config/confignet v1.30.0 // indirect
141-
go.opentelemetry.io/collector/config/configretry v1.30.0 // indirect
142-
go.opentelemetry.io/collector/confmap/xconfmap v0.124.0 // indirect
143-
go.opentelemetry.io/collector/connector v0.124.0 // indirect
144-
go.opentelemetry.io/collector/connector/connectortest v0.124.0 // indirect
145-
go.opentelemetry.io/collector/connector/xconnector v0.124.0 // indirect
146-
go.opentelemetry.io/collector/consumer v1.30.0 // indirect
147-
go.opentelemetry.io/collector/consumer/consumererror v0.124.0 // indirect
148-
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.124.0 // indirect
149-
go.opentelemetry.io/collector/consumer/consumertest v0.124.0 // indirect
150-
go.opentelemetry.io/collector/consumer/xconsumer v0.124.0 // indirect
151-
go.opentelemetry.io/collector/exporter v0.124.0 // indirect
152-
go.opentelemetry.io/collector/exporter/debugexporter v0.124.0 // indirect
153-
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.124.0 // indirect
154-
go.opentelemetry.io/collector/exporter/exportertest v0.124.0 // indirect
155-
go.opentelemetry.io/collector/exporter/otlpexporter v0.124.0 // indirect
156-
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.124.0 // indirect
157-
go.opentelemetry.io/collector/exporter/xexporter v0.124.0 // indirect
158-
go.opentelemetry.io/collector/extension v1.30.0 // indirect
159-
go.opentelemetry.io/collector/extension/extensionauth v1.30.0 // indirect
160-
go.opentelemetry.io/collector/extension/extensioncapabilities v0.124.0 // indirect
161-
go.opentelemetry.io/collector/extension/extensiontest v0.124.0 // indirect
162-
go.opentelemetry.io/collector/extension/xextension v0.124.0 // indirect
163-
go.opentelemetry.io/collector/extension/zpagesextension v0.124.0 // indirect
164-
go.opentelemetry.io/collector/featuregate v1.30.0 // indirect
165-
go.opentelemetry.io/collector/internal/fanoutconsumer v0.124.0 // indirect
166-
go.opentelemetry.io/collector/internal/memorylimiter v0.124.0 // indirect
167-
go.opentelemetry.io/collector/internal/sharedcomponent v0.124.0 // indirect
168-
go.opentelemetry.io/collector/internal/telemetry v0.124.0 // indirect
169-
go.opentelemetry.io/collector/otelcol v0.124.0 // indirect
170-
go.opentelemetry.io/collector/pdata/pprofile v0.124.0 // indirect
171-
go.opentelemetry.io/collector/pdata/testdata v0.124.0 // indirect
172-
go.opentelemetry.io/collector/pipeline v0.124.0 // indirect
173-
go.opentelemetry.io/collector/pipeline/xpipeline v0.124.0 // indirect
174-
go.opentelemetry.io/collector/processor v1.30.0 // indirect
175-
go.opentelemetry.io/collector/processor/batchprocessor v0.124.0 // indirect
176-
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.124.0 // indirect
177-
go.opentelemetry.io/collector/processor/processorhelper v0.124.0 // indirect
178-
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.124.0 // indirect
179-
go.opentelemetry.io/collector/processor/processortest v0.124.0 // indirect
180-
go.opentelemetry.io/collector/processor/xprocessor v0.124.0 // indirect
181-
go.opentelemetry.io/collector/receiver v1.30.0 // indirect
182-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.124.0 // indirect
183-
go.opentelemetry.io/collector/receiver/receiverhelper v0.124.0 // indirect
184-
go.opentelemetry.io/collector/receiver/receivertest v0.124.0 // indirect
185-
go.opentelemetry.io/collector/receiver/xreceiver v0.124.0 // indirect
186-
go.opentelemetry.io/collector/service/hostcapabilities v0.124.0 // indirect
132+
go.opentelemetry.io/collector v0.124.1-0.20250422165940-c47951a8bf71 // indirect
133+
go.opentelemetry.io/collector/client v1.30.1-0.20250422165940-c47951a8bf71 // indirect
134+
go.opentelemetry.io/collector/component/componentstatus v0.124.1-0.20250422165940-c47951a8bf71 // indirect
135+
go.opentelemetry.io/collector/component/componenttest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
136+
go.opentelemetry.io/collector/config/configauth v0.124.1-0.20250422165940-c47951a8bf71 // indirect
137+
go.opentelemetry.io/collector/config/configcompression v1.30.1-0.20250422165940-c47951a8bf71 // indirect
138+
go.opentelemetry.io/collector/config/configgrpc v0.124.1-0.20250422165940-c47951a8bf71 // indirect
139+
go.opentelemetry.io/collector/config/confighttp v0.124.1-0.20250422165940-c47951a8bf71 // indirect
140+
go.opentelemetry.io/collector/config/configmiddleware v0.0.0-00010101000000-000000000000 // indirect
141+
go.opentelemetry.io/collector/config/confignet v1.30.1-0.20250422165940-c47951a8bf71 // indirect
142+
go.opentelemetry.io/collector/config/configretry v1.30.1-0.20250422165940-c47951a8bf71 // indirect
143+
go.opentelemetry.io/collector/confmap/xconfmap v0.124.1-0.20250422165940-c47951a8bf71 // indirect
144+
go.opentelemetry.io/collector/connector v0.124.1-0.20250422165940-c47951a8bf71 // indirect
145+
go.opentelemetry.io/collector/connector/connectortest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
146+
go.opentelemetry.io/collector/connector/xconnector v0.124.1-0.20250422165940-c47951a8bf71 // indirect
147+
go.opentelemetry.io/collector/consumer v1.30.1-0.20250422165940-c47951a8bf71 // indirect
148+
go.opentelemetry.io/collector/consumer/consumererror v0.124.1-0.20250422165940-c47951a8bf71 // indirect
149+
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.124.1-0.20250422165940-c47951a8bf71 // indirect
150+
go.opentelemetry.io/collector/consumer/consumertest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
151+
go.opentelemetry.io/collector/consumer/xconsumer v0.124.1-0.20250422165940-c47951a8bf71 // indirect
152+
go.opentelemetry.io/collector/exporter v0.124.1-0.20250422165940-c47951a8bf71 // indirect
153+
go.opentelemetry.io/collector/exporter/debugexporter v0.124.1-0.20250422165940-c47951a8bf71 // indirect
154+
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.124.1-0.20250422165940-c47951a8bf71 // indirect
155+
go.opentelemetry.io/collector/exporter/exportertest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
156+
go.opentelemetry.io/collector/exporter/otlpexporter v0.124.1-0.20250422165940-c47951a8bf71 // indirect
157+
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.124.1-0.20250422165940-c47951a8bf71 // indirect
158+
go.opentelemetry.io/collector/exporter/xexporter v0.124.1-0.20250422165940-c47951a8bf71 // indirect
159+
go.opentelemetry.io/collector/extension v1.30.1-0.20250422165940-c47951a8bf71 // indirect
160+
go.opentelemetry.io/collector/extension/extensionauth v1.30.1-0.20250422165940-c47951a8bf71 // indirect
161+
go.opentelemetry.io/collector/extension/extensioncapabilities v0.124.1-0.20250422165940-c47951a8bf71 // indirect
162+
go.opentelemetry.io/collector/extension/extensionmiddleware v1.30.0 // indirect
163+
go.opentelemetry.io/collector/extension/extensiontest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
164+
go.opentelemetry.io/collector/extension/xextension v0.124.1-0.20250422165940-c47951a8bf71 // indirect
165+
go.opentelemetry.io/collector/extension/zpagesextension v0.124.1-0.20250422165940-c47951a8bf71 // indirect
166+
go.opentelemetry.io/collector/featuregate v1.30.1-0.20250422165940-c47951a8bf71 // indirect
167+
go.opentelemetry.io/collector/internal/fanoutconsumer v0.124.1-0.20250422165940-c47951a8bf71 // indirect
168+
go.opentelemetry.io/collector/internal/memorylimiter v0.124.1-0.20250422165940-c47951a8bf71 // indirect
169+
go.opentelemetry.io/collector/internal/sharedcomponent v0.124.1-0.20250422165940-c47951a8bf71 // indirect
170+
go.opentelemetry.io/collector/internal/telemetry v0.124.1-0.20250422165940-c47951a8bf71 // indirect
171+
go.opentelemetry.io/collector/otelcol v0.124.1-0.20250422165940-c47951a8bf71 // indirect
172+
go.opentelemetry.io/collector/pdata/pprofile v0.124.1-0.20250422165940-c47951a8bf71 // indirect
173+
go.opentelemetry.io/collector/pdata/testdata v0.124.1-0.20250422165940-c47951a8bf71 // indirect
174+
go.opentelemetry.io/collector/pipeline v0.124.1-0.20250422165940-c47951a8bf71 // indirect
175+
go.opentelemetry.io/collector/pipeline/xpipeline v0.124.1-0.20250422165940-c47951a8bf71 // indirect
176+
go.opentelemetry.io/collector/processor v1.30.1-0.20250422165940-c47951a8bf71 // indirect
177+
go.opentelemetry.io/collector/processor/batchprocessor v0.124.1-0.20250422165940-c47951a8bf71 // indirect
178+
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.124.1-0.20250422165940-c47951a8bf71 // indirect
179+
go.opentelemetry.io/collector/processor/processorhelper v0.124.1-0.20250422165940-c47951a8bf71 // indirect
180+
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.124.1-0.20250422165940-c47951a8bf71 // indirect
181+
go.opentelemetry.io/collector/processor/processortest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
182+
go.opentelemetry.io/collector/processor/xprocessor v0.124.1-0.20250422165940-c47951a8bf71 // indirect
183+
go.opentelemetry.io/collector/receiver v1.30.1-0.20250422165940-c47951a8bf71 // indirect
184+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.124.1-0.20250422165940-c47951a8bf71 // indirect
185+
go.opentelemetry.io/collector/receiver/receiverhelper v0.124.1-0.20250422165940-c47951a8bf71 // indirect
186+
go.opentelemetry.io/collector/receiver/receivertest v0.124.1-0.20250422165940-c47951a8bf71 // indirect
187+
go.opentelemetry.io/collector/receiver/xreceiver v0.124.1-0.20250422165940-c47951a8bf71 // indirect
188+
go.opentelemetry.io/collector/service/hostcapabilities v0.124.1-0.20250422165940-c47951a8bf71 // indirect
187189
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
188190
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
189191
go.opentelemetry.io/contrib/propagators/b3 v1.35.0 // indirect
@@ -212,6 +214,7 @@ require (
212214
google.golang.org/genproto/googleapis/rpc v0.0.0-20250313205543-e70fdf4c4cb4 // indirect
213215
google.golang.org/grpc v1.72.0 // indirect
214216
gopkg.in/yaml.v2 v2.4.0 // indirect
217+
sigs.k8s.io/yaml v1.4.0 // indirect
215218
)
216219

217220
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver => ../../receiver/syslogreceiver
@@ -305,3 +308,9 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/exp/m
305308
replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension => ../../extension/ackextension
306309

307310
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter => ../../exporter/prometheusremotewriteexporter
311+
312+
replace go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest v0.0.0-00010101000000-000000000000 => go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest v0.0.0-20250422165940-c47951a8bf71
313+
314+
replace go.opentelemetry.io/collector/config/configmiddleware v0.0.0-00010101000000-000000000000 => go.opentelemetry.io/collector/config/configmiddleware v0.0.0-20250422165940-c47951a8bf71
315+
316+
replace go.opentelemetry.io/collector/extension/extensionmiddleware v1.30.0 => go.opentelemetry.io/collector/extension/extensionmiddleware v0.0.0-20250422165940-c47951a8bf71

0 commit comments

Comments
 (0)