Merge pull request #22786 from veblush/bm_opencensus_plugin_test

Fix bm opencensus plugin test
pull/22864/head
Esun Kim 5 years ago committed by GitHub
commit 6b0b2602f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      test/cpp/microbenchmarks/bm_opencensus_plugin.cc

@ -28,6 +28,7 @@
#include "opencensus/stats/stats.h" #include "opencensus/stats/stats.h"
#include "src/cpp/ext/filters/census/grpc_plugin.h" #include "src/cpp/ext/filters/census/grpc_plugin.h"
#include "src/proto/grpc/testing/echo.grpc.pb.h" #include "src/proto/grpc/testing/echo.grpc.pb.h"
#include "test/core/util/test_config.h"
#include "test/cpp/microbenchmarks/helpers.h" #include "test/cpp/microbenchmarks/helpers.h"
using ::grpc::RegisterOpenCensusPlugin; using ::grpc::RegisterOpenCensusPlugin;
@ -86,6 +87,8 @@ class EchoServerThread final {
}; };
static void BM_E2eLatencyCensusDisabled(benchmark::State& state) { static void BM_E2eLatencyCensusDisabled(benchmark::State& state) {
grpc::testing::TestEnvironment env(0, {});
EchoServerThread server; EchoServerThread server;
std::unique_ptr<grpc::testing::EchoTestService::Stub> stub = std::unique_ptr<grpc::testing::EchoTestService::Stub> stub =
grpc::testing::EchoTestService::NewStub(grpc::CreateChannel( grpc::testing::EchoTestService::NewStub(grpc::CreateChannel(
@ -101,11 +104,7 @@ static void BM_E2eLatencyCensusDisabled(benchmark::State& state) {
BENCHMARK(BM_E2eLatencyCensusDisabled); BENCHMARK(BM_E2eLatencyCensusDisabled);
static void BM_E2eLatencyCensusEnabled(benchmark::State& state) { static void BM_E2eLatencyCensusEnabled(benchmark::State& state) {
// Avoid a data race between registering plugin and shutdown of previous grpc::testing::TestEnvironment env(0, {});
// test (order-dependent) by doing an init/shutdown so that any previous
// shutdowns are fully complete first.
grpc_init();
grpc_shutdown_blocking();
// Now start the test by registering the plugin (once in the execution) // Now start the test by registering the plugin (once in the execution)
RegisterOnce(); RegisterOnce();

Loading…
Cancel
Save