Merge branch 'main' into fix_2417

open-telemetry · Dec 5, 2023 · 2d3cd10 · 2d3cd10
2 parents 1f8d3d4 + 39ad238
commit 2d3cd10
Show file tree

Hide file tree

Showing 4 changed files with 1,199 additions and 1,135 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,8 @@ Increment the:
   [#2398](https://github.com/open-telemetry/opentelemetry-cpp/pull/2398)
 * [EXPORTER] Rework OTLP/HTTP and OTLP/GRPC exporter options
   [#2388](https://github.com/open-telemetry/opentelemetry-cpp/pull/2388)
+* [SEMANTIC CONVENTION] Upgrade to semconv 1.23.1
+  [#2428](https://github.com/open-telemetry/opentelemetry-cpp/pull/2428)
 
 Important changes: