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.

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

fix(otel): support abseil <= 20210324 #12993

Merged
merged 2 commits into from
Oct 30, 2023

Conversation

dbolduc
Copy link
Member

@dbolduc dbolduc commented Oct 27, 2023

Part of the work for #12991

SimpleHexAtoi() was not added until later.

Updates to cmake-oldest-deps.sh revealed this.... but I need to do a few things to update that script. So there is no verification in our CI at this commit.


This change is Reviewable

@dbolduc dbolduc temporarily deployed to internal October 27, 2023 19:42 — with GitHub Actions Inactive
@codecov
Copy link

codecov bot commented Oct 27, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (679a1cd) 93.59% compared to head (1bf8901) 93.59%.

❗ Current head 1bf8901 differs from pull request most recent head 535ee80. Consider uploading reports for the commit 535ee80 to get more accurate results

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #12993   +/-   ##
=======================================
  Coverage   93.59%   93.59%           
=======================================
  Files        2068     2069    +1     
  Lines      180929   180942   +13     
=======================================
+ Hits       169344   169359   +15     
+ Misses      11585    11583    -2     
Files Coverage Δ
google/cloud/internal/trace_propagator.cc 91.66% <100.00%> (+4.71%) ⬆️

... and 10 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dbolduc dbolduc marked this pull request as ready for review October 27, 2023 20:42
@dbolduc dbolduc requested a review from a team as a code owner October 27, 2023 20:42
span_context.span_id().ToLowerBase16({span_id.data(), span_id.size() - 1});
span_id[2 * SpanId::kSize] = '\0';
char* end = nullptr;
std::uint64_t span_id_dec = std::strtoull(span_id.data(), &end, 16);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not handle errors, just like the implementation with absl::SimpleHexAtoi() did?

Suggested change
std::uint64_t span_id_dec = std::strtoull(span_id.data(), &end, 16);
auto const span_id_dec = std::strtoull(span_id.data(), &end, 16);
if (end != span_id.data() + span_id.size()) return;

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

@dbolduc dbolduc force-pushed the fix-otel-support-older-abseil branch from 1bf8901 to 535ee80 Compare October 30, 2023 14:49
@dbolduc dbolduc temporarily deployed to internal October 30, 2023 14:49 — with GitHub Actions Inactive
@dbolduc dbolduc merged commit 86a09c6 into googleapis:main Oct 30, 2023
58 checks passed
@dbolduc dbolduc deleted the fix-otel-support-older-abseil branch October 30, 2023 15:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants