diff --git a/ports/azure-core-tracing-opentelemetry-cpp/3844.patch b/ports/azure-core-tracing-opentelemetry-cpp/3844.patch new file mode 100644 index 0000000000..39874cc5af --- /dev/null +++ b/ports/azure-core-tracing-opentelemetry-cpp/3844.patch @@ -0,0 +1,22 @@ +From e1fd9ed9f476fc94f4143df6ba8b683113af33ed Mon Sep 17 00:00:00 2001 +From: Larry Osterman +Date: Fri, 22 Jul 2022 11:37:48 -0700 +Subject: [PATCH] Removed hard dependency on opentelemetry version + +--- + sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt +index bf3077e676..6d0dc15151 100644 +--- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt ++++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt +@@ -36,7 +36,7 @@ if (BUILD_AZURE_CORE_TRACING_OPENTELEMETRY) + find_package(azure-core-cpp REQUIRED) + endif() + endif() +- find_package(opentelemetry-cpp "1.3.0" CONFIG REQUIRED) ++ find_package(opentelemetry-cpp CONFIG REQUIRED) + + set( + AZURE_CORE_OPENTELEMETRY_HEADER diff --git a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake index a906a37687..e0a091319d 100644 --- a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake +++ b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake @@ -3,6 +3,8 @@ vcpkg_from_github( REPO Azure/azure-sdk-for-cpp REF azure-core-tracing-opentelemetry_1.0.0-beta.2 SHA512 a0697ed440a08f3814013adf476c2a1333b462a2eb96bac18c47939c54686396639935568e229dad6bbbae06f54c324da82544634c6384a2c1498f9959836b6d + PATCHES + "3844.patch" # https://github.com/Azure/azure-sdk-for-cpp/pull/3844 "Removed hard dependency on opentelemetry version" ) vcpkg_cmake_configure( diff --git a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json index 137ef7272f..1afd086ae4 100644 --- a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json +++ b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "azure-core-tracing-opentelemetry-cpp", "version-semver": "1.0.0-beta.2", + "port-version": 1, "description": [ "Microsoft Azure Core Tracing OpenTelemetry SDK for C++", "This library provides support for modern Azure SDK client libraries written in C++ to leverage OpenTelemetry APIs." diff --git a/ports/opentelemetry-cpp/portfile.cmake b/ports/opentelemetry-cpp/portfile.cmake index b8dcab966d..a6c80c10b4 100644 --- a/ports/opentelemetry-cpp/portfile.cmake +++ b/ports/opentelemetry-cpp/portfile.cmake @@ -11,8 +11,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open-telemetry/opentelemetry-cpp - REF v1.3.0 - SHA512 38f613c208ec847c8bf7765732d8198fcc427c293a929945d72c2f739e89d2a0ad36be4d94cc3c1b77fd7b1f1d1e5d8bdb38094a493ba3da3125281cd1016836 + REF v1.4.1 + SHA512 090cd8e7283bddaf0bc44b202586fbb0648be9c35965f93dddbdc988fe64c20157f2a4926605f449a76429cc502eff580bc74d50418b29cb7a0a8ab832a7d249 HEAD_REF main ) @@ -29,11 +29,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) - set(OTEL_PROTO_VERSION "0.11.0") + set(OTEL_PROTO_VERSION "0.17.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 ff6c207fe9cc2b6a344439ab5323b3225cf532358d52caf0afee27d9b4cd89195f6da6b6e383fe94de52f60c772df8b477c1ea943db67a217063c71587b7bb92 + SHA512 b61d7fe7d6e1b5943d45ab9d17c22fe36c0f7a8312f668aea2b6685aa0f5c98aaa41e76659057310ec1f061d36ad9e66993be177039121f62f73858a6749d3d9 ) vcpkg_extract_source_archive(${ARCHIVE} ${SOURCE_PATH}/third_party) @@ -46,6 +46,8 @@ vcpkg_cmake_configure( OPTIONS -DBUILD_TESTING=OFF -DWITH_EXAMPLES=OFF + -DWITH_METRICS_PREVIEW=ON + -DWITH_LOGS_PREVIEW=ON ${FEATURE_OPTIONS} ) diff --git a/ports/opentelemetry-cpp/vcpkg.json b/ports/opentelemetry-cpp/vcpkg.json index 659a02dd70..ba7db3c99c 100644 --- a/ports/opentelemetry-cpp/vcpkg.json +++ b/ports/opentelemetry-cpp/vcpkg.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", "name": "opentelemetry-cpp", - "version-semver": "1.3.0", + "version-semver": "1.4.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/a-/azure-core-tracing-opentelemetry-cpp.json b/versions/a-/azure-core-tracing-opentelemetry-cpp.json index 09861ff933..819909b76e 100644 --- a/versions/a-/azure-core-tracing-opentelemetry-cpp.json +++ b/versions/a-/azure-core-tracing-opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e0228c8ec49e7dbde7c7044c915945425ce5092d", + "version-semver": "1.0.0-beta.2", + "port-version": 1 + }, { "git-tree": "4113db6be129830ea748465ca56fcb75e6ef4a31", "version-semver": "1.0.0-beta.2", diff --git a/versions/baseline.json b/versions/baseline.json index 807bb06d39..8f3154fe9f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -330,7 +330,7 @@ }, "azure-core-tracing-opentelemetry-cpp": { "baseline": "1.0.0-beta.2", - "port-version": 0 + "port-version": 1 }, "azure-identity-cpp": { "baseline": "1.3.0", @@ -5269,7 +5269,7 @@ "port-version": 4 }, "opentelemetry-cpp": { - "baseline": "1.3.0", + "baseline": "1.4.1", "port-version": 0 }, "opentracing": { diff --git a/versions/o-/opentelemetry-cpp.json b/versions/o-/opentelemetry-cpp.json index 64778c3716..6fab8f927c 100644 --- a/versions/o-/opentelemetry-cpp.json +++ b/versions/o-/opentelemetry-cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "614e2f4d01b0a003fe4c6df695eb669b41627736", + "version-semver": "1.4.1", + "port-version": 0 + }, { "git-tree": "0ab7ef25acedde2552479fda46f92716afa53c98", "version-semver": "1.3.0",