Merge branch 'main' into root-active-span

open-telemetry · Dec 5, 2023 · e044771 · e044771
2 parents 204c170 + d91e5ba
commit e044771
Show file tree

Hide file tree

Showing 21 changed files with 1,315 additions and 1,238 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: