Skip to content

channel pool metric prototype #16324

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

Draft
scotthart wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

channel pool metric prototype #16324

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
2 changes: 2 additions & 0 deletions ci/cloudbuild/builds/observability.sh
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion generator/generator_config.textproto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ service {
omit_client: true
omit_connection: true
omit_stub_factory: true
generate_round_robin_decorator: true
generate_round_robin_decorator: false
experimental_bigtable_operation_context: true
omitted_rpcs: [
"GenerateInitialChangeStreamPartitions",
Expand Down
1 change: 1 addition & 0 deletions google/cloud/bigtable/internal/async_row_reader_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

#include "google/cloud/bigtable/internal/async_row_reader.h"
#include "google/cloud/bigtable/internal/operation_context.h"
#include "google/cloud/bigtable/row_reader.h"
#include "google/cloud/bigtable/testing/mock_bigtable_stub.h"
#include "google/cloud/internal/async_streaming_read_rpc_impl.h"
Expand Down
1 change: 1 addition & 0 deletions google/cloud/bigtable/internal/async_row_sampler_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

#include "google/cloud/bigtable/internal/async_row_sampler.h"
#include "google/cloud/bigtable/internal/operation_context.h"
#include "google/cloud/bigtable/testing/mock_bigtable_stub.h"
#include "google/cloud/grpc_options.h"
#include "google/cloud/internal/async_streaming_read_rpc_impl.h"
Expand Down
169 changes: 101 additions & 68 deletions google/cloud/bigtable/internal/bigtable_random_two_least_used_decorator.cc
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions google/cloud/bigtable/internal/bigtable_round_robin_decorator.cc
View file
Open in desktop
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
4 changes: 0 additions & 4 deletions google/cloud/bigtable/internal/bigtable_round_robin_decorator.h
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions google/cloud/bigtable/internal/bigtable_stub_factory_test.cc
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion google/cloud/bigtable/internal/connection_refresh_state_test.cc
View file
Open in desktop
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>)
-> future<StatusOr<google::bigtable::v2::PingAndWarmResponse>> {
EXPECT_THAT(request.name(), Eq(instance_name));
return p2.get_future();
Expand Down
7 changes: 6 additions & 1 deletion google/cloud/bigtable/internal/data_connection_impl.cc
View file
Open in desktop
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 Expand Up @@ -197,6 +201,7 @@ std::string_view InstanceNameFromTableName(std::string_view table_name) {
if (pos == std::string_view::npos) return {};
return table_name.substr(0, pos);
}

} // namespace

bigtable::Row TransformReadModifyWriteRowResponse(
Expand Down
Loading
Loading