From 721dbcc4b9792893199c13dc5bda78ec4d8a3203 Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Thu, 17 Aug 2023 15:06:25 +0800 Subject: [PATCH 01/18] Generate Imath.pc --- ports/imath/portfile.cmake | 1 + ports/imath/vcpkg.json | 1 + 2 files changed, 2 insertions(+) diff --git a/ports/imath/portfile.cmake b/ports/imath/portfile.cmake index 0c60c9daa5f874..3f4f34ad58c7c6 100644 --- a/ports/imath/portfile.cmake +++ b/ports/imath/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_cmake_configure( OPTIONS -DIMATH_INSTALL_SYM_LINK=OFF -DBUILD_TESTING=OFF + -DIMATH_INSTALL_PKG_CONFIG=ON ) vcpkg_cmake_install() diff --git a/ports/imath/vcpkg.json b/ports/imath/vcpkg.json index 0973f840591bd2..85b1cb6915f3e7 100644 --- a/ports/imath/vcpkg.json +++ b/ports/imath/vcpkg.json @@ -1,6 +1,7 @@ { "name": "imath", "version": "3.1.9", + "port-version": 1, "description": "Imath is a C++ and Python library of 2D and 3D vector, matrix, and math operations for computer graphics.", "homepage": "https://github.com/AcademySoftwareFoundation/Imath", "license": "BSD-3-Clause", From 56fabcaa0ef8b54747f89598be3ebbd30fd3708b Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Thu, 17 Aug 2023 15:07:06 +0800 Subject: [PATCH 02/18] update version --- versions/baseline.json | 2 +- versions/i-/imath.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index a79b946fca4f2a..69222c91b2789a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3374,7 +3374,7 @@ }, "imath": { "baseline": "3.1.9", - "port-version": 0 + "port-version": 1 }, "imgui": { "baseline": "1.89.7", diff --git a/versions/i-/imath.json b/versions/i-/imath.json index ff451ccffac500..a04da5782798d0 100644 --- a/versions/i-/imath.json +++ b/versions/i-/imath.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "47c02f0c550c3639178d554a27475f376c2fdcbc", + "version": "3.1.9", + "port-version": 1 + }, { "git-tree": "1853273c56448fff5ec5e2c9133895922df682bd", "version": "3.1.9", From 2ddb224ad13d26b14fa523998a13b9b1e994bf9c Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Thu, 17 Aug 2023 15:08:39 +0800 Subject: [PATCH 03/18] add dependency imath minizip-ng --- ports/opencolorio/fix-pkgconfig.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/opencolorio/fix-pkgconfig.patch b/ports/opencolorio/fix-pkgconfig.patch index 7337952c8c12a2..976afe122c52e3 100644 --- a/ports/opencolorio/fix-pkgconfig.patch +++ b/ports/opencolorio/fix-pkgconfig.patch @@ -7,4 +7,4 @@ index f25c280..d9a450b 100644 Libs: -L${libdir} -l@PROJECT_NAME@ Cflags: -I${includedir} +Libs.private: -lpystring -+Requires.private: expat Imath yaml-cpp ++Requires.private: expat Imath yaml-cpp minizip-ng From c4906863801b82b424b0499437d522780c72de30 Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Thu, 17 Aug 2023 15:09:18 +0800 Subject: [PATCH 04/18] updata version --- versions/o-/opencolorio.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index 4d749dfe24d568..2a4dee6e4f43eb 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d728bb2681e89ffbe9c6e1ec2811d5d194d9fd09", + "git-tree": "9569944b76966b78bec5ef83672899acd7e4febe", "version-semver": "2.1.2", "port-version": 0 }, From 3a7032272a79c5350a0cb57012aa3a4b98ef1fac Mon Sep 17 00:00:00 2001 From: jimwang118 Date: Tue, 22 Aug 2023 16:45:40 +0800 Subject: [PATCH 05/18] update version --- versions/o-/opencolorio.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/versions/o-/opencolorio.json b/versions/o-/opencolorio.json index 2a4dee6e4f43eb..d33683a26eae63 100644 --- a/versions/o-/opencolorio.json +++ b/versions/o-/opencolorio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d5c69dc2c181e658e67ba57e3836a548c469477a", + "version-semver": "2.2.1", + "port-version": 0 + }, { "git-tree": "9569944b76966b78bec5ef83672899acd7e4febe", "version-semver": "2.1.2", From 129523034665532afdacfda71a40be7c8d131e38 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 15 Sep 2023 06:25:44 +0000 Subject: [PATCH 06/18] update to 1.11.0 --- ports/opentelemetry-cpp/portfile.cmake | 5 +++-- .../opentelemetry-cpp/use-default-cxx-version.patch | 13 ++++++------- ports/opentelemetry-cpp/vcpkg.json | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index fa3749a846c79a..94afd802d550ff 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 86cf0320f9ee50bc1aa2b7a8b254fb0df25d1bd1f5f01ebc3630ab7fe2f6ca5e53ca8e042518b4e7096dbb102c0b880e9a25fcdf5f668d24ff57d9247237bf62 + SHA512 906df3cd44d88f7846231bc14c7305b9c6d9ee22ebd5a0cce21d6da1d7d62e72efe6101a2518d969a238eb3d6bbdf75e8017d7ab42edc0409391700973602006 HEAD_REF main PATCHES # Use the compiler's default C++ version. Picking a version with @@ -27,7 +27,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS prometheus WITH_PROMETHEUS elasticsearch WITH_ELASTICSEARCH jaeger WITH_JAEGER - otlp WITH_OTLP otlp-http WITH_OTLP_HTTP zpages WITH_ZPAGES otlp-grpc WITH_OTLP_GRPC @@ -62,6 +61,8 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES WITH_OTLP_GRPC + WITH_JAEGER + WITH_LOGS_PREVIEW ) vcpkg_cmake_install() diff --git a/ports/opentelemetry-cpp/use-default-cxx-version.patch b/ports/opentelemetry-cpp/use-default-cxx-version.patch index 53a31faf91b704..62d8708338d9c9 100644 --- a/ports/opentelemetry-cpp/use-default-cxx-version.patch +++ b/ports/opentelemetry-cpp/use-default-cxx-version.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f4fa064..a868106 100644 +index dcf1034..f1e8a8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -126,21 +126,6 @@ endif() - option(OPENTELEMETRY_INSTALL "Whether to install opentelemetry targets" - ${OPENTELEMETRY_INSTALL_default}) - +@@ -130,20 +130,6 @@ option(OPENTELEMETRY_INSTALL "Whether to install opentelemetry targets" + + include("${PROJECT_SOURCE_DIR}/cmake/tools.cmake") + -if(NOT DEFINED CMAKE_CXX_STANDARD) - if(WITH_STL) - # Require at least C++17. C++20 is needed to avoid gsl::span @@ -20,7 +20,6 @@ index f4fa064..a868106 100644 - set(CMAKE_CXX_STANDARD 11) - endif() -endif() -- + if(WITH_STL) # These definitions are needed for test projects that do not link against - # opentelemetry-api library directly. We ensure that variant implementation diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index b525fbeb2d56a4..003f4cfce2b530 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.9.1", + "version-semver": "1.11.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." From 8c9dfe45077b13ff14209afd026a6f075f784b85 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Fri, 15 Sep 2023 06:26:43 +0000 Subject: [PATCH 07/18] update version --- versions/baseline.json | 2 +- versions/o-/opentelemetry-cpp.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 262a565bfe5a98..675b6e8291fb09 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6141,7 +6141,7 @@ "port-version": 0 }, "opentelemetry-cpp": { - "baseline": "1.9.1", + "baseline": "1.11.0", "port-version": 0 }, "opentelemetry-fluentd": { diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 9afb692e5787fc..41d71dc6319eb6 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f2f5de2569f7955c12d4210b102f6bbbab3f9d6", + "version-semver": "1.11.0", + "port-version": 0 + }, { "git-tree": "47c5c172ee9a7c663746a3c1cbabb359a1cbaf56", "version-semver": "1.9.1", From 1663736c76ee212ccb581dd858f3882e9cb72602 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 25 Sep 2023 06:34:56 +0000 Subject: [PATCH 08/18] update --- ports/opentelemetry-cpp/vcpkg.json | 1 - versions/baseline.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 23c56b9d329814..003f4cfce2b530 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -2,7 +2,6 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "opentelemetry-cpp", "version-semver": "1.11.0", - "port-version": 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 f172c6d5929992..f3de9352635dee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6181,7 +6181,7 @@ "port-version": 0 }, "opentelemetry-cpp": { - "baseline": "1.11.0", + "baseline": "1.9.1", "port-version": 1 }, "opentelemetry-fluentd": { From e51e5746e59ed3e6fe8cfe7d4e37ca2f93795ca9 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 25 Sep 2023 06:35:35 +0000 Subject: [PATCH 09/18] update version --- versions/baseline.json | 4 ++-- versions/o-/opentelemetry-cpp.json | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/versions/baseline.json b/versions/baseline.json index f3de9352635dee..2d47f757901e26 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6181,8 +6181,8 @@ "port-version": 0 }, "opentelemetry-cpp": { - "baseline": "1.9.1", - "port-version": 1 + "baseline": "1.11.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 0683b409a5db48..ac27d1b92cabab 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9a168c580529a671de5302dc287b24cf1e15eec", + "version-semver": "1.11.0", + "port-version": 0 + }, { "git-tree": "3ad2a8625bd852a203f6156970c0eada6f90c192", "version-semver": "1.9.1", From dd4ae52985d504d4c7ab3797b6215c8f32b319f9 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 25 Sep 2023 06:45:20 +0000 Subject: [PATCH 10/18] update version --- .../add-missing-include-file.patch | 24 ------------------- ports/opentelemetry-cpp/portfile.cmake | 1 - 2 files changed, 25 deletions(-) delete mode 100644 ports/opentelemetry-cpp/add-missing-include-file.patch diff --git a/ports/opentelemetry-cpp/add-missing-include-file.patch b/ports/opentelemetry-cpp/add-missing-include-file.patch deleted file mode 100644 index c23bc53468888b..00000000000000 --- a/ports/opentelemetry-cpp/add-missing-include-file.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/exporters/jaeger/src/TUDPTransport.cc b/exporters/jaeger/src/TUDPTransport.cc -index e411127..a5e08fa 100644 ---- a/exporters/jaeger/src/TUDPTransport.cc -+++ b/exporters/jaeger/src/TUDPTransport.cc -@@ -2,7 +2,9 @@ - // SPDX-License-Identifier: Apache-2.0 - - #include // std::stringstream -- -+#ifndef _MSC_VER -+#include -+#endif - #include "TUDPTransport.h" - #include "opentelemetry/sdk_config.h" - -@@ -48,7 +50,7 @@ void TUDPTransport::open() - hints.ai_socktype = SOCK_DGRAM; - hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG; - -- sprintf(port, "%d", port_); -+ snprintf(port, sizeof(port), "%d", port_); - - error = getaddrinfo(host_.c_str(), port, &hints, &server_addr_info_); - diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index d6ece87bb92e4f..94afd802d550ff 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -18,7 +18,6 @@ vcpkg_from_github( add-missing-dependencies.patch # Missing find_dependency for Abseil add-missing-find-dependency.patch - add-missing-include-file.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS From 6827c15dbea3121dc7f3331b6683ca322b3051e8 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Mon, 25 Sep 2023 06:45:43 +0000 Subject: [PATCH 11/18] update version --- versions/o-/opentelemetry-cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index ac27d1b92cabab..9356473b489e0f 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "e9a168c580529a671de5302dc287b24cf1e15eec", + "git-tree": "2f2f5de2569f7955c12d4210b102f6bbbab3f9d6", "version-semver": "1.11.0", "port-version": 0 }, From 2c5555c0c78e614cd88d34c6e4b69fb4bbb46c41 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 27 Sep 2023 14:43:13 +0800 Subject: [PATCH 12/18] fix missing header file --- .../fix_include_path.patch | 26 +++++++++++++++++++ ports/opentelemetry-fluentd/portfile.cmake | 2 ++ ports/opentelemetry-fluentd/vcpkg.json | 1 + 3 files changed, 29 insertions(+) create mode 100644 ports/opentelemetry-fluentd/fix_include_path.patch diff --git a/ports/opentelemetry-fluentd/fix_include_path.patch b/ports/opentelemetry-fluentd/fix_include_path.patch new file mode 100644 index 00000000000000..e162cf12ae994e --- /dev/null +++ b/ports/opentelemetry-fluentd/fix_include_path.patch @@ -0,0 +1,26 @@ +diff --git a/exporters/fluentd/src/log/recordable.cc b/exporters/fluentd/src/log/recordable.cc +index 5af84d8..1b124eb 100644 +--- a/exporters/fluentd/src/log/recordable.cc ++++ b/exporters/fluentd/src/log/recordable.cc +@@ -1,6 +1,9 @@ + /// Copyright The OpenTelemetry Authors + // SPDX-License-Identifier: Apache-2.0 + ++#include "opentelemetry/logs/severity.h" ++#include "opentelemetry/trace/span_id.h" ++#include "opentelemetry/trace/trace_id.h" + #include "opentelemetry/exporters/fluentd/log/recordable.h" + #include "opentelemetry/exporters/fluentd/common/fluentd_common.h" + #include "opentelemetry/exporters/fluentd/common/fluentd_logging.h" +diff --git a/exporters/fluentd/src/trace/recordable.cc b/exporters/fluentd/src/trace/recordable.cc +index 5c0a5ed..c24aa0c 100644 +--- a/exporters/fluentd/src/trace/recordable.cc ++++ b/exporters/fluentd/src/trace/recordable.cc +@@ -4,6 +4,7 @@ + #include "opentelemetry/exporters/fluentd/trace/recordable.h" + #include "opentelemetry/exporters/fluentd/common/fluentd_common.h" + #include "opentelemetry/exporters/fluentd/common/fluentd_logging.h" ++#include "opentelemetry/sdk/resource/resource.h" + + #include + #include diff --git a/ports/opentelemetry-fluentd/portfile.cmake b/ports/opentelemetry-fluentd/portfile.cmake index b2d0d687152c47..9c584d99da8054 100644 --- a/ports/opentelemetry-fluentd/portfile.cmake +++ b/ports/opentelemetry-fluentd/portfile.cmake @@ -8,6 +8,8 @@ vcpkg_from_github( REF 7afa91952f08aad1fa79b8992f20a4b0cdaadaff # Maps to 2.0.0 HEAD_REF main SHA512 b28415c867aee5efe99f7521a145b5c402ac555d83be75a8b1d2760aed226ac109a6d092e86d7afedcc2ed8dc848d9662ac6505133d32f99b810f51e2748d1fc + PATCHES + fix_include_path.patch ) vcpkg_cmake_configure( diff --git a/ports/opentelemetry-fluentd/vcpkg.json b/ports/opentelemetry-fluentd/vcpkg.json index ac5824dfdd945e..a34b5a812610f2 100644 --- a/ports/opentelemetry-fluentd/vcpkg.json +++ b/ports/opentelemetry-fluentd/vcpkg.json @@ -2,6 +2,7 @@ "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "opentelemetry-fluentd", "version-semver": "2.0.0", + "port-version": 1, "description": "mdsd/fluentd exporter for OpenTelemetry C++", "homepage": "https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/exporters", "license": "Apache-2.0", From 3efd269473ce9ec402164f4b8554fb381e6f50b8 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 27 Sep 2023 14:44:00 +0800 Subject: [PATCH 13/18] update version --- versions/baseline.json | 2 +- versions/o-/opentelemetry-fluentd.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 2d47f757901e26..79dbbeb7cb26f9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6186,7 +6186,7 @@ }, "opentelemetry-fluentd": { "baseline": "2.0.0", - "port-version": 0 + "port-version": 1 }, "opentracing": { "baseline": "1.6.0", diff --git a/versions/o-/opentelemetry-fluentd.json b/versions/o-/opentelemetry-fluentd.json index 80e61e7433242e..907fba1a594713 100644 --- a/versions/o-/opentelemetry-fluentd.json +++ b/versions/o-/opentelemetry-fluentd.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e9ffc101ca11ffd64b1a2bd73ae7e11bf7f28cfc", + "version-semver": "2.0.0", + "port-version": 1 + }, { "git-tree": "4c8cdb3314a3a35268d4ce9b786c6632c79e0f97", "version-semver": "2.0.0", From cb6869162c688b4c8e4778eba98623fa3585363a Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 11 Oct 2023 02:15:29 +0000 Subject: [PATCH 14/18] Fix feature otlp content --- ports/opentelemetry-cpp/vcpkg.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 003f4cfce2b530..6c71eeeb24df44 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -38,7 +38,14 @@ "otlp": { "description": "Whether to include the OpenTelemetry Protocol in the SDK", "dependencies": [ - "protobuf" + { + "name": "opentelemetry-cpp", + "default-features": false, + "features": [ + "otlp-grpc", + "otlp-http" + ] + } ] }, "otlp-grpc": { From 6846ffd309181ab912873b14139dadd09574f458 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 11 Oct 2023 02:16:20 +0000 Subject: [PATCH 15/18] update version --- versions/o-/opentelemetry-cpp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 9356473b489e0f..a8c1e8391cbd07 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "2f2f5de2569f7955c12d4210b102f6bbbab3f9d6", + "git-tree": "73b513869768adc1fa546e6c96b823694ece9f08", "version-semver": "1.11.0", "port-version": 0 }, From 02fddf3a3e34d10a3c9575adf1733cb785c4654a Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 18 Oct 2023 09:59:26 +0800 Subject: [PATCH 16/18] update to 1.12.0 --- ports/opentelemetry-cpp/portfile.cmake | 6 +---- .../use-default-cxx-version.patch | 25 ------------------- ports/opentelemetry-cpp/vcpkg.json | 2 +- 3 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 ports/opentelemetry-cpp/use-default-cxx-version.patch diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index 94afd802d550ff..8ed469db0860c7 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -6,13 +6,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp REF "v${VERSION}" - SHA512 906df3cd44d88f7846231bc14c7305b9c6d9ee22ebd5a0cce21d6da1d7d62e72efe6101a2518d969a238eb3d6bbdf75e8017d7ab42edc0409391700973602006 + SHA512 55553e3695adbc446264a4589fe8e3b2a284c0aac50ce2a09f76913bc8c0196b8ec8f79a32366c4473196332d4bff058793fe54ad2e95350fc046e3d148c8abb HEAD_REF main PATCHES - # Use the compiler's default C++ version. Picking a version with - # CMAKE_CXX_STANDARD is not needed as the Abseil port already picked - # one and propagates that version across all its downstream deps. - use-default-cxx-version.patch # When compiling code generated by gRPC we need to link the gRPC library # too. add-missing-dependencies.patch diff --git a/ports/opentelemetry-cpp/use-default-cxx-version.patch b/ports/opentelemetry-cpp/use-default-cxx-version.patch deleted file mode 100644 index 62d8708338d9c9..00000000000000 --- a/ports/opentelemetry-cpp/use-default-cxx-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dcf1034..f1e8a8e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -130,20 +130,6 @@ option(OPENTELEMETRY_INSTALL "Whether to install opentelemetry targets" - - include("${PROJECT_SOURCE_DIR}/cmake/tools.cmake") - --if(NOT DEFINED CMAKE_CXX_STANDARD) -- if(WITH_STL) -- # Require at least C++17. C++20 is needed to avoid gsl::span -- if(CMAKE_VERSION VERSION_GREATER 3.11.999) -- # Ask for 20, may get anything below -- set(CMAKE_CXX_STANDARD 20) -- else() -- # Ask for 17, may get anything below -- set(CMAKE_CXX_STANDARD 17) -- endif() -- else() -- set(CMAKE_CXX_STANDARD 11) -- endif() --endif() - - if(WITH_STL) - # These definitions are needed for test projects that do not link against diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 6c71eeeb24df44..fd5ddc26c63d55 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.11.0", + "version-semver": "1.12.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." From d33fa1c1bea4d5dd7df9a22c67c81671cd0dd0b7 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Wed, 18 Oct 2023 10:00:02 +0800 Subject: [PATCH 17/18] update version --- versions/baseline.json | 2 +- versions/o-/opentelemetry-cpp.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 4cce25976cffcc..e936fecd5b8e1e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6201,7 +6201,7 @@ "port-version": 0 }, "opentelemetry-cpp": { - "baseline": "1.11.0", + "baseline": "1.12.0", "port-version": 0 }, "opentelemetry-fluentd": { diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index a8c1e8391cbd07..96d69333e8ded7 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5fd8cacd9fd3aaa30b0ad133f2de052ba3ff869f", + "version-semver": "1.12.0", + "port-version": 0 + }, { "git-tree": "73b513869768adc1fa546e6c96b823694ece9f08", "version-semver": "1.11.0", From dfd1d2507a8eddd2de6cd60758b32035ab1335b0 Mon Sep 17 00:00:00 2001 From: Jim-Wang Date: Thu, 26 Oct 2023 09:41:43 +0800 Subject: [PATCH 18/18] update version --- versions/o-/opentelemetry-cpp.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 96d69333e8ded7..e38bfde60ebffe 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -5,11 +5,6 @@ "version-semver": "1.12.0", "port-version": 0 }, - { - "git-tree": "73b513869768adc1fa546e6c96b823694ece9f08", - "version-semver": "1.11.0", - "port-version": 0 - }, { "git-tree": "3ad2a8625bd852a203f6156970c0eada6f90c192", "version-semver": "1.9.1",