Skip to content

Commit 2004266

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collector into 15010
2 parents 15ddee8 + 8d9d794 commit 2004266

271 files changed

Lines changed: 5558 additions & 4320 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.
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +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: new_component
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: processor/queuebatch
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: "New `queuebatchprocessor` to replace the legacy `batchprocessor`."
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: [15047, 13582, 12022, 11308, 8272, 6046]
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.
18-
subtext: "New implementation is based exporterhelper, uses same configuration as `sending_queue`."
18+
subtext: |
1919
2020
# Optional: The change log or logs in which this entry should be included.
2121
# e.g. '[user]' or '[user, api]'
2222
# Include 'user' if the change is relevant to end users.
2323
# Include 'api' if there is a change to a library API.
2424
# Default: '[user]'
25-
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/mdatagen_extended_types.yaml

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

.chloggen/mdatagen-versioned-metrics-handle-attribute-renames-correctly.yaml renamed to .chloggen/migrate_configretry.yaml

Lines changed: 6 additions & 9 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: 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: Versioned metrics don't handle renamed attributes with same type
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: [15595]
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-
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.
18+
subtext:
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]
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: 'bug_fix'
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: cmd/mdatagen
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: Removes the extra line in the documentation.md around description
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: [15664]
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.
@@ -22,4 +22,4 @@ subtext:
2222
# Include 'user' if the change is relevant to end users.
2323
# Include 'api' if there is a change to a library API.
2424
# Default: '[user]'
25-
change_logs: []
25+
change_logs: [api]
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: '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: 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: Fix incorrect collision warning for versioned metrics with different emitted names
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: [15648]
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-
Same name collision detection (type/attribute checks) was being used for versioned metrics
20-
with different names. This caused the legacy metric to be disabled which was incorrect and also
21-
a warning msg was being incorrectly logged that stated the metrics had the same name when in
22-
fact they had different names.
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: []
25+
change_logs: [api]

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 🛑

CHANGELOG.md

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

88
<!-- next version -->
99

10+
## v1.64.0/v0.158.0
11+
12+
### 🚀 New components 🚀
13+
14+
- `processor/queuebatch`: New `queuebatchprocessor` to replace the legacy `batchprocessor`. (#15047, #13582, #12022, #11308, #8272, #6046)
15+
New implementation is based exporterhelper, uses same configuration as `sending_queue`.
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+
- `extension/memory_limiter`: Promote the memory limiter extension to beta stability. (#14533)
27+
28+
### 🧰 Bug fixes 🧰
29+
30+
- `cmd/mdatagen`: Removes the extra line in the documentation.md around description (#15664)
31+
- `cmd/mdatagen`: Auto-enable v1 metrics when legacy metric is enabled and v1 feature gate is on (#15650)
32+
When the v1 feature gate is enabled and a legacy metric is enabled, the corresponding
33+
v1 metric is now programmatically enabled so users don't need to add the v1 metric
34+
to their config.
35+
36+
- `cmd/mdatagen`: Fix incorrect collision warning for versioned metrics with different emitted names (#15648)
37+
Same name collision detection (type/attribute checks) was being used for versioned metrics
38+
with different names. This caused the legacy metric to be disabled which was incorrect and also
39+
a warning msg was being incorrectly logged that stated the metrics had the same name when in
40+
fact they had different names.
41+
42+
- `cmd/mdatagen`: Versioned metrics don't handle renamed attributes with same type (#15595)
43+
Versioned metrics need to support emitting legacy and latest attributes when the metric name is the same but the
44+
attributes names differ. This was not working when the attributes name changed but the type remained the same.
45+
Here we add support to versioned metrics with renamed attributes where those attributes have the same type.
46+
47+
- `exporter/debug`: Fix profile sample attribute formatting for non-string values (#15647)
48+
Previously, non-string values produced malformed output such as `%!s(int64=42)`.
49+
Profile sample attributes now use the debug exporter's typed attribute format, such as `Int(42)`.
50+
This will also change strings from `hello-world` to `Str(hello-world)`.
51+
52+
- `pkg/config/configtls`: Fix goroutine and file descriptor leak when `client_ca_file_reload` is enabled (#9221)
53+
Every call to `ServerConfig.LoadTLSConfig` with `client_ca_file_reload` enabled started a
54+
file watcher goroutine that could never be stopped, since the reloader was not reachable
55+
from the returned `*tls.Config`. The client CA file is now checked for changes while TLS
56+
handshakes are served, at most once per second, matching how `reload_interval` already
57+
reloads the server certificate. No background goroutine is started, so nothing is left
58+
behind when a server is torn down and recreated.
59+
60+
61+
<!-- previous-version -->
62+
1063
## v1.63.0/v0.157.0
1164

1265
### 🛑 Breaking changes 🛑

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ Here is a list of community roles with current and previous members:
163163

164164
### Maintainers
165165

166-
- [Alex Boten](https://github.com/codeboten), Honeycomb
166+
- [Alex Boten](https://github.com/codeboten), Grafana Labs
167167
- [Bogdan Drutu](https://github.com/bogdandrutu), Snowflake
168168
- [Dmitrii Anoshin](https://github.com/dmitryax), Splunk
169169
- [Evan Bradley](https://github.com/evan-bradley), Dynatrace

client/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.25.0
44

55
require (
66
github.com/stretchr/testify v1.11.1
7-
go.opentelemetry.io/collector/consumer v1.63.0
8-
go.opentelemetry.io/collector/pdata v1.63.0
7+
go.opentelemetry.io/collector/consumer v1.64.0
8+
go.opentelemetry.io/collector/pdata v1.64.0
99
go.uber.org/goleak v1.3.0
1010
)
1111

@@ -16,7 +16,7 @@ require (
1616
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
1717
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
1818
github.com/pmezard/go-difflib v1.0.0 // indirect
19-
go.opentelemetry.io/collector/featuregate v1.63.0 // indirect
19+
go.opentelemetry.io/collector/featuregate v1.64.0 // indirect
2020
go.uber.org/multierr v1.11.0 // indirect
2121
gopkg.in/yaml.v3 v3.0.1 // indirect
2222
)

0 commit comments

Comments
 (0)