Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ Increment the:

## [Unreleased]

* [BUILD] Avoid break caused by max() macro on windows
[#3863](https://github.com/open-telemetry/opentelemetry-cpp/pull/3863)

## [1.25 2026-02-07]

* [RELEASE] Bump main branch to 1.25.0-dev (#3759)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ struct OPENTELEMETRY_EXPORT OtlpGrpcExporterOptions : public OtlpGrpcClientOptio
~OtlpGrpcExporterOptions() override;

/** Collection Limits. No limit by default. */
std::uint32_t max_attributes = std::numeric_limits<std::uint32_t>::max();
std::uint32_t max_events = std::numeric_limits<std::uint32_t>::max();
std::uint32_t max_links = std::numeric_limits<std::uint32_t>::max();
std::uint32_t max_attributes_per_event = std::numeric_limits<std::uint32_t>::max();
std::uint32_t max_attributes_per_link = std::numeric_limits<std::uint32_t>::max();
std::uint32_t max_attributes = (std::numeric_limits<std::uint32_t>::max)();
std::uint32_t max_events = (std::numeric_limits<std::uint32_t>::max)();
std::uint32_t max_links = (std::numeric_limits<std::uint32_t>::max)();
std::uint32_t max_attributes_per_event = (std::numeric_limits<std::uint32_t>::max)();
std::uint32_t max_attributes_per_link = (std::numeric_limits<std::uint32_t>::max)();
};

} // namespace otlp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ struct OPENTELEMETRY_EXPORT OtlpHttpExporterOptions
float retry_policy_backoff_multiplier{};

/** Collection Limits. No limit by default. */
std::uint32_t max_attributes = std::numeric_limits<std::uint32_t>::max();
std::uint32_t max_events = std::numeric_limits<std::uint32_t>::max();
std::uint32_t max_links = std::numeric_limits<std::uint32_t>::max();
std::uint32_t max_attributes_per_event = std::numeric_limits<std::uint32_t>::max();
std::uint32_t max_attributes_per_link = std::numeric_limits<std::uint32_t>::max();
std::uint32_t max_attributes = (std::numeric_limits<std::uint32_t>::max)();
std::uint32_t max_events = (std::numeric_limits<std::uint32_t>::max)();
std::uint32_t max_links = (std::numeric_limits<std::uint32_t>::max)();
std::uint32_t max_attributes_per_event = (std::numeric_limits<std::uint32_t>::max)();
std::uint32_t max_attributes_per_link = (std::numeric_limits<std::uint32_t>::max)();
};

} // namespace otlp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ class OtlpRecordable final : public opentelemetry::sdk::trace::Recordable
{
public:
explicit OtlpRecordable(
std::uint32_t max_attributes = std::numeric_limits<std::uint32_t>::max(),
std::uint32_t max_events = std::numeric_limits<std::uint32_t>::max(),
std::uint32_t max_links = std::numeric_limits<std::uint32_t>::max(),
std::uint32_t max_attributes_per_event = std::numeric_limits<std::uint32_t>::max(),
std::uint32_t max_attributes_per_link = std::numeric_limits<std::uint32_t>::max())
std::uint32_t max_attributes = (std::numeric_limits<std::uint32_t>::max)(),
std::uint32_t max_events = (std::numeric_limits<std::uint32_t>::max)(),
std::uint32_t max_links = (std::numeric_limits<std::uint32_t>::max)(),
std::uint32_t max_attributes_per_event = (std::numeric_limits<std::uint32_t>::max)(),
std::uint32_t max_attributes_per_link = (std::numeric_limits<std::uint32_t>::max)())
: max_attributes_(max_attributes),
max_events_(max_events),
max_links_(max_links),
Expand Down