Skip to content

[opentelemetry-cpp] upgrade to release v1.14.0 #36816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 4 commits into from
Feb 21, 2024
Merged

[opentelemetry-cpp] upgrade to release v1.14.0 #36816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
09d3320
[opentelemetry-cpp] upgrade to v1.14.0
ThomsonTan Feb 17, 2024
8a7f5e5
Remove unnecesasry port-version in vcpkg.json
ThomsonTan Feb 17, 2024
ba24bef
Delete opentelemetry-fluentd port
ThomsonTan Feb 17, 2024
945282e
Remove completed TODO comment
ThomsonTan Feb 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
224 changes: 0 additions & 224 deletions ports/opentelemetry-cpp/fix-nominmax-problems.patch
View file
Open in desktop

This file was deleted.

24 changes: 13 additions & 11 deletions ports/opentelemetry-cpp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}")
Expand All @@ -47,16 +45,20 @@ 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
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(
Expand All @@ -66,7 +68,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
Expand Down
3 changes: 1 addition & 2 deletions ports/opentelemetry-cpp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"$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",
"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
26 changes: 0 additions & 26 deletions ports/opentelemetry-fluentd/fix_include_path.patch
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions ports/opentelemetry-fluentd/portfile.cmake
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions ports/opentelemetry-fluentd/vcpkg.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading