Skip to content

Commit ef436bd

Browse files
authored
Merge branch 'main' into axw-emeritus
2 parents 7bf4316 + 2d805c8 commit ef436bd

432 files changed

Lines changed: 10571 additions & 4217 deletions

File tree

Some content is hidden

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

.chloggen/14311-1.yaml

Lines changed: 0 additions & 44 deletions
This file was deleted.

.chloggen/batchprocessor-batch-send-size-bytes-buckets.yaml

Lines changed: 0 additions & 31 deletions
This file was deleted.

.chloggen/config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ components:
9393
- pkg/xscraperhelper
9494
- processor/batch
9595
- processor/memory_limiter
96+
- processor/queuebatch
9697
- processor/sample
9798
- provider/env
9899
- provider/file
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
13
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2-
change_type: bug_fix
4+
change_type: breaking
35

46
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
5-
component: pkg/featuregate
7+
component: pkg/confighttp
68

79
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8-
note: Fix panic when a `--feature-gates` value contains an empty comma-separated element (e.g. `--feature-gates=alpha,`)
10+
note: Make `configauth.Config` a named field of `AuthConfig` instead of an embedded one.
911

1012
# One or more tracking issues or pull requests related to the change
11-
issues: [15536]
13+
issues: [15308]
1214

1315
# (Optional) One or more lines of additional information to render under the primary note.
1416
# These lines will be padded with 2 spaces and then inserted directly into the document.
1517
# Use pipe (|) for multiline entries.
16-
subtext: An empty identifier now produces a returned error instead of an index-out-of-range panic during flag parsing.
18+
subtext: |
1719
1820
# Optional: The change log or logs in which this entry should be included.
1921
# e.g. '[user]' or '[user, api]'
2022
# Include 'user' if the change is relevant to end users.
2123
# Include 'api' if there is a change to a library API.
2224
# Default: '[user]'
23-
change_logs: [user]
25+
change_logs: [api]
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
change_type: enhancement
2+
3+
component: pkg/exporterhelper
4+
5+
note: Add the `pkg.exporterhelper.queueBatchEnabled` feature gate
6+
7+
issues: [14038, 13582, 12022]
8+
9+
subtext: |
10+
When enabled, the batch settings returned by `NewDefaultQueueConfig()` have
11+
`batch::enabled` true. See [migration RFC](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/batching-migration.md#phase-1).
12+
13+
change_logs: [user]

.chloggen/exporterhelper-queue-batch-send-size-bytes-buckets.yaml

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
13
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
2-
change_type: bug_fix
4+
change_type: enhancement
35

46
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
5-
component: exporter/debug
7+
component: pkg/config/configretry
68

79
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
8-
note: Fix the scope index printed by the `normal` verbosity marshaler; each scope was labelled with its parent resource's index instead of its own position
10+
note: Migrate `BackOffConfig` to schema-based configuration generated by mdatagen.
911

1012
# One or more tracking issues or pull requests related to the change
11-
issues: [15541]
13+
issues: [15502]
1214

1315
# (Optional) One or more lines of additional information to render under the primary note.
1416
# These lines will be padded with 2 spaces and then inserted directly into the document.
1517
# Use pipe (|) for multiline entries.
16-
subtext: Affected all four signals (logs, traces, metrics, profiles) — e.g. the second scope under a resource printed `#0` instead of `#1`.
18+
subtext:
1719

1820
# Optional: The change log or logs in which this entry should be included.
1921
# e.g. '[user]' or '[user, api]'
2022
# Include 'user' if the change is relevant to end users.
2123
# Include 'api' if there is a change to a library API.
2224
# Default: '[user]'
23-
change_logs: [user]
25+
change_logs: [api]
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Use this changelog template to create an entry for release notes.
22

33
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4-
change_type: new_component
4+
change_type: enhancement
55

66
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7-
component: pkg/config/configstorage
7+
component: pkg/config/configtls
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Add a new configstorage module to support storage configuration fields.
10+
note: Migrate `TLS` core types to schema-based configuration generated by mdatagen.
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [5832]
13+
issues: [15693]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.
Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,25 @@
11
# Use this changelog template to create an entry for release notes.
22

33
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4-
change_type: enhancement
4+
change_type: breaking
55

66
# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
7-
component: all
7+
component: extension/zpages
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Bootstrap `config.schema.yaml` for core components (debug/otlp/otlphttp exporters, otlp receiver, batch/memory_limiter processors, memory_limiter/zpages extensions). Implements Phase 1 of the component configuration schema roadmap RFC.
10+
note: Make `confighttp.ServerConfig` a named field of `Config` instead of an embedded one.
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [14543]
13+
issues: [15308]
1414

1515
# (Optional) One or more lines of additional information to render under the primary note.
1616
# These lines will be padded with 2 spaces and then inserted directly into the document.
1717
# Use pipe (|) for multiline entries.
1818
subtext: |
19-
Schemas are generated using the `schemagen` tool from opentelemetry-collector-contrib and hand-tuned to capture
20-
validation rules and references to shared library schemas (confighttp, configgrpc, configretry, exporterhelper,
21-
etc.). A `.schemagen.yaml` settings file and a `generate-schemas` Makefile target are added so the schemas can
22-
be regenerated reproducibly.
2319
2420
# Optional: The change log or logs in which this entry should be included.
2521
# e.g. '[user]' or '[user, api]'
2622
# Include 'user' if the change is relevant to end users.
2723
# Include 'api' if there is a change to a library API.
2824
# Default: '[user]'
29-
change_logs: [user]
25+
change_logs: [api]

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ processor/memorylimiterprocessor/ @open-telemetry/collector
9999
processor/processorhelper/ @open-telemetry/collector-approvers
100100
processor/processorhelper/xprocessorhelper/ @open-telemetry/collector-approvers
101101
processor/processortest/ @open-telemetry/collector-approvers
102+
processor/queuebatchprocessor/ @open-telemetry/collector-approvers @jmacd @iblancasa
102103
processor/xprocessor/ @open-telemetry/collector-approvers @mx-psi @dmathieu
103104
receiver/ @open-telemetry/collector-approvers
104105
receiver/nopreceiver/ @open-telemetry/collector-approvers @evan-bradley

0 commit comments

Comments
 (0)