Skip to content

Commit

Permalink
[opentelemetry-cpp] Update to 1.13.0
Browse files Browse the repository at this point in the history
The patch to add a dependency of opentelemetry-proto on gRPC should
not be needed after the upstream changes in:

open-telemetry/opentelemetry-cpp#2268

Additionally, the "zpages" feature is removed as it is no longer
present upstream after having been deprecated in a previous release.
  • Loading branch information
waywardmonkeys committed Jan 2, 2024
1 parent a344996 commit 87fee59
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 27 deletions.
15 changes: 0 additions & 15 deletions ports/opentelemetry-cpp/add-missing-dependencies.patch

This file was deleted.

6 changes: 1 addition & 5 deletions ports/opentelemetry-cpp/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO open-telemetry/opentelemetry-cpp
REF "v${VERSION}"
SHA512 55553e3695adbc446264a4589fe8e3b2a284c0aac50ce2a09f76913bc8c0196b8ec8f79a32366c4473196332d4bff058793fe54ad2e95350fc046e3d148c8abb
SHA512 38a3796a5f4c28fd54cc2a5475b3a024e2e73594acbc635fccc6358bf4d93ae897fc0ce55a93d27736a08622869ccc9fe9a9ee62e3884adadb3f135c27d378ec
HEAD_REF main
PATCHES
# 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
)
Expand All @@ -24,7 +21,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
elasticsearch WITH_ELASTICSEARCH
jaeger WITH_JAEGER
otlp-http WITH_OTLP_HTTP
zpages WITH_ZPAGES
otlp-grpc WITH_OTLP_GRPC
)

Expand Down
6 changes: 1 addition & 5 deletions ports/opentelemetry-cpp/vcpkg.json
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.12.0",
"port-version": 1,
"version-semver": "1.13.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 @@ -87,9 +86,6 @@
},
"zipkin": {
"description": "Whether to include the Zipkin exporter in the SDK"
},
"zpages": {
"description": "Whether to include the Zpages Server in the SDK"
}
}
}
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -6357,8 +6357,8 @@
"port-version": 1
},
"opentelemetry-cpp": {
"baseline": "1.12.0",
"port-version": 1
"baseline": "1.13.0",
"port-version": 0
},
"opentelemetry-fluentd": {
"baseline": "2.0.0",
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": "63459a1e91fd9e52492d95ee21594123f13bf093",
"version-semver": "1.13.0",
"port-version": 0
},
{
"git-tree": "71dd31a63ee43f477bad710ccce04ffac2be5238",
"version-semver": "1.12.0",
Expand Down

0 comments on commit 87fee59

Please sign in to comment.