Merge branch 'main' into logs-map-to-list

open-telemetry · Mar 14, 2024 · 797ceff · 797ceff
2 parents 5c3cce5 + a5ce0bc
commit 797ceff
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,9 @@ release.
 
 ### Compatibility
 
+- Prometheus compatibility: Clarify naming of the target info metric, and differences between various Prometheus formats.
+  ([#3871](https://github.com/open-telemetry/opentelemetry-specification/pull/3871))
+
 ### SDK Configuration
 
 ### Common