Skip to content

Commit ce63a32

Browse files
authored
Merge branch 'main' into 15256
2 parents 4d36470 + 8d9d794 commit ce63a32

387 files changed

Lines changed: 8490 additions & 5709 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/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

.chloggen/mdatagen-versioned-metrics-handle-attribute-renames-correctly.yaml renamed to .chloggen/confighttp-auth-named-config.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +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: 'bug_fix'
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: cmd/mdatagen
7+
component: pkg/confighttp
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Versioned metrics don't handle renamed attributes with same type
10+
note: Make `configauth.Config` a named field of `AuthConfig` instead of an embedded one.
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [15595]
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-
Versioned metrics need to support emitting legacy and latest attributes when the metric name is the same but the
20-
attributes names differ. This was not working when the attributes name changed but the type remained the same.
21-
Here we add support to versioned metrics with renamed attributes where those attributes have the same type.
2219
2320
# Optional: The change log or logs in which this entry should be included.
2421
# e.g. '[user]' or '[user, api]'
2522
# Include 'user' if the change is relevant to end users.
2623
# Include 'api' if there is a change to a library API.
2724
# Default: '[user]'
28-
change_logs: []
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]
Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,22 @@
44
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: cmd/mdatagen
7+
component: pkg/config/configretry
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Add first-class extended type aliases (int64, duration, opaque_string, id, opaque_map, etc.) to config schemas in metadata.yaml
10+
note: Migrate `BackOffConfig` to schema-based configuration generated by mdatagen.
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [15513]
13+
issues: [15502]
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.
18-
subtext: |
19-
Authors can now write `type: int64`, `type: duration`, `type: opaque_string`, `type: id`, or
20-
`type: opaque_map` directly as a property type in the `config:` section of `metadata.yaml`.
21-
Each alias expands to the correct JSON Schema representation and Go type automatically.
22-
Existing uses of standard JSON Schema types, `format:`, and `x-customType:` remain supported
23-
without migration.
18+
subtext:
2419

2520
# Optional: The change log or logs in which this entry should be included.
2621
# e.g. '[user]' or '[user, api]'
2722
# Include 'user' if the change is relevant to end users.
2823
# Include 'api' if there is a change to a library API.
2924
# Default: '[user]'
30-
change_logs: [user, api]
25+
change_logs: [api]

.chloggen/migrate_tls_config.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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. receiver/otlp)
7+
component: pkg/config/configtls
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Migrate `TLS` core types to schema-based configuration generated by mdatagen.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [15693]
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+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [api]
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
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. receiver/otlp)
7+
component: extension/zpages
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Make `confighttp.ServerConfig` a named field of `Config` instead of an embedded one.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [15308]
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+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[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

.github/workflows/contrib-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ jobs:
5151
- processor
5252
- exporter-0
5353
- exporter-1
54+
- exporter-2
55+
- exporter-3
5456
- extension
5557
- connector
5658
- internal

.github/workflows/utils/cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@
282282
"httpprovider",
283283
"httpsprovider",
284284
"httptest",
285+
"iblancasa",
285286
"icmpcheck",
286287
"icmpcheckreceiver",
287288
"illumos",

CHANGELOG-API.md

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,26 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG
77

88
<!-- next version -->
99

10+
## v1.64.0/v0.158.0
11+
12+
### 🛑 Breaking changes 🛑
13+
14+
- `pkg/xconfmap`: Remove `Validator` and `Validate` (#15613)
15+
Use the equivalent symbols in `confmap` instead.
16+
17+
### 💡 Enhancements 💡
18+
19+
- `cmd/mdatagen`: Add first-class extended type aliases (int64, duration, opaque_string, id, opaque_map, etc.) to config schemas in metadata.yaml (#15513)
20+
Authors can now write `type: int64`, `type: duration`, `type: opaque_string`, `type: id`, or
21+
`type: opaque_map` directly as a property type in the `config:` section of `metadata.yaml`.
22+
Each alias expands to the correct JSON Schema representation and Go type automatically.
23+
Existing uses of standard JSON Schema types, `format:`, and `x-customType:` remain supported
24+
without migration.
25+
26+
- `pkg/config/configgrpc`: Mark configgrpc as stable (#9477)
27+
28+
<!-- previous-version -->
29+
1030
## v1.63.0/v0.157.0
1131

1232
### 🛑 Breaking changes 🛑

0 commit comments

Comments
 (0)