Skip to content

Commit 92d27a8

Browse files
authored
Merge branch 'main' into patch-2
2 parents 8271433 + 6ccdc89 commit 92d27a8

File tree

285 files changed

+4461
-3898
lines changed

Some content is hidden

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

285 files changed

+4461
-3898
lines changed

.chloggen/codeboten_add-batching-to-debug.yaml

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

.chloggen/collector-shutdown.yaml

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

.chloggen/configtls-cert-validation.yaml

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

.chloggen/feat_go_modernize.yaml

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

.chloggen/otlp-1-8-0.yaml renamed to .chloggen/mx-psi_mark-configauth-as-1.0.yaml

Lines changed: 3 additions & 3 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: configauth
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Upgrade the OTLP protobuf definitions to version 1.8.0
10+
note: Mark configauth module as 1.0
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [13758]
13+
issues: [9476]
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.

.chloggen/mx-psi_move-request-creators.yaml renamed to .chloggen/mx-psi_remove-deprecated-symbols-exporterhelper.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ change_type: breaking
77
component: exporterhelper
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Remove deprecated function NewRequestsSizer
10+
note: Remove all experimental symbols in exporterhelper
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [13803]
13+
issues: [11143]
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:
18+
subtext: |
19+
They have all been moved to xexporterhelper
1920
2021
# Optional: The change log or logs in which this entry should be included.
2122
# e.g. '[user]' or '[user, api]'

.chloggen/profiles-otlp-1-8-0.yaml

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

.chloggen/expose_stability_lvl.yaml renamed to .chloggen/stable-use-custom-proto.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: mdatagen
7+
component: pdata
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Expose stability level in generated metric documentation
10+
note: Mark featuregate pdata.useCustomProtoEncoding as stable
1111

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

.chloggen/mx-psi_stabilize-exporter.yaml renamed to .chloggen/telemetry-tracesconfig-deprecated.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
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: deprecation
55

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

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Stabilize exporter module.
10+
note: service/telemetry.TracesConfig is deprecated
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [12978]
13+
issues: [13904]
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: This does not stabilize the exporterhelper module or configuration
18+
subtext: |
19+
This type alias has been added to otelconftelemetry.TracesConfig,
20+
where the otelconf-based telemetry implementation now lives.
1921
2022
# Optional: The change log or logs in which this entry should be included.
2123
# e.g. '[user]' or '[user, api]'

.github/actionlint.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
self-hosted-runner:
2-
labels: []
2+
labels:
3+
# Actionlint doesn't include yet windows-11-arm as a known runner, adding it
4+
# manually, see https://github.com/rhysd/actionlint/issues/533.
5+
- windows-11-arm
36

47
config-variables: null
58

0 commit comments

Comments
 (0)