resolved merge conlficts

Signed-off-by: singhvibhanshu <find.vibhanshu@gmail.com>

Author: singhvibhanshu

.checkapi.yaml

@@ -2,9 +2,11 @@ ignored_paths:
   - cmd/codecovgen
   - cmd/telemetrygen
   - cmd/opampsupervisor
+  - config/configdbauth
   - exporter/datadogexporter/integrationtest
   - extension/observer
   - extension/encoding
+  - extension/dbauth
   - extension/opampcustommessages
   - extension/storage
   - pkg/batchperresourceattr

.chloggen/oracledb-sga-metrics.yaml …gen/15280-datadogexporter-add-units.yaml.chloggen/oracledb-sga-metrics.yaml renamed to .chloggen/15280-datadogexporter-add-units.yaml .chloggen/oracledb-sga-metrics.yaml renamed to .chloggen/15280-datadogexporter-add-units.yaml

@@ -4,19 +4,18 @@
 change_type: enhancement
 
 # The name of the component, or a single word describing the area of concern, (e.g. receiver/filelog)
-component: receiver/oracledb
+component: exporter/datadog
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Add SGA component memory metrics
+note: Add `exporter.datadogexporter.AddUnits` feature gate that maps OTLP (UCUM) metric units to their Datadog equivalents.
 
 # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
-issues: [48540]
+issues: [15280]
 
 # (Optional) One or more lines of additional information to render under the primary note.
 # These lines will be padded with 2 spaces and then inserted directly into the document.
 # Use pipe (|) for multiline entries.
 subtext: |
-  Adds the opt-in metrics `oracledb.sga.usage` and `oracledb.sga.limit`.
 
 # If your change doesn't affect end users or the exported elements of any package,
 # you should instead start your pull request title with [chore] or use the "Skip Changelog" label.

.chloggen/44836.yaml

@@ -0,0 +1,5 @@
+change_type: bug_fix
+component: receiver/fluent_forward
+note: Delay Fluent Forward chunk acknowledgments until logs are successfully consumed downstream.
+issues: [46973]
+change_logs: [user]