Skip to content

Commit 08f8339

Browse files
authored
Merge branch 'main' into useStableNetworkAttributes
2 parents 26c13c4 + 4c1583c commit 08f8339

1,508 files changed

Lines changed: 77826 additions & 36173 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.

.checkapi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ ignored_paths:
22
- cmd/codecovgen
33
- cmd/telemetrygen
44
- cmd/opampsupervisor
5+
- config/configdbauth
56
- exporter/datadogexporter/integrationtest
67
- extension/observer
78
- extension/encoding
9+
- extension/dbauth
810
- extension/opampcustommessages
911
- extension/storage
1012
- pkg/batchperresourceattr

.chloggen/truncate-all-truncation-marker.yaml renamed to .chloggen/15280-datadogexporter-add-units.yaml

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

66
# The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
7-
component: pkg/ottl
7+
component: exporter/datadog
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Add an optional `truncation_marker` argument to the `truncate_all` function to append a marker to truncated values
10+
note: Add `exporter.datadogexporter.AddUnits` feature gate that maps OTLP (UCUM) metric units to their Datadog equivalents.
1111

1212
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13-
issues: [49319]
13+
issues: [15280]
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: |
1919
2020
# If your change doesn't affect end users or the exported elements of any package,
2121
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
change_type: bug_fix
2+
component: receiver/fluent_forward
3+
note: Delay Fluent Forward chunk acknowledgments until logs are successfully consumed downstream.
4+
issues: [46973]
5+
change_logs: [user]

.chloggen/47674-fileexporter-migrate-lumberjack-backups.yaml

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

.chloggen/48090-kafkaexporter-request-type-gate.yaml

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

.chloggen/48280-genainormalizer-overwrite-schema-url.yaml

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

.chloggen/48887-tailsamplingprocessor-race-fix.yaml

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

.chloggen/49161-hostmetrics-cpu-attribute-opt-in.yaml

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

.chloggen/49171-metricstransform-submatchcase-fix.yaml

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

.chloggen/esexporter-retry-config-per-document-48681.yaml renamed to .chloggen/49337-elasticsearch-datastream-type.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ change_type: enhancement
77
component: exporter/elasticsearch
88

99
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10-
note: Add `retry::retry_on_document_status` to configure document-level retry status codes separately from request-level retries.
10+
note: "Allow `traces`, `profiles`, and `synthetics` as valid `data_stream.type` values when overriding via attributes in `bodymap` mapping mode, in addition to the existing `logs` and `metrics`."
1111

1212
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13-
issues: [48681]
13+
issues: [49337]
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)