Skip to content

Commit 150ead6

Browse files
authored
Merge branch 'main' into elasticsearch-profiles
2 parents b644b8b + 499df64 commit 150ead6

File tree

84 files changed

+1876
-688
lines changed

Some content is hidden

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

84 files changed

+1876
-688
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
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/transformprocessor
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 global conditions and error mode overrides.
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: [29017]
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+
Global conditions are now available for context-inferred structured configurations, allowing the use of fully
20+
qualified paths. Additionally, a new configuration key called `error_mode` has been added to the context statements group.
21+
This key determines how the processor reacts to errors that occur while processing that specific group of statements.
22+
When provided, it overrides the top-level error mode, offering more granular control over error handling.
23+
24+
# If your change doesn't affect end users or the exported elements of any package,
25+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
26+
# Optional: The change log or logs in which this entry should be included.
27+
# e.g. '[user]' or '[user, api]'
28+
# Include 'user' if the change is relevant to end users.
29+
# Include 'api' if there is a change to a library API.
30+
# Default: '[user]'
31+
change_logs: [user]
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: opampsupervisor
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: The OnConnectionClose was not correctly connected for the supervisor.
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: [37761]
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/rm-dep-func.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: breaking
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: Remove deprecated func BuildWithSplitFunc from stanza/fileconsumer
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: [37723]
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: [api]
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: textutil
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Remove unnecessary copy while decoding and constructing string
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: [37734]
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 PR affects all log receivers, text extension and kafkareceiver.
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/rm-unncessary-copy.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: deprecation
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: Deprecate all functions in stanza/decode
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: [37734]
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: [api]

.github/ALLOWLIST

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,20 @@ internal/common
1919

2020
## DEPRECATED components
2121

22+
# Start deprecated components list
23+
24+
25+
26+
# End deprecated components list
27+
2228
## UNMAINTAINED components
23-
exporter/kineticaexporter/
24-
exporter/opensearchexporter/
25-
extension/observer/ecstaskobserver/
26-
receiver/awscloudwatchmetricsreceiver/
27-
receiver/rabbitmqreceiver/
29+
30+
# Start unmaintained components list
31+
32+
exporter/kineticaexporter
33+
exporter/opensearchexporter
34+
extension/observer/ecstaskobserver
35+
receiver/awscloudwatchmetricsreceiver
36+
receiver/rabbitmqreceiver
37+
38+
# End unmaintained components list

.github/CODEOWNERS

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111

1212
* @open-telemetry/collector-contrib-approvers
1313

14+
# Start components list
15+
1416
cmd/githubgen/ @open-telemetry/collector-contrib-approvers @atoulme
1517
cmd/opampsupervisor/ @open-telemetry/collector-contrib-approvers @evan-bradley @atoulme @tigrannajaryan
1618
cmd/otelcontribcol/ @open-telemetry/collector-contrib-approvers
1719
cmd/oteltestbedcol/ @open-telemetry/collector-contrib-approvers
1820
cmd/telemetrygen/ @open-telemetry/collector-contrib-approvers @mx-psi @codeboten @Erog38
19-
2021
confmap/provider/aesprovider/ @open-telemetry/collector-contrib-approvers @djaglowski @shazlehu
2122
confmap/provider/s3provider/ @open-telemetry/collector-contrib-approvers @Aneurysm9
2223
confmap/provider/secretsmanagerprovider/ @open-telemetry/collector-contrib-approvers @driverpt @atoulme
23-
2424
connector/countconnector/ @open-telemetry/collector-contrib-approvers @djaglowski @jpkrohling
2525
connector/datadogconnector/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @ankitpatel96 @jade-guiton-dd @IbraheemA
2626
connector/exceptionsconnector/ @open-telemetry/collector-contrib-approvers @marctc
@@ -33,9 +33,7 @@ connector/servicegraphconnector/ @open-telemetry
3333
connector/signaltometricsconnector/ @open-telemetry/collector-contrib-approvers @ChrsMark @lahsivjar
3434
connector/spanmetricsconnector/ @open-telemetry/collector-contrib-approvers @portertech @Frapschen
3535
connector/sumconnector/ @open-telemetry/collector-contrib-approvers @greatestusername @shalper2 @crobert-1
36-
3736
examples/demo/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
38-
3937
exporter/alertmanagerexporter/ @open-telemetry/collector-contrib-approvers @sokoide @mcube8
4038
exporter/alibabacloudlogserviceexporter/ @open-telemetry/collector-contrib-approvers @shabicheng @kongluoxing @qiansheng91
4139
exporter/awscloudwatchlogsexporter/ @open-telemetry/collector-contrib-approvers @boostchicken @bryan-aguilar @rapphil
@@ -82,7 +80,6 @@ exporter/sumologicexporter/ @open-telemetry
8280
exporter/syslogexporter/ @open-telemetry/collector-contrib-approvers @kasia-kujawa @rnishtala-sumo @andrzej-stencel
8381
exporter/tencentcloudlogserviceexporter/ @open-telemetry/collector-contrib-approvers @wgliang
8482
exporter/zipkinexporter/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @andrzej-stencel @crobert-1
85-
8683
extension/ackextension/ @open-telemetry/collector-contrib-approvers @zpzhuSplunk @splunkericl
8784
extension/asapauthextension/ @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy
8885
extension/awsproxy/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia
@@ -122,7 +119,6 @@ extension/storage/dbstorage/ @open-telemetry
122119
extension/storage/filestorage/ @open-telemetry/collector-contrib-approvers @swiatekm @VihasMakwana
123120
extension/storage/redisstorageextension/ @open-telemetry/collector-contrib-approvers @atoulme
124121
extension/sumologicextension/ @open-telemetry/collector-contrib-approvers @rnishtala-sumo @chan-tim-sumo @echlebek
125-
126122
internal/aws/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia
127123
internal/collectd/ @open-telemetry/collector-contrib-approvers @atoulme
128124
internal/coreinternal/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
@@ -141,7 +137,6 @@ internal/sharedcomponent/ @open-telemetry
141137
internal/splunk/ @open-telemetry/collector-contrib-approvers @dmitryax
142138
internal/sqlquery/ @open-telemetry/collector-contrib-approvers @crobert-1 @dmitryax
143139
internal/tools/ @open-telemetry/collector-contrib-approvers
144-
145140
pkg/batchperresourceattr/ @open-telemetry/collector-contrib-approvers @atoulme @dmitryax
146141
pkg/batchpersignal/ @open-telemetry/collector-contrib-approvers @jpkrohling
147142
pkg/core/xidutils/ @open-telemetry/collector-contrib-approvers @odubajDT
@@ -169,7 +164,6 @@ pkg/translator/skywalking/ @open-telemetry
169164
pkg/translator/zipkin/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @andrzej-stencel @crobert-1
170165
pkg/winperfcounters/ @open-telemetry/collector-contrib-approvers @dashpole @Mrod1598 @alxbl @pjanotti
171166
pkg/xk8stest/ @open-telemetry/collector-contrib-approvers @crobert-1
172-
173167
processor/attributesprocessor/ @open-telemetry/collector-contrib-approvers @boostchicken
174168
processor/coralogixprocessor/ @open-telemetry/collector-contrib-approvers @crobert-1 @povilasv
175169
processor/cumulativetodeltaprocessor/ @open-telemetry/collector-contrib-approvers @TylerHelmuth
@@ -197,7 +191,6 @@ processor/spanprocessor/ @open-telemetry
197191
processor/sumologicprocessor/ @open-telemetry/collector-contrib-approvers @rnishtala-sumo @chan-tim-sumo @echlebek
198192
processor/tailsamplingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling @portertech
199193
processor/transformprocessor/ @open-telemetry/collector-contrib-approvers @TylerHelmuth @kentquirk @bogdandrutu @evan-bradley @edmocosta
200-
201194
receiver/activedirectorydsreceiver/ @open-telemetry/collector-contrib-approvers @pjanotti
202195
receiver/aerospikereceiver/ @open-telemetry/collector-contrib-approvers @antonblock
203196
receiver/apachereceiver/ @open-telemetry/collector-contrib-approvers @djaglowski
@@ -309,29 +302,39 @@ receiver/windowseventlogreceiver/ @open-telemetry
309302
receiver/windowsperfcountersreceiver/ @open-telemetry/collector-contrib-approvers @dashpole @alxbl @pjanotti
310303
receiver/zipkinreceiver/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @andrzej-stencel @crobert-1
311304
receiver/zookeeperreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski
312-
313305
scraper/zookeeperscraper/ @open-telemetry/collector-contrib-approvers @djaglowski
314-
315306
testbed/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
316307
testbed/mockdatasenders/mockdatadogagentexporter/ @open-telemetry/collector-contrib-approvers @boostchicken
317308

309+
# End components list
310+
318311
#####################################################
319312
#
320313
# List of distribution maintainers
321314
#
322315
#####################################################
323316

317+
# Start distribution list
318+
324319
reports/distributions/core.yaml @open-telemetry/collector-contrib-approvers
325320
reports/distributions/contrib.yaml @open-telemetry/collector-contrib-approvers
326321
reports/distributions/k8s.yaml @open-telemetry/collector-contrib-approvers
327322
reports/distributions/otlp.yaml @open-telemetry/collector-contrib-approvers
323+
324+
# End distribution list
325+
328326
#####################################################
329327
#
330328
## UNMAINTAINED components
331329
#
332330
#####################################################
331+
332+
# Start unmaintained components list
333+
333334
exporter/kineticaexporter/ @open-telemetry/collector-contrib-approvers
334335
exporter/opensearchexporter/ @open-telemetry/collector-contrib-approvers
335336
extension/observer/ecstaskobserver/ @open-telemetry/collector-contrib-approvers
336337
receiver/awscloudwatchmetricsreceiver/ @open-telemetry/collector-contrib-approvers
337338
receiver/rabbitmqreceiver/ @open-telemetry/collector-contrib-approvers
339+
340+
# End unmaintained components list

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ body:
1717
options:
1818
# NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
1919
# Do not manually edit it.
20-
# Start Collector components list
20+
# Start components list
2121
- cmd/githubgen
2222
- cmd/opampsupervisor
2323
- cmd/otelcontribcol
@@ -315,7 +315,7 @@ body:
315315
- scraper/zookeeperscraper
316316
- testbed
317317
- testbed/mockdatasenders/mockdatadogagentexporter
318-
# End Collector components list
318+
# End components list
319319
- type: textarea
320320
attributes:
321321
label: What happened?

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ body:
1111
options:
1212
# NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
1313
# Do not manually edit it.
14-
# Start Collector components list
14+
# Start components list
1515
- cmd/githubgen
1616
- cmd/opampsupervisor
1717
- cmd/otelcontribcol
@@ -309,7 +309,7 @@ body:
309309
- scraper/zookeeperscraper
310310
- testbed
311311
- testbed/mockdatasenders/mockdatadogagentexporter
312-
# End Collector components list
312+
# End components list
313313
- type: textarea
314314
attributes:
315315
label: Is your feature request related to a problem? Please describe.

.github/ISSUE_TEMPLATE/other.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ body:
1111
options:
1212
# NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
1313
# Do not manually edit it.
14-
# Start Collector components list
14+
# Start components list
1515
- cmd/githubgen
1616
- cmd/opampsupervisor
1717
- cmd/otelcontribcol
@@ -309,7 +309,7 @@ body:
309309
- scraper/zookeeperscraper
310310
- testbed
311311
- testbed/mockdatasenders/mockdatadogagentexporter
312-
# End Collector components list
312+
# End components list
313313
- type: textarea
314314
attributes:
315315
label: Describe the issue you're reporting

0 commit comments

Comments
 (0)