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

Use custom abseil with bazel #1172

Merged
merged 5 commits into from
Jan 15, 2022

Conversation

owent
Copy link
Member

@owent owent commented Jan 13, 2022

Fixes #1065

Changes

  • Rename api/include/opentelemetry/nostd/absl to api/include/opentelemetry/nostd/internal/absl
  • Add --//api:with_abseil=true to use external abseil when use bazel to build.
  • Add bazel_with_abseil into .github/workflows/ci.yml to test building with external abseil.

For significant contributions please make sure you have completed the following items:

  • CHANGELOG.md updated for non-trivial changes
  • Unit tests have been added
  • Changes in public API reviewed

Signed-off-by: owentou <owentou@tencent.com>
Signed-off-by: owentou <owentou@tencent.com>
@owent owent requested a review from a team January 13, 2022 06:29
Signed-off-by: owentou <owentou@tencent.com>
@codecov
Copy link

codecov bot commented Jan 13, 2022

Codecov Report

Merging #1172 (a95ac25) into main (d206b50) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main    #1172   +/-   ##
=======================================
  Coverage   93.29%   93.29%           
=======================================
  Files         174      174           
  Lines        6402     6402           
=======================================
  Hits         5972     5972           
  Misses        430      430           
Impacted Files Coverage Δ
...lemetry/nostd/internal/absl/base/internal/invoke.h 100.00% <ø> (ø)
...try/nostd/internal/absl/types/bad_variant_access.h 100.00% <ø> (ø)
...metry/nostd/internal/absl/types/internal/variant.h 70.26% <ø> (ø)
.../opentelemetry/nostd/internal/absl/types/variant.h 100.00% <ø> (ø)
...pentelemetry/nostd/internal/absl/utility/utility.h 100.00% <ø> (ø)
api/include/opentelemetry/nostd/variant.h 66.67% <ø> (ø)

http_archive,
name = "com_google_absl",
sha256 = "59b862f50e710277f8ede96f083a5bb8d7c9595376146838b9580be90374ee1f",
strip_prefix = "abseil-cpp-20210324.2",
Copy link
Member

Choose a reason for hiding this comment

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

abseil version doesn't match with what we use in CI: 20210324.0

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed. The version of internal abseil in api/include/opentelemetry/nostd/absl is v2020-03-03#8 ,should it be upgraded?

Copy link
Member

@lalitb lalitb Jan 14, 2022

Choose a reason for hiding this comment

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

The version of internal abseil in api/include/opentelemetry/nostd/absl is v2020-03-03#8, should it be upgraded?

One of the concerns I see with the periodic upgrade of the internal nostd::variant snapshot would be the ABI incompatibility issue if the instrumented library and application are built using different otel-cpp releases (having different nostd::variant snapshots).

Signed-off-by: owentou <owentou@tencent.com>
Copy link
Member

@lalitb lalitb left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for fixing this issue.

api/BUILD Outdated
"@com_google_absl//absl/base",
"@com_google_absl//absl/types:any",
"@com_google_absl//absl/types:variant",
"@com_google_absl//absl/types:span",
Copy link
Member

Choose a reason for hiding this comment

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

nit - do we need to add a dependency for absl::span?

Copy link
Member Author

Choose a reason for hiding this comment

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

@com_google_absl//absl/types:any and @com_google_absl//absl/types:span are removed. The failed jobs seem not be the problem of this PR.

Signed-off-by: owentou <owentou@tencent.com>
@ThomsonTan ThomsonTan merged commit b8fae39 into open-telemetry:main Jan 15, 2022
@owent owent deleted the use_custom_abseil_with_bazel branch January 16, 2022 02:04
@lalitb lalitb mentioned this pull request Mar 22, 2022
3 tasks
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.

Failed to build with external abseil-cpp
4 participants