Upgrade opentelemetry-proto to v0.19.0 (open-telemetry#1579)

* changes

* add changelog

* update third_party_release

CHANGELOG.md

@@ -17,6 +17,7 @@ Increment the:
 
 ## [Unreleased]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 ## [1.8.1] 2022-12-04
 
@@ -269,6 +270,8 @@ update the semantic convention in instrumentation library is needed.
 * [METRICS SDK] Add in-memory metrics exporter [#1405](https://github.com/open-telemetry/opentelemetry-cpp/pull/1405)
 >>>>>>> b7204b70 (Fix md lint.)
 =======
+=======
+>>>>>>> 737da806 (Upgrade opentelemetry-proto to v0.19.0 (#1579))
 *   [TRACE SDK] Add trace sdk builders (#1393)
     [#1471](https://github.com/open-telemetry/opentelemetry-cpp/pull/1471)
 *   [EXAMPLE] Fix memory ownership of InMemorySpanExporter (#1473)
@@ -284,7 +287,15 @@ update the semantic convention in instrumentation library is needed.
     [#1405](https://github.com/open-telemetry/opentelemetry-cpp/pull/1405)
 *   [SEMANTIC CONVENTIONS] Upgrade to version 1.12.0
     [#873](https://github.com/open-telemetry/opentelemetry-cpp/pull/873)
+<<<<<<< HEAD
 >>>>>>> d9ad0afb (Add automatically semantic conventions from the spec (#873) (#1497))
+=======
+=======
+* [BUILD] Upgrade opentelemetry-proto to v0.19.0 [#1579](https://github.com/open-telemetry/opentelemetry-cpp/pull/1579)
+
+## [1.6.0] 2022-08-15
+>>>>>>> 39d6a225 (Upgrade opentelemetry-proto to v0.19.0 (#1579))
+>>>>>>> 737da806 (Upgrade opentelemetry-proto to v0.19.0 (#1579))
 
     ## [1.6.0] 2022-08-15
 

cmake/opentelemetry-proto.cmake

@@ -33,6 +33,7 @@ if(OTELCPP_PROTO_PATH)
   set(PROTO_PATH ${OTELCPP_PROTO_PATH})
   set(needs_proto_download FALSE)
 else()
+<<<<<<< HEAD
   if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/opentelemetry-proto/.git)
     message(STATUS "opentelemetry-proto dependency satisfied by: git submodule")
     set(PROTO_PATH "${CMAKE_CURRENT_SOURCE_DIR}/third_party/opentelemetry-proto")
@@ -59,6 +60,10 @@ else()
     ExternalProject_Get_Property(opentelemetry-proto INSTALL_DIR)
     set(PROTO_PATH "${INSTALL_DIR}/src/opentelemetry-proto")
     set(needs_proto_download TRUE)
+=======
+  if("${opentelemetry-proto}" STREQUAL "")
+    set(opentelemetry-proto "v0.19.0")
+>>>>>>> 737da806 (Upgrade opentelemetry-proto to v0.19.0 (#1579))
   endif()
 endif()