Skip to content
Merged
13 changes: 13 additions & 0 deletions ports/opentelemetry-cpp/fix-pkgconfig-dependencies.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/exporters/otlp/CMakeLists.txt b/exporters/otlp/CMakeLists.txt
index 227f59e..8500a78 100644
--- a/exporters/otlp/CMakeLists.txt
+++ b/exporters/otlp/CMakeLists.txt
@@ -68,7 +68,7 @@ if(OPENTELEMETRY_INSTALL)
otlp_recordable
"OpenTelemetry OTLP - Recordable"
"OTLP recordable implementation for spans, metrics, and logs."
- "opentelemetry_trace opentelemetry_metrics opentelemetry_logs opentelemetry_resources"
+ "opentelemetry_trace opentelemetry_metrics opentelemetry_logs opentelemetry_resources opentelemetry_proto"
)

opentelemetry_add_pkgconfig(
13 changes: 11 additions & 2 deletions ports/opentelemetry-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO open-telemetry/opentelemetry-cpp
REF "v${VERSION}"
SHA512 218233098965ba78a93f33dd3fa357e4821b7dee6e137df19e3757dd3745ccbfc05b2c31d071f5dda23d120269642c2721d45e3ef1124ef514335a5a0c318cd4
SHA512 b5d309670c0dbd3771f78b5d7d447eb98c19947b7c4a2e2b9a36e160396a60e502d80087a13d77635e9b8ab558c82a4142712dfc263f1ccb195f5e71c12b8428
HEAD_REF main
PATCHES
fix-target_link.patch
fix-pkgconfig-dependencies.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down Expand Up @@ -89,9 +90,17 @@ vcpkg_cmake_configure(

vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}")
vcpkg_fixup_pkgconfig(SKIP_CHECK)
vcpkg_copy_pdbs()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/opentelemetry/sdk/configuration")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
if(WITH_ETW)
list(APPEND LICENSE_FILES "${SOURCE_PATH}/exporters/etw/include/opentelemetry/exporters/etw/LICENSE")
endif()
vcpkg_install_copyright(
FILE_LIST
"${SOURCE_PATH}/LICENSE"
${LICENSE_FILES}
)
5 changes: 3 additions & 2 deletions ports/opentelemetry-cpp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "opentelemetry-cpp",
"version-semver": "1.27.0",
"version-semver": "1.28.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."
Expand Down Expand Up @@ -32,7 +32,8 @@
},
"etw": {
"description": "Whether to include the ETW Exporter in the SDK",
"supports": "windows"
"supports": "windows",
"license": "MIT"
},
"geneva": {
"description": "Whether to include the Geneva Exporter from the opentelemetry-cpp-contrib repository",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -7509,7 +7509,7 @@
"port-version": 3
},
"opentelemetry-cpp": {
"baseline": "1.27.0",
"baseline": "1.28.0",
"port-version": 0
},
"opentelemetry-cpp-contrib-version": {
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opentelemetry-cpp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5feb4462d0860421f73909fda64d2543798675f2",
"version-semver": "1.28.0",
"port-version": 0
},
{
"git-tree": "803c40504c6aeba321a85b3bde4a76d91834e2c2",
"version-semver": "1.27.0",
Expand Down