From 87fee590280b247faee75f61a2ed51361881bb62 Mon Sep 17 00:00:00 2001
From: Bruce Mitchener <bruce.mitchener@gmail.com>
Date: Tue, 2 Jan 2024 18:10:32 -0500
Subject: [PATCH] [opentelemetry-cpp] Update to 1.13.0

The patch to add a dependency of opentelemetry-proto on gRPC should
not be needed after the upstream changes in:

https://github.com/open-telemetry/opentelemetry-cpp/pull/2268

Additionally, the "zpages" feature is removed as it is no longer
present upstream after having been deprecated in a previous release.
---
 .../add-missing-dependencies.patch                | 15 ---------------
 ports/opentelemetry-cpp/portfile.cmake            |  6 +-----
 ports/opentelemetry-cpp/vcpkg.json                |  6 +-----
 versions/baseline.json                            |  4 ++--
 versions/o-/opentelemetry-cpp.json                |  5 +++++
 5 files changed, 9 insertions(+), 27 deletions(-)
 delete mode 100644 ports/opentelemetry-cpp/add-missing-dependencies.patch

diff --git a/ports/opentelemetry-cpp/add-missing-dependencies.patch b/ports/opentelemetry-cpp/add-missing-dependencies.patch
deleted file mode 100644
index 2de8be70c7a2c1..00000000000000
--- a/ports/opentelemetry-cpp/add-missing-dependencies.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cmake/opentelemetry-proto.cmake b/cmake/opentelemetry-proto.cmake
-index 34b33d3..19e67e9 100644
---- a/cmake/opentelemetry-proto.cmake
-+++ b/cmake/opentelemetry-proto.cmake
-@@ -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)
-   foreach(proto_target ${OPENTELEMETRY_PROTO_TARGETS})
-     set_property(TARGET ${proto_target} PROPERTY POSITION_INDEPENDENT_CODE ON)
diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake
index abf959e27b09ed..d3f960ac460c8a 100644
--- a/ports/opentelemetry-cpp/portfile.cmake
+++ b/ports/opentelemetry-cpp/portfile.cmake
@@ -6,12 +6,9 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO open-telemetry/opentelemetry-cpp
     REF "v${VERSION}"
-    SHA512 55553e3695adbc446264a4589fe8e3b2a284c0aac50ce2a09f76913bc8c0196b8ec8f79a32366c4473196332d4bff058793fe54ad2e95350fc046e3d148c8abb
+    SHA512 38a3796a5f4c28fd54cc2a5475b3a024e2e73594acbc635fccc6358bf4d93ae897fc0ce55a93d27736a08622869ccc9fe9a9ee62e3884adadb3f135c27d378ec
     HEAD_REF main
     PATCHES
-        # When compiling code generated by gRPC we need to link the gRPC library
-        # too.
-        add-missing-dependencies.patch
         # Missing find_dependency for Abseil
         add-missing-find-dependency.patch
 )
@@ -24,7 +21,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         elasticsearch WITH_ELASTICSEARCH
         jaeger WITH_JAEGER
         otlp-http WITH_OTLP_HTTP
-        zpages WITH_ZPAGES
         otlp-grpc WITH_OTLP_GRPC
 )
 
diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json
index 5ac8f88894746f..3de8314a24d433 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.12.0",
-  "port-version": 1,
+  "version-semver": "1.13.0",
   "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."
@@ -87,9 +86,6 @@
     },
     "zipkin": {
       "description": "Whether to include the Zipkin exporter in the SDK"
-    },
-    "zpages": {
-      "description": "Whether to include the Zpages Server in the SDK"
     }
   }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index e70b38cc34589a..89b98ba541f2f1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6357,8 +6357,8 @@
       "port-version": 1
     },
     "opentelemetry-cpp": {
-      "baseline": "1.12.0",
-      "port-version": 1
+      "baseline": "1.13.0",
+      "port-version": 0
     },
     "opentelemetry-fluentd": {
       "baseline": "2.0.0",
diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json
index 1fbfbd2d19b476..da20b61514ca5f 100644
--- a/versions/o-/opentelemetry-cpp.json
+++ b/versions/o-/opentelemetry-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "63459a1e91fd9e52492d95ee21594123f13bf093",
+      "version-semver": "1.13.0",
+      "port-version": 0
+    },
     {
       "git-tree": "71dd31a63ee43f477bad710ccce04ffac2be5238",
       "version-semver": "1.12.0",