azure-core-tracing-opentelemetry-cpp: remove hard depdency on opentel…

…emetry version instead of using 1.4.1
microsoft · Jul 22, 2022 · ba014f5 · ba014f5
1 parent 2f86dd7
commit ba014f5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     PATCHES
         "use-opentelemetry-cpp-141.patch"
 )
+# Removed hard dependency on specific opentelemetry-cpp version as per https://github.com/Azure/azure-sdk-for-cpp/pull/3844
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry/

diff --git a/ports/azure-core-tracing-opentelemetry-cpp/use-opentelemetry-cpp-141.patch b/ports/azure-core-tracing-opentelemetry-cpp/use-opentelemetry-cpp-141.patch
@@ -7,7 +7,7 @@ index bf3077e..2bd6d91 100644
        endif()
      endif()
 -    find_package(opentelemetry-cpp "1.3.0" CONFIG REQUIRED)
-+    find_package(opentelemetry-cpp "1.4.1" CONFIG REQUIRED)
++    find_package(opentelemetry-cpp CONFIG REQUIRED)
 
      set(
        AZURE_CORE_OPENTELEMETRY_HEADER
diff --git a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json
@@ -17,7 +17,7 @@
     },
     {
       "name": "opentelemetry-cpp",
-      "version>=": "1.4.1"
+      "version>=": "1.3.0"
     },
     {
       "name": "vcpkg-cmake",

diff --git a/versions/a-/azure-core-tracing-opentelemetry-cpp.json b/versions/a-/azure-core-tracing-opentelemetry-cpp.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "926791fa493cc4f97f39bef17dbf3a2921dc250c",
+      "git-tree": "866faac3caba27757dbe0b52c76e31cba7589011",
       "version-semver": "1.0.0-beta.2",
       "port-version": 1
     },