From 6bf73e8cf6d9d2ede844ab628a0b88000ffc9afa Mon Sep 17 00:00:00 2001
From: Noah Eisen <ncteisen@google.com>
Date: Sun, 12 Nov 2017 20:18:35 -0800
Subject: Fix test compile

---
 test/core/transport/connectivity_state_test.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/core/transport')

diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc
index 8cd7b30b66..d88240bb8b 100644
--- a/test/core/transport/connectivity_state_test.cc
+++ b/test/core/transport/connectivity_state_test.cc
@@ -136,7 +136,7 @@ static void test_subscribe_with_failure_then_destroy(void) {
 
 int main(int argc, char** argv) {
   grpc_test_init(argc, argv);
-  grpc_connectivity_state_trace.value = 1;
+  grpc_connectivity_state_trace.set_enabled(1);
   test_connectivity_state_name();
   test_check();
   test_subscribe_then_unsubscribe();
-- 
cgit v1.2.3


From 90ffc3a6f74ee6f7db925a054b6f3973bd0d9fc5 Mon Sep 17 00:00:00 2001
From: ncteisen <ncteisen@gmail.com>
Date: Tue, 14 Nov 2017 16:25:25 -0800
Subject: Add tracer peer to keep set_enabled private()

---
 CMakeLists.txt                                     |  2 ++
 Makefile                                           |  2 ++
 build.yaml                                         |  2 ++
 grpc.gyp                                           |  2 ++
 src/core/lib/debug/trace.h                         | 13 ++++---
 test/core/iomgr/timer_list_test.cc                 |  9 ++---
 test/core/transport/connectivity_state_test.cc     |  3 +-
 test/core/util/BUILD                               |  2 ++
 test/core/util/tracer_peer.cc                      | 41 ++++++++++++++++++++++
 test/core/util/tracer_peer.h                       | 29 +++++++++++++++
 tools/run_tests/generated/sources_and_headers.json |  3 ++
 11 files changed, 98 insertions(+), 10 deletions(-)
 create mode 100644 test/core/util/tracer_peer.cc
 create mode 100644 test/core/util/tracer_peer.h

(limited to 'test/core/transport')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7eb0eb79c8..b72554af14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1620,6 +1620,7 @@ add_library(grpc_test_util
   test/core/util/port.cc
   test/core/util/port_server_client.cc
   test/core/util/slice_splitter.cc
+  test/core/util/tracer_peer.cc
   test/core/util/trickle_endpoint.cc
   src/core/lib/backoff/backoff.cc
   src/core/lib/channel/channel_args.cc
@@ -1886,6 +1887,7 @@ add_library(grpc_test_util_unsecure
   test/core/util/port.cc
   test/core/util/port_server_client.cc
   test/core/util/slice_splitter.cc
+  test/core/util/tracer_peer.cc
   test/core/util/trickle_endpoint.cc
   src/core/lib/backoff/backoff.cc
   src/core/lib/channel/channel_args.cc
diff --git a/Makefile b/Makefile
index 69a60006cb..378032108b 100644
--- a/Makefile
+++ b/Makefile
@@ -3603,6 +3603,7 @@ LIBGRPC_TEST_UTIL_SRC = \
     test/core/util/port.cc \
     test/core/util/port_server_client.cc \
     test/core/util/slice_splitter.cc \
+    test/core/util/tracer_peer.cc \
     test/core/util/trickle_endpoint.cc \
     src/core/lib/backoff/backoff.cc \
     src/core/lib/channel/channel_args.cc \
@@ -3859,6 +3860,7 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
     test/core/util/port.cc \
     test/core/util/port_server_client.cc \
     test/core/util/slice_splitter.cc \
+    test/core/util/tracer_peer.cc \
     test/core/util/trickle_endpoint.cc \
     src/core/lib/backoff/backoff.cc \
     src/core/lib/channel/channel_args.cc \
diff --git a/build.yaml b/build.yaml
index 910b00ebe2..b7b5b93f7b 100644
--- a/build.yaml
+++ b/build.yaml
@@ -714,6 +714,7 @@ filegroups:
   - test/core/util/port.h
   - test/core/util/port_server_client.h
   - test/core/util/slice_splitter.h
+  - test/core/util/tracer_peer.h
   - test/core/util/trickle_endpoint.h
   src:
   - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
@@ -730,6 +731,7 @@ filegroups:
   - test/core/util/port.cc
   - test/core/util/port_server_client.cc
   - test/core/util/slice_splitter.cc
+  - test/core/util/tracer_peer.cc
   - test/core/util/trickle_endpoint.cc
   deps:
   - gpr_test_util
diff --git a/grpc.gyp b/grpc.gyp
index 7075aa9afd..c9a7507932 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -515,6 +515,7 @@
         'test/core/util/port.cc',
         'test/core/util/port_server_client.cc',
         'test/core/util/slice_splitter.cc',
+        'test/core/util/tracer_peer.cc',
         'test/core/util/trickle_endpoint.cc',
         'src/core/lib/backoff/backoff.cc',
         'src/core/lib/channel/channel_args.cc',
@@ -723,6 +724,7 @@
         'test/core/util/port.cc',
         'test/core/util/port_server_client.cc',
         'test/core/util/slice_splitter.cc',
+        'test/core/util/tracer_peer.cc',
         'test/core/util/trickle_endpoint.cc',
         'src/core/lib/backoff/backoff.cc',
         'src/core/lib/channel/channel_args.cc',
diff --git a/src/core/lib/debug/trace.h b/src/core/lib/debug/trace.h
index cc9d9d2b2d..5e5143e502 100644
--- a/src/core/lib/debug/trace.h
+++ b/src/core/lib/debug/trace.h
@@ -45,6 +45,8 @@ void grpc_tracer_shutdown(void);
 namespace grpc_core {
 
 class TraceFlag {
+  friend class TraceFlagPeer;
+
  public:
   TraceFlag(bool default_enabled, const char* name);
   ~TraceFlag() {}
@@ -61,8 +63,9 @@ class TraceFlag {
 #endif
   }
 
-  // Only to be used for testing purposes. Tracers should usually be set using
-  // the static Set function
+ private:
+  static void LogAllTracers();
+
   void set_enabled(bool enabled) {
 #ifdef GRPC_THREADSAFE_TRACER
     gpr_atm_no_barrier_store(&value_, enabled);
@@ -71,9 +74,6 @@ class TraceFlag {
 #endif
   }
 
- private:
-  static void LogAllTracers();
-
   static TraceFlag* root_tracer_;
   TraceFlag* next_tracer_;
   const char* const name_;
@@ -91,6 +91,9 @@ class DebugOnlyTraceFlag {
  public:
   DebugOnlyTraceFlag(bool default_enabled, const char* name) {}
   bool enabled() { return false; }
+
+ private:
+  void set_enabled(bool enabled) {}
 };
 #endif
 
diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc
index 8976894689..6aec1ec13d 100644
--- a/test/core/iomgr/timer_list_test.cc
+++ b/test/core/iomgr/timer_list_test.cc
@@ -28,6 +28,7 @@
 #include <grpc/support/log.h>
 #include "src/core/lib/debug/trace.h"
 #include "test/core/util/test_config.h"
+#include "test/core/util/tracer_peer.h"
 
 #define MAX_CB 30
 
@@ -48,8 +49,8 @@ static void add_test(void) {
   gpr_log(GPR_INFO, "add_test");
 
   grpc_timer_list_init(&exec_ctx);
-  grpc_timer_trace.set_enabled(1);
-  grpc_timer_check_trace.set_enabled(1);
+  grpc_tracer_peer_enable_flag(&grpc_timer_trace);
+  grpc_tracer_peer_enable_flag(&grpc_timer_check_trace);
   memset(cb_called, 0, sizeof(cb_called));
 
   grpc_millis start = grpc_exec_ctx_now(&exec_ctx);
@@ -117,8 +118,8 @@ void destruction_test(void) {
   exec_ctx.now_is_valid = true;
   exec_ctx.now = 0;
   grpc_timer_list_init(&exec_ctx);
-  grpc_timer_trace.set_enabled(1);
-  grpc_timer_check_trace.set_enabled(1);
+  grpc_tracer_peer_enable_flag(&grpc_timer_trace);
+  grpc_tracer_peer_enable_flag(&grpc_timer_check_trace);
   memset(cb_called, 0, sizeof(cb_called));
 
   grpc_timer_init(
diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc
index f42937ee14..1eab6d7ea2 100644
--- a/test/core/transport/connectivity_state_test.cc
+++ b/test/core/transport/connectivity_state_test.cc
@@ -23,6 +23,7 @@
 #include <grpc/support/log.h>
 
 #include "test/core/util/test_config.h"
+#include "test/core/util/tracer_peer.h"
 
 #define THE_ARG ((void*)(size_t)0xcafebabe)
 
@@ -136,7 +137,7 @@ static void test_subscribe_with_failure_then_destroy(void) {
 
 int main(int argc, char** argv) {
   grpc_test_init(argc, argv);
-  grpc_connectivity_state_trace.set_enabled(1);
+  grpc_tracer_peer_enable_flag(&grpc_connectivity_state_trace);
   test_connectivity_state_name();
   test_check();
   test_subscribe_then_unsubscribe();
diff --git a/test/core/util/BUILD b/test/core/util/BUILD
index 2437923435..684986aa3e 100644
--- a/test/core/util/BUILD
+++ b/test/core/util/BUILD
@@ -57,6 +57,7 @@ grpc_cc_library(
         "reconnect_server.cc",
         "slice_splitter.cc",
         "test_tcp_server.cc",
+        "tracer_peer.cc",
         "trickle_endpoint.cc",
     ],
     hdrs = [
@@ -69,6 +70,7 @@ grpc_cc_library(
         "reconnect_server.h",
         "slice_splitter.h",
         "test_tcp_server.h",
+        "tracer_peer.h",
         "trickle_endpoint.h",
     ],
     language = "C++",
diff --git a/test/core/util/tracer_peer.cc b/test/core/util/tracer_peer.cc
new file mode 100644
index 0000000000..6c18430f89
--- /dev/null
+++ b/test/core/util/tracer_peer.cc
@@ -0,0 +1,41 @@
+/*
+ *
+ * Copyright 2015 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "test/core/util/test_config.h"
+
+#include "src/core/lib/debug/trace.h"
+
+namespace grpc_core {
+
+// This class is a friend of TraceFlag, and can be used to manually turn on
+// certain tracers for tests.
+class TraceFlagPeer {
+ public:
+  TraceFlagPeer(TraceFlag* flag) : flag_(flag) {}
+  void enable() { flag_->set_enabled(1); }
+  void disable() { flag_->set_enabled(0); }
+
+ private:
+  TraceFlag* flag_;
+};
+}  // namespace grpc_core
+
+void grpc_tracer_peer_enable_flag(grpc_core::TraceFlag* flag) {
+  grpc_core::TraceFlagPeer peer(flag);
+  peer.enable();
+}
diff --git a/test/core/util/tracer_peer.h b/test/core/util/tracer_peer.h
new file mode 100644
index 0000000000..e8a5f6c31a
--- /dev/null
+++ b/test/core/util/tracer_peer.h
@@ -0,0 +1,29 @@
+/*
+ *
+ * Copyright 2015 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef GRPC_TEST_CORE_UTIL_TRACER_PEER_H
+#define GRPC_TEST_CORE_UTIL_TRACER_PEER_H
+
+namespace grpc_core {
+class TraceFlag;
+}
+
+// enables the TraceFlag passed to it. Used for testing purposes.
+void grpc_tracer_peer_enable_flag(grpc_core::TraceFlag* flag);
+
+#endif /* GRPC_TEST_CORE_UTIL_TRACER_PEER_H */
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index fce01bf8ff..63ba4f2282 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -8880,6 +8880,7 @@
       "test/core/util/port.h", 
       "test/core/util/port_server_client.h", 
       "test/core/util/slice_splitter.h", 
+      "test/core/util/tracer_peer.h", 
       "test/core/util/trickle_endpoint.h"
     ], 
     "is_filegroup": true, 
@@ -8914,6 +8915,8 @@
       "test/core/util/port_server_client.h", 
       "test/core/util/slice_splitter.cc", 
       "test/core/util/slice_splitter.h", 
+      "test/core/util/tracer_peer.cc", 
+      "test/core/util/tracer_peer.h", 
       "test/core/util/trickle_endpoint.cc", 
       "test/core/util/trickle_endpoint.h"
     ], 
-- 
cgit v1.2.3


From b2aa06ae990e82b5c7f573f282b7bcfef7093d54 Mon Sep 17 00:00:00 2001
From: ncteisen <ncteisen@gmail.com>
Date: Thu, 16 Nov 2017 09:02:58 -0800
Subject: Reviewer feedback: friend func not clasS

---
 src/core/lib/debug/trace.h                     |  6 +++++-
 test/core/iomgr/timer_list_test.cc             |  8 ++++----
 test/core/transport/connectivity_state_test.cc |  3 ++-
 test/core/util/tracer_peer.cc                  | 20 +++++---------------
 test/core/util/tracer_peer.h                   |  5 ++++-
 5 files changed, 20 insertions(+), 22 deletions(-)

(limited to 'test/core/transport')

diff --git a/src/core/lib/debug/trace.h b/src/core/lib/debug/trace.h
index 3371a7c20d..8e3a39d173 100644
--- a/src/core/lib/debug/trace.h
+++ b/src/core/lib/debug/trace.h
@@ -58,8 +58,12 @@ class TraceFlagList {
   TraceFlag* root_tracer_;
 };
 
+namespace testing {
+void grpc_tracer_peer_enable_flag(grpc_core::TraceFlag* flag);
+}
+
 class TraceFlag {
-  friend class TraceFlagPeer;
+  friend void grpc_core::testing::grpc_tracer_peer_enable_flag(TraceFlag* flag);
   friend class TraceFlagList;
 
  public:
diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc
index 6aec1ec13d..73be93511b 100644
--- a/test/core/iomgr/timer_list_test.cc
+++ b/test/core/iomgr/timer_list_test.cc
@@ -49,8 +49,8 @@ static void add_test(void) {
   gpr_log(GPR_INFO, "add_test");
 
   grpc_timer_list_init(&exec_ctx);
-  grpc_tracer_peer_enable_flag(&grpc_timer_trace);
-  grpc_tracer_peer_enable_flag(&grpc_timer_check_trace);
+  grpc_core::testing::grpc_tracer_peer_enable_flag(&grpc_timer_trace);
+  grpc_core::testing::grpc_tracer_peer_enable_flag(&grpc_timer_check_trace);
   memset(cb_called, 0, sizeof(cb_called));
 
   grpc_millis start = grpc_exec_ctx_now(&exec_ctx);
@@ -118,8 +118,8 @@ void destruction_test(void) {
   exec_ctx.now_is_valid = true;
   exec_ctx.now = 0;
   grpc_timer_list_init(&exec_ctx);
-  grpc_tracer_peer_enable_flag(&grpc_timer_trace);
-  grpc_tracer_peer_enable_flag(&grpc_timer_check_trace);
+  grpc_core::testing::grpc_tracer_peer_enable_flag(&grpc_timer_trace);
+  grpc_core::testing::grpc_tracer_peer_enable_flag(&grpc_timer_check_trace);
   memset(cb_called, 0, sizeof(cb_called));
 
   grpc_timer_init(
diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc
index 1eab6d7ea2..e4d27950ec 100644
--- a/test/core/transport/connectivity_state_test.cc
+++ b/test/core/transport/connectivity_state_test.cc
@@ -137,7 +137,8 @@ static void test_subscribe_with_failure_then_destroy(void) {
 
 int main(int argc, char** argv) {
   grpc_test_init(argc, argv);
-  grpc_tracer_peer_enable_flag(&grpc_connectivity_state_trace);
+  grpc_core::testing::grpc_tracer_peer_enable_flag(
+      &grpc_connectivity_state_trace);
   test_connectivity_state_name();
   test_check();
   test_subscribe_then_unsubscribe();
diff --git a/test/core/util/tracer_peer.cc b/test/core/util/tracer_peer.cc
index 6c18430f89..acb770515f 100644
--- a/test/core/util/tracer_peer.cc
+++ b/test/core/util/tracer_peer.cc
@@ -21,21 +21,11 @@
 #include "src/core/lib/debug/trace.h"
 
 namespace grpc_core {
-
-// This class is a friend of TraceFlag, and can be used to manually turn on
-// certain tracers for tests.
-class TraceFlagPeer {
- public:
-  TraceFlagPeer(TraceFlag* flag) : flag_(flag) {}
-  void enable() { flag_->set_enabled(1); }
-  void disable() { flag_->set_enabled(0); }
-
- private:
-  TraceFlag* flag_;
-};
-}  // namespace grpc_core
+namespace testing {
 
 void grpc_tracer_peer_enable_flag(grpc_core::TraceFlag* flag) {
-  grpc_core::TraceFlagPeer peer(flag);
-  peer.enable();
+  flag->set_enabled(1);
 }
+
+}  // namespace testing
+}  // namespace grpc_core
diff --git a/test/core/util/tracer_peer.h b/test/core/util/tracer_peer.h
index e8a5f6c31a..0b6c6dd685 100644
--- a/test/core/util/tracer_peer.h
+++ b/test/core/util/tracer_peer.h
@@ -21,9 +21,12 @@
 
 namespace grpc_core {
 class TraceFlag;
-}
 
+namespace testing {
 // enables the TraceFlag passed to it. Used for testing purposes.
 void grpc_tracer_peer_enable_flag(grpc_core::TraceFlag* flag);
 
+}  // namespace testing
+}  // namespace grpc_core
+
 #endif /* GRPC_TEST_CORE_UTIL_TRACER_PEER_H */
-- 
cgit v1.2.3


From c4dd9cfe1893081b6783213f96d2b72b7b02d165 Mon Sep 17 00:00:00 2001
From: ncteisen <ncteisen@gmail.com>
Date: Fri, 17 Nov 2017 13:39:01 -0800
Subject: reviewer feedback

---
 src/core/lib/debug/trace.cc                    | 16 +++++-----------
 src/core/lib/debug/trace.h                     | 19 ++++++++-----------
 test/core/iomgr/timer_list_test.cc             |  8 ++++----
 test/core/transport/connectivity_state_test.cc |  3 +--
 test/core/util/tracer_peer.cc                  |  2 +-
 test/core/util/tracer_peer.h                   |  2 +-
 6 files changed, 20 insertions(+), 30 deletions(-)

(limited to 'test/core/transport')

diff --git a/src/core/lib/debug/trace.cc b/src/core/lib/debug/trace.cc
index 04558fd91e..4c63983bdc 100644
--- a/src/core/lib/debug/trace.cc
+++ b/src/core/lib/debug/trace.cc
@@ -29,13 +29,7 @@ int grpc_tracer_set_enabled(const char* name, int enabled);
 
 namespace grpc_core {
 
-TraceFlagList* TraceFlagList::instance_ = nullptr;
-
-TraceFlagList* TraceFlagList::Get() {
-  if (instance_ == nullptr)
-    instance_ = static_cast<TraceFlagList*>(gpr_malloc(sizeof(TraceFlagList)));
-  return instance_;
-}
+TraceFlag* TraceFlagList::root_tracer_ = nullptr;
 
 bool TraceFlagList::Set(const char* name, bool enabled) {
   TraceFlag* t;
@@ -83,7 +77,7 @@ void TraceFlagList::LogAllTracers() {
 // Flags register themselves on the list during construction
 TraceFlag::TraceFlag(bool default_enabled, const char* name)
     : name_(name), value_(default_enabled) {
-  TraceFlagList::Get()->Add(this);
+  TraceFlagList::Add(this);
 }
 
 }  // namespace grpc_core
@@ -121,9 +115,9 @@ static void parse(const char* s) {
 
   for (i = 0; i < nstrings; i++) {
     if (strings[i][0] == '-') {
-      grpc_core::TraceFlagList::Get()->Set(strings[i] + 1, false);
+      grpc_core::TraceFlagList::Set(strings[i] + 1, false);
     } else {
-      grpc_core::TraceFlagList::Get()->Set(strings[i], true);
+      grpc_core::TraceFlagList::Set(strings[i], true);
     }
   }
 
@@ -144,5 +138,5 @@ void grpc_tracer_init(const char* env_var) {
 void grpc_tracer_shutdown(void) {}
 
 int grpc_tracer_set_enabled(const char* name, int enabled) {
-  return grpc_core::TraceFlagList::Get()->Set(name, enabled != 0);
+  return grpc_core::TraceFlagList::Set(name, enabled != 0);
 }
diff --git a/src/core/lib/debug/trace.h b/src/core/lib/debug/trace.h
index 8e3a39d173..b58c16f3ca 100644
--- a/src/core/lib/debug/trace.h
+++ b/src/core/lib/debug/trace.h
@@ -47,25 +47,19 @@ namespace grpc_core {
 class TraceFlag;
 class TraceFlagList {
  public:
-  static TraceFlagList* Get();
-  bool Set(const char* name, bool enabled);
-  void Add(TraceFlag* flag);
+  static bool Set(const char* name, bool enabled);
+  static void Add(TraceFlag* flag);
 
  private:
-  static TraceFlagList* instance_;
-  void LogAllTracers();
-  TraceFlagList() : root_tracer_(nullptr) {}
-  TraceFlag* root_tracer_;
+  static void LogAllTracers();
+  static TraceFlag* root_tracer_;
 };
 
 namespace testing {
-void grpc_tracer_peer_enable_flag(grpc_core::TraceFlag* flag);
+void grpc_tracer_enable_flag(grpc_core::TraceFlag* flag);
 }
 
 class TraceFlag {
-  friend void grpc_core::testing::grpc_tracer_peer_enable_flag(TraceFlag* flag);
-  friend class TraceFlagList;
-
  public:
   TraceFlag(bool default_enabled, const char* name);
   ~TraceFlag() {}
@@ -81,6 +75,9 @@ class TraceFlag {
   }
 
  private:
+  friend void grpc_core::testing::grpc_tracer_enable_flag(TraceFlag* flag);
+  friend class TraceFlagList;
+
   void set_enabled(bool enabled) {
 #ifdef GRPC_THREADSAFE_TRACER
     gpr_atm_no_barrier_store(&value_, enabled);
diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc
index 73be93511b..5730a306ec 100644
--- a/test/core/iomgr/timer_list_test.cc
+++ b/test/core/iomgr/timer_list_test.cc
@@ -49,8 +49,8 @@ static void add_test(void) {
   gpr_log(GPR_INFO, "add_test");
 
   grpc_timer_list_init(&exec_ctx);
-  grpc_core::testing::grpc_tracer_peer_enable_flag(&grpc_timer_trace);
-  grpc_core::testing::grpc_tracer_peer_enable_flag(&grpc_timer_check_trace);
+  grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_trace);
+  grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_check_trace);
   memset(cb_called, 0, sizeof(cb_called));
 
   grpc_millis start = grpc_exec_ctx_now(&exec_ctx);
@@ -118,8 +118,8 @@ void destruction_test(void) {
   exec_ctx.now_is_valid = true;
   exec_ctx.now = 0;
   grpc_timer_list_init(&exec_ctx);
-  grpc_core::testing::grpc_tracer_peer_enable_flag(&grpc_timer_trace);
-  grpc_core::testing::grpc_tracer_peer_enable_flag(&grpc_timer_check_trace);
+  grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_trace);
+  grpc_core::testing::grpc_tracer_enable_flag(&grpc_timer_check_trace);
   memset(cb_called, 0, sizeof(cb_called));
 
   grpc_timer_init(
diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc
index e4d27950ec..f33bfd2c94 100644
--- a/test/core/transport/connectivity_state_test.cc
+++ b/test/core/transport/connectivity_state_test.cc
@@ -137,8 +137,7 @@ static void test_subscribe_with_failure_then_destroy(void) {
 
 int main(int argc, char** argv) {
   grpc_test_init(argc, argv);
-  grpc_core::testing::grpc_tracer_peer_enable_flag(
-      &grpc_connectivity_state_trace);
+  grpc_core::testing::grpc_tracer_enable_flag(&grpc_connectivity_state_trace);
   test_connectivity_state_name();
   test_check();
   test_subscribe_then_unsubscribe();
diff --git a/test/core/util/tracer_peer.cc b/test/core/util/tracer_peer.cc
index acb770515f..34a132daa7 100644
--- a/test/core/util/tracer_peer.cc
+++ b/test/core/util/tracer_peer.cc
@@ -23,7 +23,7 @@
 namespace grpc_core {
 namespace testing {
 
-void grpc_tracer_peer_enable_flag(grpc_core::TraceFlag* flag) {
+void grpc_tracer_enable_flag(grpc_core::TraceFlag* flag) {
   flag->set_enabled(1);
 }
 
diff --git a/test/core/util/tracer_peer.h b/test/core/util/tracer_peer.h
index 0b6c6dd685..6dd04f6549 100644
--- a/test/core/util/tracer_peer.h
+++ b/test/core/util/tracer_peer.h
@@ -24,7 +24,7 @@ class TraceFlag;
 
 namespace testing {
 // enables the TraceFlag passed to it. Used for testing purposes.
-void grpc_tracer_peer_enable_flag(grpc_core::TraceFlag* flag);
+void grpc_tracer_enable_flag(grpc_core::TraceFlag* flag);
 
 }  // namespace testing
 }  // namespace grpc_core
-- 
cgit v1.2.3


From aa3b19741f345faa3eb3d9bdcfa9d7064e5c439c Mon Sep 17 00:00:00 2001
From: ncteisen <ncteisen@gmail.com>
Date: Fri, 17 Nov 2017 15:56:27 -0800
Subject: Rename tracer_peer to tracer_util

---
 CMakeLists.txt                                     |  4 +--
 Makefile                                           |  4 +--
 build.yaml                                         |  4 +--
 grpc.gyp                                           |  4 +--
 test/core/iomgr/timer_list_test.cc                 |  2 +-
 test/core/transport/connectivity_state_test.cc     |  2 +-
 test/core/util/BUILD                               |  4 +--
 test/core/util/tracer_peer.cc                      | 31 ---------------------
 test/core/util/tracer_peer.h                       | 32 ----------------------
 test/core/util/tracer_util.cc                      | 31 +++++++++++++++++++++
 test/core/util/tracer_util.h                       | 32 ++++++++++++++++++++++
 tools/run_tests/generated/sources_and_headers.json |  6 ++--
 12 files changed, 78 insertions(+), 78 deletions(-)
 delete mode 100644 test/core/util/tracer_peer.cc
 delete mode 100644 test/core/util/tracer_peer.h
 create mode 100644 test/core/util/tracer_util.cc
 create mode 100644 test/core/util/tracer_util.h

(limited to 'test/core/transport')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b72554af14..b31c14b840 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1620,7 +1620,7 @@ add_library(grpc_test_util
   test/core/util/port.cc
   test/core/util/port_server_client.cc
   test/core/util/slice_splitter.cc
-  test/core/util/tracer_peer.cc
+  test/core/util/tracer_util.cc
   test/core/util/trickle_endpoint.cc
   src/core/lib/backoff/backoff.cc
   src/core/lib/channel/channel_args.cc
@@ -1887,7 +1887,7 @@ add_library(grpc_test_util_unsecure
   test/core/util/port.cc
   test/core/util/port_server_client.cc
   test/core/util/slice_splitter.cc
-  test/core/util/tracer_peer.cc
+  test/core/util/tracer_util.cc
   test/core/util/trickle_endpoint.cc
   src/core/lib/backoff/backoff.cc
   src/core/lib/channel/channel_args.cc
diff --git a/Makefile b/Makefile
index 378032108b..4c585e1ad8 100644
--- a/Makefile
+++ b/Makefile
@@ -3603,7 +3603,7 @@ LIBGRPC_TEST_UTIL_SRC = \
     test/core/util/port.cc \
     test/core/util/port_server_client.cc \
     test/core/util/slice_splitter.cc \
-    test/core/util/tracer_peer.cc \
+    test/core/util/tracer_util.cc \
     test/core/util/trickle_endpoint.cc \
     src/core/lib/backoff/backoff.cc \
     src/core/lib/channel/channel_args.cc \
@@ -3860,7 +3860,7 @@ LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
     test/core/util/port.cc \
     test/core/util/port_server_client.cc \
     test/core/util/slice_splitter.cc \
-    test/core/util/tracer_peer.cc \
+    test/core/util/tracer_util.cc \
     test/core/util/trickle_endpoint.cc \
     src/core/lib/backoff/backoff.cc \
     src/core/lib/channel/channel_args.cc \
diff --git a/build.yaml b/build.yaml
index b7b5b93f7b..8c8d526cb8 100644
--- a/build.yaml
+++ b/build.yaml
@@ -714,7 +714,7 @@ filegroups:
   - test/core/util/port.h
   - test/core/util/port_server_client.h
   - test/core/util/slice_splitter.h
-  - test/core/util/tracer_peer.h
+  - test/core/util/tracer_util.h
   - test/core/util/trickle_endpoint.h
   src:
   - src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
@@ -731,7 +731,7 @@ filegroups:
   - test/core/util/port.cc
   - test/core/util/port_server_client.cc
   - test/core/util/slice_splitter.cc
-  - test/core/util/tracer_peer.cc
+  - test/core/util/tracer_util.cc
   - test/core/util/trickle_endpoint.cc
   deps:
   - gpr_test_util
diff --git a/grpc.gyp b/grpc.gyp
index c9a7507932..b813736457 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -515,7 +515,7 @@
         'test/core/util/port.cc',
         'test/core/util/port_server_client.cc',
         'test/core/util/slice_splitter.cc',
-        'test/core/util/tracer_peer.cc',
+        'test/core/util/tracer_util.cc',
         'test/core/util/trickle_endpoint.cc',
         'src/core/lib/backoff/backoff.cc',
         'src/core/lib/channel/channel_args.cc',
@@ -724,7 +724,7 @@
         'test/core/util/port.cc',
         'test/core/util/port_server_client.cc',
         'test/core/util/slice_splitter.cc',
-        'test/core/util/tracer_peer.cc',
+        'test/core/util/tracer_util.cc',
         'test/core/util/trickle_endpoint.cc',
         'src/core/lib/backoff/backoff.cc',
         'src/core/lib/channel/channel_args.cc',
diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc
index 5730a306ec..d74ea4fc96 100644
--- a/test/core/iomgr/timer_list_test.cc
+++ b/test/core/iomgr/timer_list_test.cc
@@ -28,7 +28,7 @@
 #include <grpc/support/log.h>
 #include "src/core/lib/debug/trace.h"
 #include "test/core/util/test_config.h"
-#include "test/core/util/tracer_peer.h"
+#include "test/core/util/tracer_util.h"
 
 #define MAX_CB 30
 
diff --git a/test/core/transport/connectivity_state_test.cc b/test/core/transport/connectivity_state_test.cc
index f33bfd2c94..11046e126e 100644
--- a/test/core/transport/connectivity_state_test.cc
+++ b/test/core/transport/connectivity_state_test.cc
@@ -23,7 +23,7 @@
 #include <grpc/support/log.h>
 
 #include "test/core/util/test_config.h"
-#include "test/core/util/tracer_peer.h"
+#include "test/core/util/tracer_util.h"
 
 #define THE_ARG ((void*)(size_t)0xcafebabe)
 
diff --git a/test/core/util/BUILD b/test/core/util/BUILD
index 684986aa3e..6443553466 100644
--- a/test/core/util/BUILD
+++ b/test/core/util/BUILD
@@ -57,7 +57,7 @@ grpc_cc_library(
         "reconnect_server.cc",
         "slice_splitter.cc",
         "test_tcp_server.cc",
-        "tracer_peer.cc",
+        "tracer_util.cc",
         "trickle_endpoint.cc",
     ],
     hdrs = [
@@ -70,7 +70,7 @@ grpc_cc_library(
         "reconnect_server.h",
         "slice_splitter.h",
         "test_tcp_server.h",
-        "tracer_peer.h",
+        "tracer_util.h",
         "trickle_endpoint.h",
     ],
     language = "C++",
diff --git a/test/core/util/tracer_peer.cc b/test/core/util/tracer_peer.cc
deleted file mode 100644
index 34a132daa7..0000000000
--- a/test/core/util/tracer_peer.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include "test/core/util/test_config.h"
-
-#include "src/core/lib/debug/trace.h"
-
-namespace grpc_core {
-namespace testing {
-
-void grpc_tracer_enable_flag(grpc_core::TraceFlag* flag) {
-  flag->set_enabled(1);
-}
-
-}  // namespace testing
-}  // namespace grpc_core
diff --git a/test/core/util/tracer_peer.h b/test/core/util/tracer_peer.h
deleted file mode 100644
index 6dd04f6549..0000000000
--- a/test/core/util/tracer_peer.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef GRPC_TEST_CORE_UTIL_TRACER_PEER_H
-#define GRPC_TEST_CORE_UTIL_TRACER_PEER_H
-
-namespace grpc_core {
-class TraceFlag;
-
-namespace testing {
-// enables the TraceFlag passed to it. Used for testing purposes.
-void grpc_tracer_enable_flag(grpc_core::TraceFlag* flag);
-
-}  // namespace testing
-}  // namespace grpc_core
-
-#endif /* GRPC_TEST_CORE_UTIL_TRACER_PEER_H */
diff --git a/test/core/util/tracer_util.cc b/test/core/util/tracer_util.cc
new file mode 100644
index 0000000000..34a132daa7
--- /dev/null
+++ b/test/core/util/tracer_util.cc
@@ -0,0 +1,31 @@
+/*
+ *
+ * Copyright 2015 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#include "test/core/util/test_config.h"
+
+#include "src/core/lib/debug/trace.h"
+
+namespace grpc_core {
+namespace testing {
+
+void grpc_tracer_enable_flag(grpc_core::TraceFlag* flag) {
+  flag->set_enabled(1);
+}
+
+}  // namespace testing
+}  // namespace grpc_core
diff --git a/test/core/util/tracer_util.h b/test/core/util/tracer_util.h
new file mode 100644
index 0000000000..0b432ffa46
--- /dev/null
+++ b/test/core/util/tracer_util.h
@@ -0,0 +1,32 @@
+/*
+ *
+ * Copyright 2015 gRPC authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+#ifndef GRPC_TEST_CORE_UTIL_TRACER_UTIL_H
+#define GRPC_TEST_CORE_UTIL_TRACER_UTIL_H
+
+namespace grpc_core {
+class TraceFlag;
+
+namespace testing {
+// enables the TraceFlag passed to it. Used for testing purposes.
+void grpc_tracer_enable_flag(grpc_core::TraceFlag* flag);
+
+}  // namespace testing
+}  // namespace grpc_core
+
+#endif /* GRPC_TEST_CORE_UTIL_TRACER_UTIL_H */
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 63ba4f2282..c1927a3f17 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -8880,7 +8880,7 @@
       "test/core/util/port.h", 
       "test/core/util/port_server_client.h", 
       "test/core/util/slice_splitter.h", 
-      "test/core/util/tracer_peer.h", 
+      "test/core/util/tracer_util.h", 
       "test/core/util/trickle_endpoint.h"
     ], 
     "is_filegroup": true, 
@@ -8915,8 +8915,8 @@
       "test/core/util/port_server_client.h", 
       "test/core/util/slice_splitter.cc", 
       "test/core/util/slice_splitter.h", 
-      "test/core/util/tracer_peer.cc", 
-      "test/core/util/tracer_peer.h", 
+      "test/core/util/tracer_util.cc", 
+      "test/core/util/tracer_util.h", 
       "test/core/util/trickle_endpoint.cc", 
       "test/core/util/trickle_endpoint.h"
     ], 
-- 
cgit v1.2.3