Conversation
There was a problem hiding this comment.
Code Review
This pull request upgrades the opentelemetry-cpp dependency to version 1.28.0 across Bazel configurations, Dockerfiles, and documentation. However, the review identified a major regression where a large portion of doc/packaging.md (including the introduction, macOS instructions, and footnotes) was accidentally deleted. Additionally, the changes in grpc_opentelemetry.cc and its test file introduce commented-out code as inline annotations; these should be replaced with clean, raw string literals, and sc::rpc::kRpcMethod should be updated to "rpc.method" for consistency.
dbolduc
left a comment
There was a problem hiding this comment.
I think we lost some of doc/packaging.md, but otherwise LG
| @@ -1,140 +1,3 @@ | |||
| # Packaging `google-cloud-cpp` | |||
|
|
||
| </details> | ||
|
|
||
| <!-- inject-distro-instructions-end --> |
|
Other than the dockerfiles I called out to update to v1.28.0, let's revert the others to their current values. |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #16453 +/- ##
==========================================
+ Coverage 92.29% 92.31% +0.01%
==========================================
Files 2246 2246
Lines 213751 213751
==========================================
+ Hits 197290 197326 +36
+ Misses 16461 16425 -36 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
|
Looks like the new version of otel changed a parameter from pass by value, to pass by const ref. While technically breaking, this should be compatible. Update the abi dump for our |
| bazel_dep(name = "platforms", version = "1.1.0") | ||
| bazel_dep(name = "bazel_skylib", version = "1.9.2") | ||
| bazel_dep(name = "rules_cc", version = "0.2.17") | ||
| bazel_dep(name = "rules_cc", version = "0.2.22") |
There was a problem hiding this comment.
We should make this change in a separate PR. I think renovate-bot may already have one in flight.
| bazel_dep(name = "nlohmann_json", version = "3.12.0.bcr.1") | ||
| bazel_dep(name = "curl", version = "8.8.0.bcr.3") | ||
| bazel_dep(name = "opentelemetry-cpp", version = "1.24.0") | ||
| single_version_override( |
| module_name = "curl", | ||
| version = "8.8.0.bcr.3", | ||
| ) | ||
| bazel_dep(name = "opentelemetry-cpp", version = "1.28.0") |
There was a problem hiding this comment.
As this file specifies recommended minimum versions, let's keep it a 1.24.0.
|
|
||
| WORKDIR /var/tmp/build/ | ||
| RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ | ||
| RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.28.0.tar.gz | \ |
There was a problem hiding this comment.
Let's keep this at v1.28.0 since our clang-tidy builds use it.
|
|
||
| WORKDIR /var/tmp/build/ | ||
| RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.24.0.tar.gz | \ | ||
| RUN curl -fsSL https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.28.0.tar.gz | \ |
There was a problem hiding this comment.
Let's keep this one also at 1.28.0 to sniff out any C++20 issues.
| name = "opentelemetry-cpp", | ||
| urls = [ | ||
| "https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.20.0.tar.gz", | ||
| "https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.28.0.tar.gz", |
There was a problem hiding this comment.
Let's revert this to 1.20.0 to make sure we work with the old semantic conventions and because our bazel oldest builds uses WORKSPACE files.
| {{sc::rpc::kRpcSystem, sc::rpc::RpcSystemValues::kGrpc}, | ||
| {sc::rpc::kRpcService, service}, | ||
| {sc::rpc::kRpcMethod, method}, | ||
| {{"rpc.system", sc::rpc::RpcSystemValues::kGrpc}, |
There was a problem hiding this comment.
Revert these changes. Going from a strongly typed enums to a string literals is backwards. It turns a potential compilation error in to a runtime error.
| SpanNamed("google.cloud.foo.v1.Foo/GetBar"), | ||
| SpanHasAttributes( | ||
| OTelAttribute<std::string>(sc::rpc::kRpcSystem, | ||
| OTelAttribute<std::string>("rpc.system", |
There was a problem hiding this comment.
Revert these changes. Going from a strongly typed enums to a string literals is backwards. It turns a potential compilation error in to a runtime error.
No description provided.