(#11092) opentelemetry-cpp: add version 1.4.0

* opentelemetry-cpp: add version 1.4.0 * update opentelemetry-proto
conan-io · Jun 9, 2022 · 06ea475 · 06ea475
1 parent 1bd501f
commit 06ea475
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/recipes/opentelemetry-cpp/all/conandata.yml b/recipes/opentelemetry-cpp/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "1.4.0":
+    url: "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.4.0.tar.gz"
+    sha256: "110f4fb2e38dcc72a421647631cfbb9429afd3c77c6c98829cc1d11bd0c72563"
   "1.3.0":
     url: "https://github.com/open-telemetry/opentelemetry-cpp/archive/refs/tags/v1.3.0.tar.gz"
     sha256: "6a4c43b9c9f753841ebc0fe2717325271f02e2a1d5ddd0b52735c35243629ab3"
@@ -10,6 +13,9 @@ sources:
     sha256: "32f12ff15ec257e3462883f84bc291c2d5dc30055604c12ec4b46a36dfa3f189"
 
 patches:
+  "1.4.0":
+    - patch_file: "patches/1.4.0-0001-fix-cmake.patch"
+      base_path: "source_subfolder"
   "1.3.0":
     - patch_file: "patches/1.3.0-0001-fix-cmake.patch"
       base_path: "source_subfolder"
diff --git a/recipes/opentelemetry-cpp/all/conanfile.py b/recipes/opentelemetry-cpp/all/conanfile.py
@@ -11,11 +11,10 @@
 class OpenTelemetryCppConan(ConanFile):
     name = "opentelemetry-cpp"
     description = "The C++ OpenTelemetry API and SDK"
-    topics = ("opentelemetry", "telemetry", "tracing", "metrics", "logs")
     license = "Apache-2.0"
     url = "https://github.com/conan-io/conan-center-index"
     homepage = "https://github.com/open-telemetry/opentelemetry-cpp"
-    generators = "cmake", "cmake_find_package_multi"
+    topics = ("opentelemetry", "telemetry", "tracing", "metrics", "logs")
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "fPIC": [True, False],
@@ -25,6 +24,7 @@ class OpenTelemetryCppConan(ConanFile):
         "fPIC": True,
         "shared": False,
     }
+    generators = "cmake", "cmake_find_package_multi"
     short_paths = True
 
     def export_sources(self):
@@ -43,11 +43,11 @@ def configure(self):
     def requirements(self):
         self.requires("abseil/20211102.0")
         self.requires("grpc/1.45.2")
-        self.requires("libcurl/7.83.0")
+        self.requires("libcurl/7.83.1")
         self.requires("nlohmann_json/3.10.5")
         self.requires("openssl/1.1.1o")
-        self.requires("opentelemetry-proto/0.17.0")
-        self.requires("protobuf/3.20.0")
+        self.requires("opentelemetry-proto/0.18.0")
+        self.requires("protobuf/3.21.1")
         self.requires("thrift/0.15.0")
         if tools.Version(self.version) >= "1.3.0":
             self.requires("boost/1.79.0")
@@ -105,7 +105,7 @@ def _configure_cmake(self):
         return cmake
 
     def _patch_sources(self):
-        protos_path = self.deps_cpp_info["opentelemetry-proto"].res_paths[0].replace("\\", "/")
+        protos_path = self.deps_user_info["opentelemetry-proto"].proto_root.replace("\\", "/")
         protos_cmake_path = os.path.join(
             self._source_subfolder,
             "cmake",

diff --git a/recipes/opentelemetry-cpp/all/patches/1.4.0-0001-fix-cmake.patch b/recipes/opentelemetry-cpp/all/patches/1.4.0-0001-fix-cmake.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6d2b274..4611a6b 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -208,7 +208,6 @@ if(WITH_JAEGER)
+   find_package(Thrift QUIET)
+   if(Thrift_FOUND)
+     find_package(Boost REQUIRED)
+-    include_directories(${Boost_INCLUDE_DIR})
+   else()
+     # Install Thrift and propagate via vcpkg toolchain file
+     if(WIN32 AND (NOT DEFINED CMAKE_TOOLCHAIN_FILE))
diff --git a/recipes/opentelemetry-cpp/config.yml b/recipes/opentelemetry-cpp/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "1.4.0":
+    folder: all
   "1.3.0":
     folder: all
   "1.2.0":