Skip to content

[BUILD] Fix build for esp32 #3155

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
merged 6 commits into from
Nov 24, 2024
Merged

[BUILD] Fix build for esp32 #3155

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
48678de
[BUILD] Fix build for esp32
albkharisov Nov 20, 2024
444d869
Remove unused default params
albkharisov Nov 24, 2024
d160f8a
Fix broken test
albkharisov Nov 24, 2024
9db948d
Apply suggestions from code review
marcalff Nov 24, 2024
851da95
Update sdk/include/opentelemetry/sdk/trace/span_data.h
marcalff Nov 24, 2024
75eb177
Merge branch 'main' into fix_build_for_m32_platforms
marcalff 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
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
7 changes: 2 additions & 5 deletions 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 @@ -254,11 +254,8 @@ class SpanData final : public Recordable
}

void AddEvent(nostd::string_view name,
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>>(
{})) noexcept override
opentelemetry::common::SystemTimestamp timestamp,
const opentelemetry::common::KeyValueIterable &attributes) noexcept override
{
SpanDataEvent event(std::string(name), timestamp, attributes);
events_.push_back(event);
Expand Down
3 changes: 2 additions & 1 deletion sdk/test/trace/span_data_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ TEST(SpanData, Set)
data.SetStartTime(now);
data.SetDuration(std::chrono::nanoseconds(1000000));
data.SetAttribute("attr1", static_cast<int64_t>(314159));
data.AddEvent("event1", now);
data.AddEvent("event1", now,
opentelemetry::common::KeyValueIterableView<std::map<std::string, int32_t>>({}));

ASSERT_EQ(data.GetTraceId(), trace_id);
ASSERT_EQ(data.GetSpanId(), span_id);
Expand Down