From 09d332008310c538c13c1c461a62d001c5c04c6f Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Sat, 17 Feb 2024 14:12:36 -0800 Subject: [PATCH 1/4] [opentelemetry-cpp] upgrade to v1.14.0 --- .../fix-nominmax-problems.patch | 224 ------------------ ports/opentelemetry-cpp/portfile.cmake | 23 +- ports/opentelemetry-cpp/vcpkg.json | 4 +- versions/baseline.json | 4 +- versions/o-/opentelemetry-cpp.json | 5 + 5 files changed, 22 insertions(+), 238 deletions(-) delete mode 100644 ports/opentelemetry-cpp/fix-nominmax-problems.patch diff --git a/ports/opentelemetry-cpp/fix-nominmax-problems.patch b/ports/opentelemetry-cpp/fix-nominmax-problems.patch deleted file mode 100644 index 7cf003711337ea..00000000000000 --- a/ports/opentelemetry-cpp/fix-nominmax-problems.patch +++ /dev/null @@ -1,224 +0,0 @@ -diff --git a/api/include/opentelemetry/std/span.h b/api/include/opentelemetry/std/span.h -index 2a3dc12a84..1160d54fbe 100644 ---- a/api/include/opentelemetry/std/span.h -+++ b/api/include/opentelemetry/std/span.h -@@ -60,7 +60,7 @@ OPENTELEMETRY_END_NAMESPACE - OPENTELEMETRY_BEGIN_NAMESPACE - namespace nostd - { --constexpr std::size_t dynamic_extent = (std::numeric_limits::max()); -+constexpr std::size_t dynamic_extent = (std::numeric_limits::max)(); - - template - using span = std::span; -index 7deb369ab3..6da8bdd032 100644 ---- a/docs/cpp-ostream-exporter-design.md -+++ b/docs/cpp-ostream-exporter-design.md -@@ -154,7 +154,7 @@ public: - return sdktrace::ExportResult::kSuccess; - } - -- bool Shutdown(std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept -+ bool Shutdown(std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept - { - isShutdown = true; - return true; -diff --git a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h -index 8579c99138..b72ff4f917 100644 ---- a/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h -+++ b/exporters/elasticsearch/include/opentelemetry/exporters/elasticsearch/es_log_record_exporter.h -@@ -100,14 +100,14 @@ class ElasticsearchLogRecordExporter final : public opentelemetry::sdk::logs::Lo - * @return return true when all data are exported, and false when timeout - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shutdown this exporter. - * @param timeout The maximum time to wait for the shutdown method to return - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - private: - // Stores if this exporter had its Shutdown() method called -diff --git a/exporters/elasticsearch/src/es_log_record_exporter.cc b/exporters/elasticsearch/src/es_log_record_exporter.cc -index c90072e4e4..e167faf3d9 100644 ---- a/exporters/elasticsearch/src/es_log_record_exporter.cc -+++ b/exporters/elasticsearch/src/es_log_record_exporter.cc -@@ -430,7 +430,7 @@ bool ElasticsearchLogRecordExporter::ForceFlush( - std::chrono::duration_cast(timeout); - if (timeout_steady <= std::chrono::steady_clock::duration::zero()) - { -- timeout_steady = std::chrono::steady_clock::duration::max(); -+ timeout_steady = (std::chrono::steady_clock::duration::max)(); - } - - std::unique_lock lk_cv(synchronization_data_->force_flush_cv_m); -diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h -index 7aff1e24a5..870e5a043a 100644 ---- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h -+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h -@@ -58,7 +58,7 @@ class OtlpGrpcExporter final : public opentelemetry::sdk::trace::SpanExporter - * @return return true when all data are exported, and false when timeout - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shut down the exporter. -@@ -67,7 +67,7 @@ class OtlpGrpcExporter final : public opentelemetry::sdk::trace::SpanExporter - * @return return the status of this operation - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - private: - // The configuration options associated with this exporter. -diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h -index 29333703b1..f1cd96888c 100644 ---- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h -+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_grpc_log_record_exporter.h -@@ -60,14 +60,14 @@ class OtlpGrpcLogRecordExporter : public opentelemetry::sdk::logs::LogRecordExpo - * @return return true when all data are exported, and false when timeout - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shutdown this exporter. - * @param timeout The maximum time to wait for the shutdown method to return. - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - private: - // Configuration options for the exporter -diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h -index 1adbbc70b9..b5faf1a9b8 100644 ---- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h -+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_exporter.h -@@ -59,7 +59,7 @@ class OPENTELEMETRY_EXPORT OtlpHttpExporter final : public opentelemetry::sdk::t - * @return return true when all data are exported, and false when timeout - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shut down the exporter. -@@ -68,7 +68,7 @@ class OPENTELEMETRY_EXPORT OtlpHttpExporter final : public opentelemetry::sdk::t - * @return return the status of this operation - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - private: - // The configuration options associated with this exporter. -diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h -index 4393345dfd..f481fdab0b 100644 ---- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h -+++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_http_log_record_exporter.h -@@ -58,14 +58,14 @@ class OtlpHttpLogRecordExporter final : public opentelemetry::sdk::logs::LogReco - * @return return true when all data are exported, and false when timeout - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shutdown this exporter. - * @param timeout The maximum time to wait for the shutdown method to return - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - private: - // Configuration options for the exporter -diff --git a/exporters/otlp/src/otlp_http_client.cc b/exporters/otlp/src/otlp_http_client.cc -index 9c57a9bd83..7814199ef2 100644 ---- a/exporters/otlp/src/otlp_http_client.cc -+++ b/exporters/otlp/src/otlp_http_client.cc -@@ -782,7 +782,7 @@ bool OtlpHttpClient::ForceFlush(std::chrono::microseconds timeout) noexcept - std::chrono::duration_cast(timeout); - if (timeout_steady <= std::chrono::steady_clock::duration::zero()) - { -- timeout_steady = std::chrono::steady_clock::duration::max(); -+ timeout_steady = (std::chrono::steady_clock::duration::max)(); - } - - while (timeout_steady > std::chrono::steady_clock::duration::zero()) -diff --git a/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h b/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h -index e93ebf3d6b..d6a44df142 100644 ---- a/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h -+++ b/sdk/include/opentelemetry/sdk/logs/batch_log_record_processor.h -@@ -72,7 +72,7 @@ class BatchLogRecordProcessor : public LogRecordProcessor - * NOTE: Timeout functionality not supported yet. - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shuts down the processor and does any cleanup required. Completely drains the buffer/queue of -@@ -82,7 +82,7 @@ class BatchLogRecordProcessor : public LogRecordProcessor - * NOTE: Timeout functionality not supported yet. - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Class destructor which invokes the Shutdown() method. -diff --git a/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h b/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h -index 335da7f668..8ca5cffcca 100644 ---- a/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h -+++ b/sdk/include/opentelemetry/sdk/logs/multi_log_record_processor.h -@@ -45,7 +45,7 @@ class MultiLogRecordProcessor : public LogRecordProcessor - * @return a result code indicating whether it succeeded, failed or timed out - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shuts down the processor and does any cleanup required. -@@ -55,7 +55,7 @@ class MultiLogRecordProcessor : public LogRecordProcessor - * @return true if the shutdown succeeded, false otherwise - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - private: - std::vector> processors_; -diff --git a/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h b/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h -index a748b06361..afbf4486b0 100644 ---- a/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h -+++ b/sdk/include/opentelemetry/sdk/trace/batch_span_processor.h -@@ -69,7 +69,7 @@ class BatchSpanProcessor : public SpanProcessor - * NOTE: Timeout functionality not supported yet. - */ - bool ForceFlush( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Shuts down the processor and does any cleanup required. Completely drains the buffer/queue of -@@ -79,7 +79,7 @@ class BatchSpanProcessor : public SpanProcessor - * NOTE: Timeout functionality not supported yet. - */ - bool Shutdown( -- std::chrono::microseconds timeout = std::chrono::microseconds::max()) noexcept override; -+ std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override; - - /** - * Class destructor which invokes the Shutdown() method. The Shutdown() method is supposed to be diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index 045babe3654571..4461cd273e9222 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -6,13 +6,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp REF "v${VERSION}" - SHA512 38a3796a5f4c28fd54cc2a5475b3a024e2e73594acbc635fccc6358bf4d93ae897fc0ce55a93d27736a08622869ccc9fe9a9ee62e3884adadb3f135c27d378ec + SHA512 db8394d8e0a6fe0d8dd0dd32c64c7b697a6bae57ca4d0334604c41edfe49ee23b203ac40c93f9a736e42305d30ce614f2a5092dce988c1630186b82f4fa4db78 HEAD_REF main PATCHES # Missing find_dependency for Abseil add-missing-find-dependency.patch - # Fix problems from removing NOMINMAX on Windows. Fixed in 1.14.0 - fix-nominmax-problems.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS @@ -28,11 +26,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS # opentelemetry-proto is a third party submodule and opentelemetry-cpp release did not pack it. if(WITH_OTLP_GRPC OR WITH_OTLP_HTTP) - set(OTEL_PROTO_VERSION "1.0.0") + set(OTEL_PROTO_VERSION "1.1.0") vcpkg_download_distfile(ARCHIVE URLS "https://github.com/open-telemetry/opentelemetry-proto/archive/v${OTEL_PROTO_VERSION}.tar.gz" FILENAME "opentelemetry-proto-${OTEL_PROTO_VERSION}.tar.gz" - SHA512 74de78304a91fe72cfcdbd87fcb19c0d6338c161d6624ce09eac0527b1b43b8a5d8790ae055e1d3d44319eaa070a506f47e740f888c91d724a0aef8b509688f0 + SHA512 cd20991efb2d7f1bc8650fd0e124be707922b0717e429b6212390cd2c0d0afdb403c9aece196f07ae81ebed948863f4ec75c08ffbb3968795a0010d5cb34dc1b ) vcpkg_extract_source_archive(src ARCHIVE "${ARCHIVE}") @@ -51,12 +49,17 @@ if(WITH_GENEVA) vcpkg_from_github( OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO open-telemetry/opentelemetry-cpp-contrib - REF 26e5ed48d81bb03fde52848ab394605dde0fb1a8 + REF 3f1b0ef547a304635aa1357af5990b4291c9f074 HEAD_REF main - SHA512 f483dc96a884450fbb17fdaf0b5514ba44546f1742c2f80f552fcb442e08fbfe399441594e95ffd2c644c20907baef83d52c326dd6d3d5eb70cf29d30b2c5a0e + SHA512 00887a901663b1917f49eb0ddd59135a1c9904b420c982e958a52c9fdea0f389a80dde8500218aa4ce19666c3d0c1293f76a4493c0b1b7d473554dad10a67330 ) - set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "") - list(APPEND OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "${CONTRIB_SOURCE_PATH}/exporters/geneva") + + set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "${CONTRIB_SOURCE_PATH}/exporters/geneva") + if(VCPKG_TARGET_IS_WINDOWS) + set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS}\;${CONTRIB_SOURCE_PATH}/exporters/geneva-trace") + else() + set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS}\;${CONTRIB_SOURCE_PATH}/exporters/fluentd") + endif() endif() vcpkg_cmake_configure( @@ -66,7 +69,7 @@ vcpkg_cmake_configure( -DWITH_EXAMPLES=OFF -DOPENTELEMETRY_INSTALL=ON -DWITH_ABSEIL=ON - -DOPENTELEMETRY_EXTERNAL_COMPONENT_PATH="${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS}" + -DOPENTELEMETRY_EXTERNAL_COMPONENT_PATH=${OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS} ${FEATURE_OPTIONS} MAYBE_UNUSED_VARIABLES WITH_GENEVA diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index dda8cae1a3c184..477e76ff4e9871 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,8 +1,8 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.13.0", - "port-version": 4, + "version-semver": "1.14.0", + "port-version": 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." diff --git a/versions/baseline.json b/versions/baseline.json index 034623c042d699..a93bc4d96af034 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6441,8 +6441,8 @@ "port-version": 1 }, "opentelemetry-cpp": { - "baseline": "1.13.0", - "port-version": 4 + "baseline": "1.14.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 54a6060c445e60..2b9112ef073adc 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "292cf6e6866512fd0ab80a381b068218bae230f1", + "version-semver": "1.14.0", + "port-version": 0 + }, { "git-tree": "03054c83c227b0d62db194cb111cb9885f787abe", "version-semver": "1.13.0", From 8a7f5e58137c21a3836605d4c941d8b39fcac38e Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Sat, 17 Feb 2024 14:22:25 -0800 Subject: [PATCH 2/4] Remove unnecesasry port-version in vcpkg.json --- ports/opentelemetry-cpp/vcpkg.json | 1 - versions/o-/opentelemetry-cpp.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 477e76ff4e9871..34e29b551bfb47 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.14.0", - "port-version": 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." diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 2b9112ef073adc..e35af43799fbf3 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "292cf6e6866512fd0ab80a381b068218bae230f1", + "git-tree": "a2425a0f6a0a6a3db80e9d32062b21989e797665", "version-semver": "1.14.0", "port-version": 0 }, From ba24bef0bc4194e750a8dd4668f2c1ddec0e95b9 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Sat, 17 Feb 2024 14:36:41 -0800 Subject: [PATCH 3/4] Delete opentelemetry-fluentd port --- .../fix_include_path.patch | 26 ----------------- ports/opentelemetry-fluentd/portfile.cmake | 29 ------------------- ports/opentelemetry-fluentd/vcpkg.json | 22 -------------- 3 files changed, 77 deletions(-) delete mode 100644 ports/opentelemetry-fluentd/fix_include_path.patch delete mode 100644 ports/opentelemetry-fluentd/portfile.cmake delete mode 100644 ports/opentelemetry-fluentd/vcpkg.json diff --git a/ports/opentelemetry-fluentd/fix_include_path.patch b/ports/opentelemetry-fluentd/fix_include_path.patch deleted file mode 100644 index e162cf12ae994e..00000000000000 --- a/ports/opentelemetry-fluentd/fix_include_path.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 10bbbc7e58684d..00000000000000 --- a/ports/opentelemetry-fluentd/portfile.cmake +++ /dev/null @@ -1,29 +0,0 @@ -# Upon the next update, we plan to remove the standalone opentelemetry-fluentd port and incorporate it into opentelemetry-cpp as a feature. -# This is to avoid introducing a new pattern for managing exporters in the opentelemetry port. - -if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -endif() - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO open-telemetry/opentelemetry-cpp-contrib - REF 7afa91952f08aad1fa79b8992f20a4b0cdaadaff # Maps to 2.0.0 - HEAD_REF main - SHA512 b28415c867aee5efe99f7521a145b5c402ac555d83be75a8b1d2760aed226ac109a6d092e86d7afedcc2ed8dc848d9662ac6505133d32f99b810f51e2748d1fc - PATCHES - fix_include_path.patch -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}/exporters/fluentd" - OPTIONS - -DBUILD_TESTING=OFF -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/opentelemetry-fluentd/vcpkg.json b/ports/opentelemetry-fluentd/vcpkg.json deleted file mode 100644 index f87fad123c54a1..00000000000000 --- a/ports/opentelemetry-fluentd/vcpkg.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json", - "name": "opentelemetry-fluentd", - "version-semver": "2.0.0", - "port-version": 2, - "description": "mdsd/fluentd exporter for OpenTelemetry C++", - "homepage": "https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/exporters", - "license": "Apache-2.0", - "dependencies": [ - "curl", - "nlohmann-json", - "opentelemetry-cpp", - { - "name": "vcpkg-cmake", - "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true - } - ] -} From 945282e432203c3199101fc1a11d5c827465e86e Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Sat, 17 Feb 2024 14:42:15 -0800 Subject: [PATCH 4/4] Remove completed TODO comment --- ports/opentelemetry-cpp/portfile.cmake | 1 - versions/o-/opentelemetry-cpp.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index 4461cd273e9222..2758bcdb6cb8d8 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -45,7 +45,6 @@ endif() set(OPENTELEMETRY_CPP_EXTERNAL_COMPONENTS "OFF") if(WITH_GENEVA) # Geneva exporters from opentelemetry-cpp-contrib are tightly coupled with opentelemetry-cpp repo, so they should be ported as a feature under opentelemetry-cpp. -# TODO: merge the opentelemetry-fluentd port to opentelemery-cpp port. vcpkg_from_github( OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO open-telemetry/opentelemetry-cpp-contrib diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index e35af43799fbf3..756c909393162b 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a2425a0f6a0a6a3db80e9d32062b21989e797665", + "git-tree": "7ccef9777cd5eb8b6a8a68074eb9fc2d2a00fd18", "version-semver": "1.14.0", "port-version": 0 },