Skip to content

Commit 20f9c14

Browse files
authored
Merge branch 'main' into codeboten/mark-semconv-deprecated
2 parents 050a339 + 943627b commit 20f9c14

File tree

132 files changed

+1198
-1472
lines changed

Some content is hidden

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

132 files changed

+1198
-1472
lines changed

.chloggen/12948.yaml

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

.chloggen/codeboten_remove-deprecated-funcs.yaml

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

.chloggen/codeboten_remove-internal-semconv-dep.yaml

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

.chloggen/confmap-append-merge-components.yaml

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

.chloggen/fix-panic-enableMergeAppendOption.yaml

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

.chloggen/fix-resource-attributes-internal-console-logger.yaml

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

.chloggen/metadata-events-func.yaml

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

.chloggen/mdatagen-event-definition.yaml renamed to .chloggen/mx-psi_decodenil.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: cmd/mdatagen
7+
component: confmap
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Add type definition for events in mdatagen
10+
note: Support running Unmarshal hooks on nil values.
1111

1212
# One or more tracking issues or pull requests related to the change
13-
issues: [12571]
13+
issues: [12981]
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_naming-configauth.yaml

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

.chloggen/pipeline-component-metrics.yaml

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

0 commit comments

Comments
 (0)