Merge branch 'main' into main

Author: lalitb

CHANGELOG.md

@@ -21,6 +21,7 @@ Increment the:
 * [EXPORTER] OTLP http exporter allow concurrency session ([#1209](https://github.com/open-telemetry/opentelemetry-cpp/pull/1209))
 * [EXT] `curl::HttpClient` use `curl_multi_handle` instead of creating a thread
   for every request and it's able to reuse connections now. ([#1317](https://github.com/open-telemetry/opentelemetry-cpp/pull/1317))
+* [SEMANTIC CONVENTIONS] Upgrade to version 1.12.0 [#873](https://github.com/open-telemetry/opentelemetry-cpp/pull/873)
 
 ## [1.4.1] 2022-06-19
 

RELEASING.md

@@ -2,24 +2,27 @@
 
 ## Pre Release
 
-1: Make sure all relevant changes for this release are included under
+1: Upgrade to latest [semantic-conventions](docs/semantic-conventions.md)
+if required.
+
+2: Make sure all relevant changes for this release are included under
 `Unreleased` section in `CHANGELOG.md` and are in language that non-contributors
 to the project can understand.
 
-2: Run the pre-release script. It creates a branch `pre_release_<new-tag>` and
+3: Run the pre-release script. It creates a branch `pre_release_<new-tag>` and
 updates `CHANGELOG.md` with the `<new-tag>`:
 
 ```sh
 ./buildscripts/pre_release.sh -t <new-tag>
 ```
 
-3: Verify that CHANGELOG.md is updated properly:
+4: Verify that CHANGELOG.md is updated properly:
 
 ```sh
 git diff main
 ```
 
-4: Push the changes to upstream and create a Pull Request on GitHub. Be sure to
+5: Push the changes to upstream and create a Pull Request on GitHub. Be sure to
 include the curated changes from the [Changelog](./CHANGELOG.md) in the
 description.
 

api/include/opentelemetry/trace/experimental_semantic_conventions.h

@@ -7,6 +7,8 @@
 // https://github.com/open-telemetry/opentelemetry-specification/tree/v1.0.0/specification/trace/semantic_conventions
 // and MAY will change in future.
 
+// "This file is deprecated. Use opentelemetry/trace/semantic_conventions.h"
+
 #pragma once
 
 #include "opentelemetry/common/string_util.h"