mirror of https://github.com/microsoft/vcpkg.git
[opentelemetry-cpp] update to 1.12.0 (#33983)
* Generate Imath.pc * update version * add dependency imath minizip-ng * updata version * update version * update to 1.11.0 * update version * update * update version * update version * update version * fix missing header file * update version * Fix feature otlp content * update version * update to 1.12.0 * update version * update version
This commit is contained in:
parent
45f34d72b9
commit
7dc6a4e174
|
|
@ -1,24 +0,0 @@
|
|||
diff --git a/exporters/jaeger/src/TUDPTransport.cc b/exporters/jaeger/src/TUDPTransport.cc
|
||||
index e411127..a5e08fa 100644
|
||||
--- a/exporters/jaeger/src/TUDPTransport.cc
|
||||
+++ b/exporters/jaeger/src/TUDPTransport.cc
|
||||
@@ -2,7 +2,9 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
#include <sstream> // std::stringstream
|
||||
-
|
||||
+#ifndef _MSC_VER
|
||||
+#include <unistd.h>
|
||||
+#endif
|
||||
#include "TUDPTransport.h"
|
||||
#include "opentelemetry/sdk_config.h"
|
||||
|
||||
@@ -48,7 +50,7 @@ void TUDPTransport::open()
|
||||
hints.ai_socktype = SOCK_DGRAM;
|
||||
hints.ai_flags = AI_PASSIVE | AI_ADDRCONFIG;
|
||||
|
||||
- sprintf(port, "%d", port_);
|
||||
+ snprintf(port, sizeof(port), "%d", port_);
|
||||
|
||||
error = getaddrinfo(host_.c_str(), port, &hints, &server_addr_info_);
|
||||
|
||||
|
|
@ -6,19 +6,14 @@ vcpkg_from_github(
|
|||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO open-telemetry/opentelemetry-cpp
|
||||
REF "v${VERSION}"
|
||||
SHA512 86cf0320f9ee50bc1aa2b7a8b254fb0df25d1bd1f5f01ebc3630ab7fe2f6ca5e53ca8e042518b4e7096dbb102c0b880e9a25fcdf5f668d24ff57d9247237bf62
|
||||
SHA512 55553e3695adbc446264a4589fe8e3b2a284c0aac50ce2a09f76913bc8c0196b8ec8f79a32366c4473196332d4bff058793fe54ad2e95350fc046e3d148c8abb
|
||||
HEAD_REF main
|
||||
PATCHES
|
||||
# Use the compiler's default C++ version. Picking a version with
|
||||
# CMAKE_CXX_STANDARD is not needed as the Abseil port already picked
|
||||
# one and propagates that version across all its downstream deps.
|
||||
use-default-cxx-version.patch
|
||||
# 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
|
||||
add-missing-include-file.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
|
|
@ -28,7 +23,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|||
prometheus WITH_PROMETHEUS
|
||||
elasticsearch WITH_ELASTICSEARCH
|
||||
jaeger WITH_JAEGER
|
||||
otlp WITH_OTLP
|
||||
otlp-http WITH_OTLP_HTTP
|
||||
zpages WITH_ZPAGES
|
||||
otlp-grpc WITH_OTLP_GRPC
|
||||
|
|
@ -63,6 +57,8 @@ vcpkg_cmake_configure(
|
|||
${FEATURE_OPTIONS}
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
WITH_OTLP_GRPC
|
||||
WITH_JAEGER
|
||||
WITH_LOGS_PREVIEW
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f4fa064..a868106 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -126,21 +126,6 @@ endif()
|
||||
option(OPENTELEMETRY_INSTALL "Whether to install opentelemetry targets"
|
||||
${OPENTELEMETRY_INSTALL_default})
|
||||
|
||||
-if(NOT DEFINED CMAKE_CXX_STANDARD)
|
||||
- if(WITH_STL)
|
||||
- # Require at least C++17. C++20 is needed to avoid gsl::span
|
||||
- if(CMAKE_VERSION VERSION_GREATER 3.11.999)
|
||||
- # Ask for 20, may get anything below
|
||||
- set(CMAKE_CXX_STANDARD 20)
|
||||
- else()
|
||||
- # Ask for 17, may get anything below
|
||||
- set(CMAKE_CXX_STANDARD 17)
|
||||
- endif()
|
||||
- else()
|
||||
- set(CMAKE_CXX_STANDARD 11)
|
||||
- endif()
|
||||
-endif()
|
||||
-
|
||||
if(WITH_STL)
|
||||
# These definitions are needed for test projects that do not link against
|
||||
# opentelemetry-api library directly. We ensure that variant implementation
|
||||
|
|
@ -1,8 +1,7 @@
|
|||
{
|
||||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
||||
"name": "opentelemetry-cpp",
|
||||
"version-semver": "1.9.1",
|
||||
"port-version": 1,
|
||||
"version-semver": "1.12.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."
|
||||
|
|
@ -39,7 +38,14 @@
|
|||
"otlp": {
|
||||
"description": "Whether to include the OpenTelemetry Protocol in the SDK",
|
||||
"dependencies": [
|
||||
"protobuf"
|
||||
{
|
||||
"name": "opentelemetry-cpp",
|
||||
"default-features": false,
|
||||
"features": [
|
||||
"otlp-grpc",
|
||||
"otlp-http"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"otlp-grpc": {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
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 <map>
|
||||
#include <string>
|
||||
|
|
@ -8,6 +8,8 @@ vcpkg_from_github(
|
|||
REF 7afa91952f08aad1fa79b8992f20a4b0cdaadaff # Maps to 2.0.0
|
||||
HEAD_REF main
|
||||
SHA512 b28415c867aee5efe99f7521a145b5c402ac555d83be75a8b1d2760aed226ac109a6d092e86d7afedcc2ed8dc848d9662ac6505133d32f99b810f51e2748d1fc
|
||||
PATCHES
|
||||
fix_include_path.patch
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
||||
"name": "opentelemetry-fluentd",
|
||||
"version-semver": "2.0.0",
|
||||
"port-version": 1,
|
||||
"description": "mdsd/fluentd exporter for OpenTelemetry C++",
|
||||
"homepage": "https://github.com/open-telemetry/opentelemetry-cpp-contrib/tree/main/exporters",
|
||||
"license": "Apache-2.0",
|
||||
|
|
|
|||
|
|
@ -6241,12 +6241,12 @@
|
|||
"port-version": 0
|
||||
},
|
||||
"opentelemetry-cpp": {
|
||||
"baseline": "1.9.1",
|
||||
"port-version": 1
|
||||
"baseline": "1.12.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"opentelemetry-fluentd": {
|
||||
"baseline": "2.0.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"opentracing": {
|
||||
"baseline": "1.6.0",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "5fd8cacd9fd3aaa30b0ad133f2de052ba3ff869f",
|
||||
"version-semver": "1.12.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "3ad2a8625bd852a203f6156970c0eada6f90c192",
|
||||
"version-semver": "1.9.1",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "e9ffc101ca11ffd64b1a2bd73ae7e11bf7f28cfc",
|
||||
"version-semver": "2.0.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "4c8cdb3314a3a35268d4ce9b786c6632c79e0f97",
|
||||
"version-semver": "2.0.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue