Skip to content
Draft

wip #16350

Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions ci/cloudbuild/builds/observability.sh
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,12 @@ chmod +x /tmp/observability_integration_test-dynamic-pool
TEST_EXIT_CODE=0

echo "Running observability_integration_test-default..."
GOOGLE_CLOUD_CPP_BIGTABLE_TESTING_CHANNEL_POOL=static \
/tmp/observability_integration_test-default \
--gtest_output=xml:/tmp/test-default.xml > /tmp/test-default.log 2>&1 || TEST_EXIT_CODE=\$?

echo "Running observability_integration_test-dynamic-pool..."
GOOGLE_CLOUD_CPP_BIGTABLE_TESTING_CHANNEL_POOL=dynamic \
/tmp/observability_integration_test-dynamic-pool \
--gtest_output=xml:/tmp/test-dynamic-pool.xml > /tmp/test-dynamic-pool.log 2>&1 || TEST_EXIT_CODE=\$?

Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ class BigtableRandomTwoLeastUsed : public BigtableStub {
return pool_;
}

std::unique_ptr<google::cloud::internal::StreamingReadRpc<
google::bigtable::v2::ReadRowsResponse>>
std::unique_ptr<
internal::StreamingReadRpc<google::bigtable::v2::ReadRowsResponse>>
ReadRows(std::shared_ptr<grpc::ClientContext> context, Options const& options,
google::bigtable::v2::ReadRowsRequest const& request,
std::shared_ptr<OperationContext> operation_context) override;

std::unique_ptr<google::cloud::internal::StreamingReadRpc<
google::bigtable::v2::SampleRowKeysResponse>>
std::unique_ptr<
internal::StreamingReadRpc<google::bigtable::v2::SampleRowKeysResponse>>
SampleRowKeys(std::shared_ptr<grpc::ClientContext> context,
Options const& options,
google::bigtable::v2::SampleRowKeysRequest const& request,
Expand All @@ -57,8 +57,8 @@ class BigtableRandomTwoLeastUsed : public BigtableStub {
google::bigtable::v2::MutateRowRequest const& request,
OperationContext& operation_context) override;

std::unique_ptr<google::cloud::internal::StreamingReadRpc<
google::bigtable::v2::MutateRowsResponse>>
std::unique_ptr<
internal::StreamingReadRpc<google::bigtable::v2::MutateRowsResponse>>
MutateRows(std::shared_ptr<grpc::ClientContext> context,
Options const& options,
google::bigtable::v2::MutateRowsRequest const& request,
Expand All @@ -84,73 +84,67 @@ class BigtableRandomTwoLeastUsed : public BigtableStub {
google::bigtable::v2::PrepareQueryRequest const& request,
OperationContext& operation_context) override;

std::unique_ptr<google::cloud::internal::StreamingReadRpc<
google::bigtable::v2::ExecuteQueryResponse>>
std::unique_ptr<
internal::StreamingReadRpc<google::bigtable::v2::ExecuteQueryResponse>>
ExecuteQuery(std::shared_ptr<grpc::ClientContext> context,
Options const& options,
google::bigtable::v2::ExecuteQueryRequest const& request,
std::shared_ptr<OperationContext> operation_context) override;

std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
google::bigtable::v2::ReadRowsResponse>>
AsyncReadRows(google::cloud::CompletionQueue const& cq,
std::unique_ptr<
internal::AsyncStreamingReadRpc<google::bigtable::v2::ReadRowsResponse>>
AsyncReadRows(CompletionQueue const& cq,
std::shared_ptr<grpc::ClientContext> context,
google::cloud::internal::ImmutableOptions options,
internal::ImmutableOptions options,
google::bigtable::v2::ReadRowsRequest const& request,
std::shared_ptr<OperationContext> operation_context) override;

std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
std::unique_ptr<internal::AsyncStreamingReadRpc<
google::bigtable::v2::SampleRowKeysResponse>>
AsyncSampleRowKeys(
google::cloud::CompletionQueue const& cq,
std::shared_ptr<grpc::ClientContext> context,
google::cloud::internal::ImmutableOptions options,
CompletionQueue const& cq, std::shared_ptr<grpc::ClientContext> context,
internal::ImmutableOptions options,
google::bigtable::v2::SampleRowKeysRequest const& request,
std::shared_ptr<OperationContext> operation_context) override;

future<StatusOr<google::bigtable::v2::MutateRowResponse>> AsyncMutateRow(
google::cloud::CompletionQueue& cq,
std::shared_ptr<grpc::ClientContext> context,
google::cloud::internal::ImmutableOptions options,
CompletionQueue& cq, std::shared_ptr<grpc::ClientContext> context,
internal::ImmutableOptions options,
google::bigtable::v2::MutateRowRequest const& request,
std::shared_ptr<OperationContext> operation_context) override;

std::unique_ptr<::google::cloud::internal::AsyncStreamingReadRpc<
google::bigtable::v2::MutateRowsResponse>>
AsyncMutateRows(google::cloud::CompletionQueue const& cq,
std::unique_ptr<
internal::AsyncStreamingReadRpc<google::bigtable::v2::MutateRowsResponse>>
AsyncMutateRows(CompletionQueue const& cq,
std::shared_ptr<grpc::ClientContext> context,
google::cloud::internal::ImmutableOptions options,
internal::ImmutableOptions options,
google::bigtable::v2::MutateRowsRequest const& request,
std::shared_ptr<OperationContext> operation_context) override;

future<StatusOr<google::bigtable::v2::CheckAndMutateRowResponse>>
AsyncCheckAndMutateRow(
google::cloud::CompletionQueue& cq,
std::shared_ptr<grpc::ClientContext> context,
google::cloud::internal::ImmutableOptions options,
CompletionQueue& cq, std::shared_ptr<grpc::ClientContext> context,
internal::ImmutableOptions options,
google::bigtable::v2::CheckAndMutateRowRequest const& request,
std::shared_ptr<OperationContext> operation_context) override;

future<StatusOr<google::bigtable::v2::PingAndWarmResponse>> AsyncPingAndWarm(
google::cloud::CompletionQueue& cq,
std::shared_ptr<grpc::ClientContext> context,
google::cloud::internal::ImmutableOptions options,
CompletionQueue& cq, std::shared_ptr<grpc::ClientContext> context,
internal::ImmutableOptions options,
google::bigtable::v2::PingAndWarmRequest const& request,
std::shared_ptr<OperationContext> operation_context) override;

future<StatusOr<google::bigtable::v2::ReadModifyWriteRowResponse>>
AsyncReadModifyWriteRow(
google::cloud::CompletionQueue& cq,
std::shared_ptr<grpc::ClientContext> context,
google::cloud::internal::ImmutableOptions options,
CompletionQueue& cq, std::shared_ptr<grpc::ClientContext> context,
internal::ImmutableOptions options,
google::bigtable::v2::ReadModifyWriteRowRequest const& request,
std::shared_ptr<OperationContext> operation_context) override;

future<StatusOr<google::bigtable::v2::PrepareQueryResponse>>
AsyncPrepareQuery(
google::cloud::CompletionQueue& cq,
std::shared_ptr<grpc::ClientContext> context,
google::cloud::internal::ImmutableOptions options,
CompletionQueue& cq, std::shared_ptr<grpc::ClientContext> context,
internal::ImmutableOptions options,
google::bigtable::v2::PrepareQueryRequest const& request,
std::shared_ptr<OperationContext> operation_context) override;

Expand All @@ -159,30 +153,28 @@ class BigtableRandomTwoLeastUsed : public BigtableStub {
google::bigtable::v2::GetClientConfigurationRequest const& request,
OperationContext& operation_context) override;

std::unique_ptr<::google::cloud::AsyncStreamingReadWriteRpc<
google::bigtable::v2::SessionRequest,
google::bigtable::v2::SessionResponse>>
AsyncOpenTable(google::cloud::CompletionQueue const& cq,
std::unique_ptr<
AsyncStreamingReadWriteRpc<google::bigtable::v2::SessionRequest,
google::bigtable::v2::SessionResponse>>
AsyncOpenTable(CompletionQueue const& cq,
std::shared_ptr<grpc::ClientContext> context,
google::cloud::internal::ImmutableOptions options,
internal::ImmutableOptions options,
std::shared_ptr<OperationContext> operation_context) override;

std::unique_ptr<::google::cloud::AsyncStreamingReadWriteRpc<
google::bigtable::v2::SessionRequest,
google::bigtable::v2::SessionResponse>>
std::unique_ptr<
AsyncStreamingReadWriteRpc<google::bigtable::v2::SessionRequest,
google::bigtable::v2::SessionResponse>>
AsyncOpenAuthorizedView(
google::cloud::CompletionQueue const& cq,
std::shared_ptr<grpc::ClientContext> context,
google::cloud::internal::ImmutableOptions options,
CompletionQueue const& cq, std::shared_ptr<grpc::ClientContext> context,
internal::ImmutableOptions options,
std::shared_ptr<OperationContext> operation_context) override;

std::unique_ptr<::google::cloud::AsyncStreamingReadWriteRpc<
google::bigtable::v2::SessionRequest,
google::bigtable::v2::SessionResponse>>
std::unique_ptr<
AsyncStreamingReadWriteRpc<google::bigtable::v2::SessionRequest,
google::bigtable::v2::SessionResponse>>
AsyncOpenMaterializedView(
google::cloud::CompletionQueue const& cq,
std::shared_ptr<grpc::ClientContext> context,
google::cloud::internal::ImmutableOptions options,
CompletionQueue const& cq, std::shared_ptr<grpc::ClientContext> context,
internal::ImmutableOptions options,
std::shared_ptr<OperationContext> operation_context) override;

private:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Generated by the Codegen C++ plugin.
// If you make any local changes, they will be lost.
// source: google/bigtable/v2/bigtable.proto

#include "google/cloud/bigtable/internal/bigtable_round_robin_decorator.h"
#include "google/cloud/bigtable/internal/defaults.h"
#include "google/cloud/bigtable/internal/operation_context.h"
#include <memory>
#include <mutex>
#include <vector>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Generated by the Codegen C++ plugin.
// If you make any local changes, they will be lost.
// source: google/bigtable/v2/bigtable.proto

#ifndef GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_BIGTABLE_ROUND_ROBIN_DECORATOR_H
#define GOOGLE_CLOUD_CPP_GOOGLE_CLOUD_BIGTABLE_INTERNAL_BIGTABLE_ROUND_ROBIN_DECORATOR_H

Expand Down
5 changes: 4 additions & 1 deletion google/cloud/bigtable/internal/bigtable_stub_factory.cc
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,10 @@ std::shared_ptr<BigtableStub> CreateBigtableStubRandomTwoLeastUsed(
std::move(children), std::move(refresh_state),
std::move(refreshing_channel_stub_factory),
options.get<
bigtable::experimental::DynamicChannelPoolSizingPolicyOption>()));
bigtable::experimental::DynamicChannelPoolSizingPolicyOption>(),
bigtable::internal::IsDirectPath(options)
? TransportType::kDirectPath
: TransportType::kCloudPath));
}

std::shared_ptr<BigtableStub> CreateDecoratedStubs(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#include "google/cloud/bigtable/internal/operation_context.h"
// Copyright 2022 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -13,9 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "google/cloud/bigtable/internal/bigtable_random_two_least_used_decorator.h"
#include "google/cloud/bigtable/internal/bigtable_stub_factory.h"
#include "google/cloud/bigtable/internal/bigtable_random_two_least_used_decorator.h"
#include "google/cloud/bigtable/internal/dynamic_channel_pool.h"
#include "google/cloud/bigtable/internal/operation_context.h"
#include "google/cloud/bigtable/options.h"
#include "google/cloud/bigtable/testing/mock_bigtable_stub.h"
#include "google/cloud/common_options.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ TEST_F(ScheduleStubRefreshTest, RefreshedUsingAsyncPingAndWarm) {
[&](CompletionQueue&, std::shared_ptr<grpc::ClientContext> const&,
internal::ImmutableOptions const&,
google::bigtable::v2::PingAndWarmRequest const& request,
auto const&)
std::shared_ptr<bigtable_internal::OperationContext> const&)
-> future<StatusOr<google::bigtable::v2::PingAndWarmResponse>> {
EXPECT_THAT(request.name(), Eq(instance_name));
return p2.get_future();
Expand Down
6 changes: 5 additions & 1 deletion google/cloud/bigtable/internal/data_connection_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include "google/cloud/bigtable/internal/async_row_sampler.h"
#include "google/cloud/bigtable/internal/bulk_mutator.h"
#include "google/cloud/bigtable/internal/default_row_reader.h"
#include "google/cloud/bigtable/internal/grpc_metrics_exporter.h"
#include "google/cloud/bigtable/internal/defaults.h"
#include "google/cloud/bigtable/internal/logging_result_set_reader.h"
#include "google/cloud/bigtable/internal/operation_context.h"
#include "google/cloud/bigtable/internal/partial_result_set_reader.h"
Expand All @@ -39,8 +39,12 @@
#include "google/cloud/internal/async_retry_loop.h"
#include "google/cloud/internal/getenv.h"
#include "google/cloud/internal/make_status.h"
#include "google/cloud/internal/random.h"
#include "google/cloud/internal/retry_loop.h"
#include "google/cloud/internal/streaming_read_rpc.h"
#ifdef GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS
#include "google/cloud/monitoring/v3/metric_connection.h"
#endif // GOOGLE_CLOUD_CPP_BIGTABLE_WITH_OTEL_METRICS
#include "google/cloud/universe_domain_options.h"
#include <memory>
#include <string>
Expand Down
Loading
Loading