[SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (open-telemetry#1761)

CHANGELOG.md

@@ -51,6 +51,8 @@ Increment the:
 * [METRICS SDK] - Remove old metrics from Github CI
   [#1733](https://github.com/open-telemetry/opentelemetry-cpp/pull/1733)
 * [BUILD] Add CMake OTELCPP_PROTO_PATH [#1730](https://github.com/open-telemetry/opentelemetry-cpp/pull/1730)
+* [SEMANTIC CONVENTIONS] Upgrade to version 1.15.0
+  [#1761](https://github.com/open-telemetry/opentelemetry-cpp/pull/1761)
 
 <<<<<<< HEAD
 >>>>>>> 7634edf4 ([Logs SDK] LogProcessor, LogExporter changes (#1727))
@@ -80,7 +82,22 @@ Deprecation notes:
     Note that function `opentelemetry::utils::hashCode`,
     declared in the ETW exporter, is not affected by this deprecation.
 
+<<<<<<< HEAD
 >>>>>>> 702a68c1 ([Deprecation] Deprecate experimental semantic conventions (#1742) (#1744))
+=======
+Breaking changes:
+
+* [SEMANTIC CONVENTIONS] Upgrade to version 1.15.0
+  [#1761](https://github.com/open-telemetry/opentelemetry-cpp/pull/1761)
+  * Naming of semantic conventions has changed from uppercase constants,
+    like `SemanticConventions::SERVICE_NAME`,
+    to camel case, like `SemanticConventions::kServiceName`.
+    This is necessary to avoid collisions with macros in general,
+    which breaks the build on some platforms.
+  * Semantic conventions are flagged as experimental,
+    which is why this change is done in this release.
+
+>>>>>>> d7a388b1 ([SEMANTIC CONVENTIONS] Upgrade to version 1.15.0 (#1761))
 ## [1.7.0] 2022-10-28
 
 * [METRICS SDK] Validate Instrument meta data (name, unit, description) [#1713](https://github.com/open-telemetry/opentelemetry-cpp/pull/1713)