Skip to content

Commit 5ac014e

Browse files
authored
Merge branch 'main' into mx-psi/optional-interfaces-versioning
2 parents 0333fef + 9d2685f commit 5ac014e

File tree

327 files changed

+4760
-4340
lines changed

Some content is hidden

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

327 files changed

+4760
-4340
lines changed

.chloggen/add-pkg-processorhelperprofiles.yaml

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

.chloggen/addNewTelemetrySettings.yaml

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

.chloggen/batch-processor-init-single-shard.yaml

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

.chloggen/codeboten_add-log-record-processor-config.yaml

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

.chloggen/configgrpc-client-update.yaml

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

.chloggen/add-otlp-distro.yaml renamed to .chloggen/feature-gate-help-cmd-option.yaml

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: enhancement
4+
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: featuregate
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Add otlp as supported distribution
10+
note: Fix an unfriendly display message `runtime error` when featuregate is used to display command line usage.
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [11527]
13+
issues: [11651]
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/codeboten_fix-resource-descrepancy.yaml renamed to .chloggen/fix-sample-count.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
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: service
7+
component: profiles
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: ensure traces and logs emitted by the otel go SDK use the same resource information
10+
note: Fix iteration over scope profiles while counting the samples.
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [11578]
13+
issues: [11688]
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/fixbuilderproviders2.yaml

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

.chloggen/otelcol_version.yaml

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

.chloggen/stabilityunmarshal.yaml renamed to .chloggen/re-deprecate-leveled.yaml

Lines changed: 3 additions & 3 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: enhancement
4+
change_type: deprecation
55

66
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
77
component: component
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Add UnmarshalText for StabilityLevel
10+
note: Mark `TelemetrySettings.LeveledMeterProvider` as deprecated
1111

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

0 commit comments

Comments
 (0)