Skip to content

fix(bigtable): fix build when OTel metrics disabled #16519

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.

Sign up for GitHub

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
colinmoy wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −9
Open

fix(bigtable): fix build when OTel metrics disabled #16519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 20 additions & 9 deletions google/cloud/bigtable/internal/metrics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,9 @@
#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_METRICS_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_METRICS_H

#ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS

#include "google/cloud/bigtable/internal/operation_context.h"
#include "google/cloud/bigtable/version.h"
#include "google/cloud/status.h"
#include <grpcpp/grpcpp.h>
#include <opentelemetry/context/context.h>
#include <chrono>
#include <cstdint>
#include <memory>
#include <string>
#include <vector>

namespace google {
namespace cloud {
Expand Down Expand Up @@ -55,6 +46,26 @@ struct StubSelectionParams {
RpcType streaming;
};

GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace bigtable_internal
} // namespace cloud
} // namespace google

#ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS

#include "google/cloud/status.h"
#include <grpcpp/grpcpp.h>
#include <opentelemetry/context/context.h>
#include <chrono>
#include <memory>
#include <string>
#include <vector>

namespace google {
namespace cloud {
namespace bigtable_internal {
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN

struct PreCallParams {
OperationContext::Clock::time_point attempt_start;
bool first_attempt;
Expand Down
2 changes: 2 additions & 0 deletions google/cloud/bigtable/internal/operation_context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ void OperationContext::ElementDelivery(grpc::ClientContext const&) {
OperationContext::OperationContext(std::vector<std::shared_ptr<Metric>>,
std::shared_ptr<Clock>) {}

void OperationContext::StubSelection(StubSelectionParams const&) {}
Comment thread
colinmoy marked this conversation as resolved.

void OperationContext::PreCall(grpc::ClientContext& client_context) {
for (auto const& [key, value] : cookies_) {
client_context.AddMetadata(key, value);
Expand Down
Loading