Skip to content

Commit d296af7

Browse files
authored
Merge branch 'main' into memorylimiter_middleware
2 parents f7888f5 + 5060166 commit d296af7

File tree

462 files changed

+8020
-5258
lines changed

Some content is hidden

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

462 files changed

+8020
-5258
lines changed

.chloggen/14005.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. otlpreceiver)
7+
component: pkg/config/configgrpc
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Errors of type status.Status returned from an Authenticator extension are being propagated as is to the upstream client."
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14005]
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: [user]

.chloggen/README.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
### Changelog folder
2+
3+
This repo uses `chloggen` to manage its changelog files. You can find the source code for the tool [here](https://github.com/open-telemetry/opentelemetry-go-build-tools/tree/main/chloggen).
4+
5+
Here is a quick explanation of the `config.yaml` file for chloggen:
6+
7+
```yaml
8+
# The directory that stores individual changelog entries.
9+
# Each entry is stored in a dedicated yaml file.
10+
# - 'chloggen new' will copy the 'template_yaml' to this directory as a new entry file.
11+
# - 'chloggen validate' will validate that all entry files are valid.
12+
# - 'chloggen update' will read and delete all entry files in this directory, and update 'changelog_md'.
13+
# Specify as relative path from root of repo.
14+
# (Optional) Default: .chloggen
15+
entries_dir: .chloggen
16+
17+
# This file is used as the input for individual changelog entries.
18+
# Specify as relative path from root of repo.
19+
# (Optional) Default: .chloggen/TEMPLATE.yaml
20+
template_yaml: .chloggen/TEMPLATE.yaml
21+
22+
summary_template: .chloggen/summary.tmpl
23+
24+
# The CHANGELOG file or files to which 'chloggen update' will write new entries
25+
# (Optional) Default filename: CHANGELOG.md
26+
change_logs:
27+
user: CHANGELOG.md
28+
api: CHANGELOG-API.md
29+
30+
# The default change_log or change_logs to which an entry should be added.
31+
# If 'change_logs' is specified in this file, and no value is specified for 'default_change_logs',
32+
# then 'change_logs' MUST be specified in every entry file.
33+
default_change_logs: [user]
34+
```

.chloggen/config.yaml

Lines changed: 63 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,66 @@
1-
# The directory that stores individual changelog entries.
2-
# Each entry is stored in a dedicated yaml file.
3-
# - 'chloggen new' will copy the 'template_yaml' to this directory as a new entry file.
4-
# - 'chloggen validate' will validate that all entry files are valid.
5-
# - 'chloggen update' will read and delete all entry files in this directory, and update 'changelog_md'.
6-
# Specify as relative path from root of repo.
7-
# (Optional) Default: .chloggen
1+
change_logs:
2+
api: CHANGELOG-API.md
3+
user: CHANGELOG.md
4+
default_change_logs:
5+
- user
86
entries_dir: .chloggen
9-
10-
# This file is used as the input for individual changelog entries.
11-
# Specify as relative path from root of repo.
12-
# (Optional) Default: .chloggen/TEMPLATE.yaml
137
template_yaml: .chloggen/TEMPLATE.yaml
14-
158
summary_template: .chloggen/summary.tmpl
16-
17-
# The CHANGELOG file or files to which 'chloggen update' will write new entries
18-
# (Optional) Default filename: CHANGELOG.md
19-
change_logs:
20-
user: CHANGELOG.md
21-
api: CHANGELOG-API.md
22-
23-
# The default change_log or change_logs to which an entry should be added.
24-
# If 'change_logs' is specified in this file, and no value is specified for 'default_change_logs',
25-
# then 'change_logs' MUST be specified in every entry file.
26-
default_change_logs: [user]
9+
components:
10+
- all
11+
- cmd/builder
12+
- cmd/mdatagen
13+
- connector/forward
14+
- connector/sample
15+
- consumer/xconsumer
16+
- docs/rfcs
17+
- exporter/debug
18+
- exporter/nop
19+
- exporter/otlp
20+
- exporter/otlphttp
21+
- extension/memory_limiter
22+
- extension/xextension
23+
- extension/xextension
24+
- extension/zpages
25+
- pdata/pprofile
26+
- pdata/xpdata
27+
- pkg/config/configauth
28+
- pkg/config/configcompression
29+
- pkg/config/configgrpc
30+
- pkg/config/confighttp
31+
- pkg/config/configmiddleware
32+
- pkg/config/confignet
33+
- pkg/config/configopaque
34+
- pkg/config/configoptional
35+
- pkg/config/configretry
36+
- pkg/config/configtelemetry
37+
- pkg/config/configtls
38+
- pkg/confmap
39+
- pkg/exporterhelper
40+
- pkg/otelcol
41+
- pkg/pdata
42+
- pkg/processorhelper
43+
- pkg/queuebatch
44+
- pkg/receiverhelper
45+
- pkg/scraper
46+
- pkg/scraperhelper
47+
- pkg/service
48+
- pkg/xconnector
49+
- pkg/xexporter
50+
- pkg/xexporterhelper
51+
- pkg/xprocessor
52+
- pkg/xreceiver
53+
- processor/batch
54+
- processor/memory_limiter
55+
- processor/sample
56+
- provider/env
57+
- provider/file
58+
- provider/http
59+
- provider/https
60+
- provider/yaml
61+
- receiver/nop
62+
- receiver/otlp
63+
- receiver/sample
64+
- receiver/sample
65+
- scraper/sample
66+
- service/graph

.chloggen/stable-use-custom-proto.yaml renamed to .chloggen/fips140-confighttp-testhttpreception.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
change_type: enhancement
55

66
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7-
component: pdata
7+
component: all
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Mark featuregate pdata.useCustomProtoEncoding as stable
10+
note: Add FIPS and non-FIPS implementations for allowed TLS curves
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [13883]
13+
issues: [13990]
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: [api, user]
25+
change_logs: [user]

.chloggen/fix_cmd_mdata-gen-metrics.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
change_type: bug_fix
55

66
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7-
component: mdatagen
7+
component: cmd/mdatagen
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
1010
note: Fix mdatagen generated_metrics for connectors
@@ -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: [api]
25+
change_logs: [api]
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: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: cmd/mdatagen
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: "Replace `optional` field with `requirement_level` field for attributes in metadata schema"
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [13913]
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+
The `optional` boolean field for attributes has been replaced with a `requirement_level` field that accepts enum values: `required`, `conditionally_required`, `recommended`, or `opt_in`.
20+
- `required`: attribute is always included and cannot be excluded
21+
- `conditionally_required`: attribute is included by default when certain conditions are met (replaces `optional: true`)
22+
- `recommended`: attribute is included by default but can be disabled via configuration (replaces `optional: false`)
23+
- `opt_in`: attribute is not included unless explicitly enabled in user config
24+
When `requirement_level` is not specified, it defaults to `recommended`.
25+
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: 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. otlpreceiver)
7+
component: pkg/config/configoptional
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Adds new `configoptional.AddEnabledField` feature gate that allows users to explicitly disable a `configoptional.Optional` through a new `enabled` field.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14021]
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: []
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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. otlpreceiver)
7+
component: pkg/otelcol
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Require a telemetry factory to be injected through otelcol.Factories
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [4970]
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+
otelcol.Factories now has a required Telemetry field,
20+
which contains the telemetry factory to be used by the service.
21+
Set it to otelconftelemetry.NewFactory() for the existing behavior.
22+
23+
# Optional: The change log or logs in which this entry should be included.
24+
# e.g. '[user]' or '[user, api]'
25+
# Include 'user' if the change is relevant to end users.
26+
# Include 'api' if there is a change to a library API.
27+
# Default: '[user]'
28+
change_logs: [api]

.chloggen/pprofile-set-stack.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. otlpreceiver)
7+
component: pdata/pprofile
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Introduce `SetStack` method
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [14007]
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: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@
44
change_type: breaking
55

66
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7-
component: exporterhelper
7+
component: pdata/pprofile
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Remove all experimental symbols in exporterhelper
10+
note: Update `SetFunction` to return the function's ID rather than update the Line
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [11143]
13+
issues: [14016, 14032]
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-
They have all been moved to xexporterhelper
18+
subtext:
2019

2120
# Optional: The change log or logs in which this entry should be included.
2221
# e.g. '[user]' or '[user, api]'

0 commit comments

Comments
 (0)