From 7dc6a4e174cf331202cab0cd04f67aeef251c593 Mon Sep 17 00:00:00 2001 From: jim wang <122244446+jimwang118@users.noreply.github.com> Date: Sat, 28 Oct 2023 02:24:01 +0800 Subject: [PATCH] [opentelemetry-cpp] update to 1.12.0 (#33983) * Generate Imath.pc * update version * add dependency imath minizip-ng * updata version * update version * update to 1.11.0 * update version * update * update version * update version * update version * fix missing header file * update version * Fix feature otlp content * update version * update to 1.12.0 * update version * update version --- .../add-missing-include-file.patch | 24 ----------------- ports/opentelemetry-cpp/portfile.cmake | 10 +++---- .../use-default-cxx-version.patch | 26 ------------------- ports/opentelemetry-cpp/vcpkg.json | 12 ++++++--- .../fix_include_path.patch | 26 +++++++++++++++++++ ports/opentelemetry-fluentd/portfile.cmake | 2 ++ ports/opentelemetry-fluentd/vcpkg.json | 1 + versions/baseline.json | 6 ++--- versions/o-/opentelemetry-cpp.json | 5 ++++ versions/o-/opentelemetry-fluentd.json | 5 ++++ 10 files changed, 54 insertions(+), 63 deletions(-) delete mode 100644 ports/opentelemetry-cpp/add-missing-include-file.patch delete mode 100644 ports/opentelemetry-cpp/use-default-cxx-version.patch create mode 100644 ports/opentelemetry-fluentd/fix_include_path.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 c23bc53468..0000000000 --- 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 24ae31aae2..8ed469db08 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -6,19 +6,14 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp REF "v${VERSION}" - SHA512 86cf0320f9ee50bc1aa2b7a8b254fb0df25d1bd1f5f01ebc3630ab7fe2f6ca5e53ca8e042518b4e7096dbb102c0b880e9a25fcdf5f668d24ff57d9247237bf62 + 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 # Missing find_dependency for Abseil add-missing-find-dependency.patch - add-missing-include-file.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -28,7 +23,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 @@ -63,6 +57,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 deleted file mode 100644 index 53a31faf91..0000000000 --- a/ports/opentelemetry-cpp/use-default-cxx-version.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f4fa064..a868106 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -126,21 +126,6 @@ endif() - option(OPENTELEMETRY_INSTALL "Whether to install opentelemetry targets" - ${OPENTELEMETRY_INSTALL_default}) - --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 - # opentelemetry-api library directly. We ensure that variant implementation diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 3886f3ba29..fd5ddc26c6 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.9.1", - "port-version": 1, + "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." @@ -39,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": { diff --git a/ports/opentelemetry-fluentd/fix_include_path.patch b/ports/opentelemetry-fluentd/fix_include_path.patch new file mode 100644 index 0000000000..e162cf12ae --- /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 b2d0d68715..9c584d99da 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 ac5824dfdd..a34b5a8126 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", diff --git a/versions/baseline.json b/versions/baseline.json index b31d81b386..af7a4c3570 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6241,12 +6241,12 @@ "port-version": 0 }, "opentelemetry-cpp": { - "baseline": "1.9.1", - "port-version": 1 + "baseline": "1.12.0", + "port-version": 0 }, "opentelemetry-fluentd": { "baseline": "2.0.0", - "port-version": 0 + "port-version": 1 }, "opentracing": { "baseline": "1.6.0", diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 0683b409a5..e38bfde60e 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": "3ad2a8625bd852a203f6156970c0eada6f90c192", "version-semver": "1.9.1", diff --git a/versions/o-/opentelemetry-fluentd.json b/versions/o-/opentelemetry-fluentd.json index 80e61e7433..907fba1a59 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",