-
Notifications
You must be signed in to change notification settings - Fork 499
[Metrics] Perform async Re-Aggregation when Spatial Attributes are dropped #3691
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.
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
Open
nikhilbhatia08
wants to merge
6
commits into
open-telemetry:main
Choose a base branch
from
nikhilbhatia08:async_re_aggregation
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
095da8d
[Metrics] Perform async Re-Aggregation when Spatial Attributes are dr…
nikhilbhatia08 c48f6e1
iwyu fix and minor changes
nikhilbhatia08 5487b02
format and iwyu fix
nikhilbhatia08 36d47c2
Measurements name change
nikhilbhatia08 a6cbbbd
Merge branch 'main' into async_re_aggregation
nikhilbhatia08 880567f
resolve merge conflicts
nikhilbhatia08 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
157 changes: 157 additions & 0 deletions
157
sdk/include/opentelemetry/sdk/metrics/state/measurement_attributes_map.h
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <cstring> | ||
| #include <string> | ||
| #include <unordered_map> | ||
| #include <utility> | ||
|
|
||
| #include "opentelemetry/common/attribute_value.h" | ||
| #include "opentelemetry/common/key_value_iterable.h" | ||
| #include "opentelemetry/nostd/string_view.h" | ||
| #include "opentelemetry/sdk/common/custom_hash_equality.h" | ||
| #include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h" | ||
| #include "opentelemetry/version.h" | ||
|
|
||
| OPENTELEMETRY_BEGIN_NAMESPACE | ||
| namespace sdk | ||
| { | ||
| namespace metrics | ||
| { | ||
|
|
||
| // Hash function for AttributeValue (int and string only) | ||
| struct AttributeValueHash | ||
| { | ||
| size_t operator()(const opentelemetry::common::AttributeValue &value) const noexcept | ||
| { | ||
| if (nostd::holds_alternative<int32_t>(value)) | ||
| { | ||
| return std::hash<int32_t>{}(nostd::get<int32_t>(value)); | ||
| } | ||
| else if (nostd::holds_alternative<int64_t>(value)) | ||
| { | ||
| return std::hash<int64_t>{}(nostd::get<int64_t>(value)); | ||
| } | ||
| else if (nostd::holds_alternative<const char *>(value)) | ||
| { | ||
| return std::hash<nostd::string_view>{}(nostd::string_view(nostd::get<const char *>(value))); | ||
| } | ||
| else if (nostd::holds_alternative<nostd::string_view>(value)) | ||
| { | ||
| return std::hash<nostd::string_view>{}(nostd::get<nostd::string_view>(value)); | ||
| } | ||
|
|
||
| return 0; // fallback for other types | ||
| } | ||
| }; | ||
|
|
||
| // Equality function for AttributeValue (int and string only) | ||
| struct AttributeValueEqual | ||
| { | ||
| bool operator()(const opentelemetry::common::AttributeValue &a, | ||
| const opentelemetry::common::AttributeValue &b) const noexcept | ||
| { | ||
| if (a.index() != b.index()) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| // Compare int32_t | ||
| if (nostd::holds_alternative<int32_t>(a)) | ||
| { | ||
| return nostd::get<int32_t>(a) == nostd::get<int32_t>(b); | ||
| } | ||
| // Compare int64_t | ||
| else if (nostd::holds_alternative<int64_t>(a)) | ||
| { | ||
| return nostd::get<int64_t>(a) == nostd::get<int64_t>(b); | ||
| } | ||
| // Compare const char* | ||
| else if (nostd::holds_alternative<const char *>(a)) | ||
| { | ||
| return nostd::string_view(nostd::get<const char *>(a)) == | ||
| nostd::string_view(nostd::get<const char *>(b)); | ||
| } | ||
| // Compare string_view | ||
| else if (nostd::holds_alternative<nostd::string_view>(a)) | ||
| { | ||
| return nostd::get<nostd::string_view>(a) == nostd::get<nostd::string_view>(b); | ||
| } | ||
|
|
||
| return false; | ||
|
||
| } | ||
| }; | ||
|
|
||
| // Hash function for unordered_map of key-value pairs | ||
| // This Custom Hash is only applied to strings and int for now | ||
| struct AttributeMapHash | ||
| { | ||
| size_t operator()( | ||
| const std::unordered_map<nostd::string_view, opentelemetry::common::AttributeValue> &map) | ||
| const noexcept | ||
| { | ||
| size_t hash = 0; | ||
| AttributeValueHash value_hasher; | ||
|
|
||
| for (const auto &pair : map) | ||
| { | ||
| // Combine key hash | ||
| size_t key_hash = std::hash<nostd::string_view>{}(pair.first); | ||
| hash ^= key_hash + 0x9e3779b9 + (hash << 6) + (hash >> 2); | ||
|
|
||
| // Combine value hash | ||
| size_t value_hash = value_hasher(pair.second); | ||
| hash ^= value_hash + 0x9e3779b9 + (hash << 6) + (hash >> 2); | ||
| } | ||
|
|
||
| return hash; | ||
| } | ||
| }; | ||
|
|
||
| // Equality function for unordered_map of key-value pairs | ||
| // This Custom Equal is only applied to strings and int for now | ||
| struct AttributeMapEqual | ||
| { | ||
| bool operator()( | ||
| const std::unordered_map<nostd::string_view, opentelemetry::common::AttributeValue> &a, | ||
| const std::unordered_map<nostd::string_view, opentelemetry::common::AttributeValue> &b) | ||
| const noexcept | ||
| { | ||
| if (a.size() != b.size()) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| AttributeValueEqual value_equal; | ||
|
|
||
| for (const auto &pair_a : a) | ||
| { | ||
| auto it = b.find(pair_a.first); | ||
| if (it == b.end()) | ||
| { | ||
| return false; // key not found in b | ||
| } | ||
|
|
||
| // Compare values | ||
| if (!value_equal(pair_a.second, it->second)) | ||
| { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
| }; | ||
|
|
||
| template <class T> | ||
| using MeasurementAttributes = std::unordered_map< | ||
| std::unordered_map<nostd::string_view, opentelemetry::common::AttributeValue>, | ||
| T, | ||
| AttributeMapHash, | ||
| AttributeMapEqual>; | ||
|
|
||
| } // namespace metrics | ||
| } // namespace sdk | ||
| OPENTELEMETRY_END_NAMESPACE | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fallback hash value of 0 for unsupported types can cause hash collisions. Consider using a more distinctive hash value or throwing an exception for unsupported types to make the limitation explicit.
Copilot uses AI. Check for mistakes.