Skip to content
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 from upstream #97

Merged
merged 3 commits into from
Nov 25, 2024
Merged

merged from upstream #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcdd526
[INSTALL] Fix cmake/opentelemetry-cpp-config.cmake.in (#3165)
marcalff Nov 24, 2024
c1ef416
[BUILD] Do not set OTELCPP_PROTO_PATH in the CMake cache (#3160)
marcalff Nov 24, 2024
31956f8
[BUILD] Fix build for esp32 (#3155)
albkharisov Nov 24, 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
4 changes: 0 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,6 @@ if(OTELCPP_VERSIONED_LIBS AND NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "OTELCPP_VERSIONED_LIBS=ON requires BUILD_SHARED_LIBS=ON")
endif()

set(OTELCPP_PROTO_PATH
""
CACHE PATH "Path to opentelemetry-proto")

if(WIN32)
option(WITH_ETW "Whether to include the ETW Exporter in the SDK" ON)
else()
Expand Down
2 changes: 1 addition & 1 deletion cmake/opentelemetry-cpp-config.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ endif()

if(@WITH_ABSEIL@ OR @WITH_OTLP_GRPC@)
find_package(absl CONFIG)
elseif(OR @WITH_OTLP_HTTP@ OR @WITH_OTLP_FILE@)
elseif(@WITH_OTLP_HTTP@ OR @WITH_OTLP_FILE@)
if("@Protobuf_VERSION@" VERSION_GREATER_EQUAL "3.22.0")
find_package(absl CONFIG)
endif()
Expand Down
6 changes: 3 additions & 3 deletions sdk/include/opentelemetry/sdk/common/empty_attributes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ namespace sdk
* with default attributes.
*/
static const opentelemetry::common::KeyValueIterableView<
std::array<std::pair<std::string, int>, 0>> &
std::array<std::pair<std::string, int32_t>, 0>> &
GetEmptyAttributes() noexcept
{
static const std::array<std::pair<std::string, int>, 0> array{};
static const std::array<std::pair<std::string, int32_t>, 0> array{};
static const opentelemetry::common::KeyValueIterableView<
std::array<std::pair<std::string, int>, 0>>
std::array<std::pair<std::string, int32_t>, 0>>
kEmptyAttributes(array);

return kEmptyAttributes;
Expand Down
2 changes: 1 addition & 1 deletion sdk/include/opentelemetry/sdk/trace/span_data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ class SpanData final : public Recordable
opentelemetry::common::SystemTimestamp timestamp =
opentelemetry::common::SystemTimestamp(std::chrono::system_clock::now()),
const opentelemetry::common::KeyValueIterable &attributes =
opentelemetry::common::KeyValueIterableView<std::map<std::string, int>>(
opentelemetry::common::KeyValueIterableView<std::map<std::string, int32_t>>(
{})) noexcept override
{
SpanDataEvent event(std::string(name), timestamp, attributes);
Expand Down