From 85da6f8e1937a4069fb766f41dbf4ea5c31514b5 Mon Sep 17 00:00:00 2001
From: jim wang <122244446+jimwang118@users.noreply.github.com>
Date: Sat, 3 Jun 2023 02:16:57 +0800
Subject: [PATCH] [opentelemetry_cpp] Update to 1.9.1 (#31754)

* update to 1.9.1

* update versions

* add blank line

* update version
---
 .../opentelemetry-cpp/add-missing-dependencies.patch | 12 ++++++------
 .../add-missing-find-dependency.patch                |  6 +++---
 ports/opentelemetry-cpp/portfile.cmake               |  2 +-
 ports/opentelemetry-cpp/vcpkg.json                   |  3 +--
 versions/baseline.json                               |  4 ++--
 versions/o-/opentelemetry-cpp.json                   |  5 +++++
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/ports/opentelemetry-cpp/add-missing-dependencies.patch b/ports/opentelemetry-cpp/add-missing-dependencies.patch
index 585fd8a4e1..2de8be70c7 100644
--- a/ports/opentelemetry-cpp/add-missing-dependencies.patch
+++ b/ports/opentelemetry-cpp/add-missing-dependencies.patch
@@ -1,15 +1,15 @@
 diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake
-index 1aa1ba0..10e2f58 100644
+index 34b33d3..19e67e9 100644
 --- a/cmake/opentelemetry-proto.cmake
 +++ b/cmake/opentelemetry-proto.cmake
-@@ -285,6 +285,10 @@ else() # cmake 3.8 or lower
-   target_link_libraries(opentelemetry_proto INTERFACE ${Protobuf_LIBRARIES})
+@@ -311,6 +311,10 @@ if(WITH_OTLP_GRPC)
+   endif()
  endif()
- 
+
 +if(TARGET gRPC::grpc++)
 +  target_link_libraries(opentelemetry_proto PUBLIC gRPC::grpc++)
 +endif()
 +
  if(BUILD_SHARED_LIBS)
-   set_property(TARGET opentelemetry_proto PROPERTY POSITION_INDEPENDENT_CODE ON)
- endif()
+   foreach(proto_target ${OPENTELEMETRY_PROTO_TARGETS})
+     set_property(TARGET ${proto_target} PROPERTY POSITION_INDEPENDENT_CODE ON)
diff --git a/ports/opentelemetry-cpp/add-missing-find-dependency.patch b/ports/opentelemetry-cpp/add-missing-find-dependency.patch
index fc125e5800..1f9c12d163 100644
--- a/ports/opentelemetry-cpp/add-missing-find-dependency.patch
+++ b/ports/opentelemetry-cpp/add-missing-find-dependency.patch
@@ -1,13 +1,13 @@
 diff --git a/cmake/opentelemetry-cpp-config.cmake.in b/cmake/opentelemetry-cpp-config.cmake.in
-index adae58dd..26427722 100644
+index adae58d..2642772 100644
 --- a/cmake/opentelemetry-cpp-config.cmake.in
 +++ b/cmake/opentelemetry-cpp-config.cmake.in
 @@ -69,6 +69,8 @@ set(OPENTELEMETRY_VERSION
  # ##############################################################################
- 
+
  find_package(Threads)
 +include(CMakeFindDependencyMacro)
 +find_dependency(absl)
- 
+
  set_and_check(OPENTELEMETRY_CPP_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@")
  set_and_check(OPENTELEMETRY_CPP_LIBRARY_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake
index 154a01c2f9..fa3749a846 100644
--- a/ports/opentelemetry-cpp/portfile.cmake
+++ b/ports/opentelemetry-cpp/portfile.cmake
@@ -6,7 +6,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open-telemetry/opentelemetry-cpp
     REF "v${VERSION}"
-    SHA512 eb7dde38134fd9f51f22a2288a3a1db9eeec3dce3889c02fea82e20738a697449be73d632c3d1889ff159f0274d57bfd066db506149b221fe6ced8f18fdc1237
+    SHA512 86cf0320f9ee50bc1aa2b7a8b254fb0df25d1bd1f5f01ebc3630ab7fe2f6ca5e53ca8e042518b4e7096dbb102c0b880e9a25fcdf5f668d24ff57d9247237bf62
     HEAD_REF main
     PATCHES
         # Use the compiler's default C++ version. Picking a version with
diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json
index aa00547dcf..b525fbeb2d 100644
--- a/ports/opentelemetry-cpp/vcpkg.json
+++ b/ports/opentelemetry-cpp/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "name": "opentelemetry-cpp",
-  "version-semver": "1.8.3",
-  "port-version": 6,
+  "version-semver": "1.9.1",
   "description": [
     "OpenTelemetry is a collection of tools, APIs, and SDKs.",
     "You use it to instrument, generate, collect, and export telemetry data (metrics, logs, and traces) for analysis in order to understand your software's performance and behavior."
diff --git a/versions/baseline.json b/versions/baseline.json
index 0035d264ef..ea396e3c61 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6009,8 +6009,8 @@
       "port-version": 0
     },
     "opentelemetry-cpp": {
-      "baseline": "1.8.3",
-      "port-version": 6
+      "baseline": "1.9.1",
+      "port-version": 0
     },
     "opentracing": {
       "baseline": "1.6.0",
diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json
index 347650bed4..9afb692e57 100644
--- a/versions/o-/opentelemetry-cpp.json
+++ b/versions/o-/opentelemetry-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "47c5c172ee9a7c663746a3c1cbabb359a1cbaf56",
+      "version-semver": "1.9.1",
+      "port-version": 0
+    },
     {
       "git-tree": "dfd999f93f24e916631d57bf73c0bf02f8c2da0a",
       "version-semver": "1.8.3",