From 737da806fb3a2b261e188b1739d49822f64c6f05 Mon Sep 17 00:00:00 2001
From: Lalit Kumar Bhasin <labhas@microsoft.com>
Date: Mon, 22 Aug 2022 18:51:11 -0700
Subject: [PATCH] Upgrade opentelemetry-proto to v0.19.0 (#1579)

* changes

* add changelog

* update third_party_release
---
 CHANGELOG.md                    | 6 ++++++
 bazel/repository.bzl            | 6 +++---
 cmake/opentelemetry-proto.cmake | 2 +-
 third_party_release             | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dca2414944..1016dff298 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ Increment the:
 
 ## [Unreleased]
 
+<<<<<<< HEAD
 *   [TRACE SDK] Add trace sdk builders (#1393)
     [#1471](https://github.com/open-telemetry/opentelemetry-cpp/pull/1471)
 *   [EXAMPLE] Fix memory ownership of InMemorySpanExporter (#1473)
@@ -32,6 +33,11 @@ Increment the:
     [#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)
+=======
+* [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))
 
     ## [1.6.0] 2022-08-15
 
diff --git a/bazel/repository.bzl b/bazel/repository.bzl
index e7d52b8b4e..6ed9c470f8 100644
--- a/bazel/repository.bzl
+++ b/bazel/repository.bzl
@@ -87,10 +87,10 @@ def opentelemetry_cpp_deps():
         http_archive,
         name = "com_github_opentelemetry_proto",
         build_file = "@io_opentelemetry_cpp//bazel:opentelemetry_proto.BUILD",
-        sha256 = "134ce87f0a623daac19b9507b92da0d9b82929e3db796bba631e422f6ea8d3b3",
-        strip_prefix = "opentelemetry-proto-0.18.0",
+        sha256 = "464bc2b348e674a1a03142e403cbccb01be8655b6de0f8bfe733ea31fcd421be",
+        strip_prefix = "opentelemetry-proto-0.19.0",
         urls = [
-            "https://github.com/open-telemetry/opentelemetry-proto/archive/v0.18.0.tar.gz",
+            "https://github.com/open-telemetry/opentelemetry-proto/archive/v0.19.0.tar.gz",
         ],
     )
 
diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake
index 37d45da6c4..629ea8158c 100644
--- a/cmake/opentelemetry-proto.cmake
+++ b/cmake/opentelemetry-proto.cmake
@@ -3,7 +3,7 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/opentelemetry-proto/.git)
   set(needs_proto_download FALSE)
 else()
   if("${opentelemetry-proto}" STREQUAL "")
-    set(opentelemetry-proto "v0.17.0")
+    set(opentelemetry-proto "v0.19.0")
   endif()
   include(ExternalProject)
   ExternalProject_Add(
diff --git a/third_party_release b/third_party_release
index 8d3d131516..2ae3f75bab 100644
--- a/third_party_release
+++ b/third_party_release
@@ -18,6 +18,6 @@ benchmark=v1.5.3
 googletest=release-1.10.0-459-ga6dfd3ac
 ms-gsl=v3.1.0-67-g6f45293
 nlohmann-json=v3.10.5
-opentelemetry-proto=v0.18.0
+opentelemetry-proto=v0.19.0
 prometheus-cpp=v1.0.0
 vcpkg=2022.04.12