Adds a counter to count the number of calls to DirectSession.

Change: 130706040

2 files changed, 4 insertions, 6 deletions

diff --git a/tensorflow/core/lib/monitoring/counter.h b/tensorflow/core/lib/monitoring/counter.h
index 78de52aa05..e76057b980 100644
--- a/tensorflow/core/lib/monitoring/counter.h
+++ b/tensorflow/core/lib/monitoring/counter.h
@@ -20,7 +20,7 @@ limitations under the License.
 // platforms.
 #include "tensorflow/core/platform/platform.h"
 #ifdef IS_MOBILE_PLATFORM
-#include "tensorflow/core/lib/monitoring/mobile/counter.h"
+#include "tensorflow/core/lib/monitoring/mobile_counter.h"
 #else
 
 #include <array>
@@ -34,8 +34,6 @@ limitations under the License.
 #include "tensorflow/core/platform/mutex.h"
 #include "tensorflow/core/platform/thread_annotations.h"
 
-// WARNING: Not yet ready for usage.
-
 namespace tensorflow {
 namespace monitoring {
 
diff --git a/tensorflow/core/lib/monitoring/mobile_counter.h b/tensorflow/core/lib/monitoring/mobile_counter.h
index 5847249248..c30bfe026f 100644
--- a/tensorflow/core/lib/monitoring/mobile_counter.h
+++ b/tensorflow/core/lib/monitoring/mobile_counter.h
@@ -18,8 +18,8 @@ limitations under the License.
 #ifndef THIRD_PARTY_TENSORFLOW_CORE_LIB_MONITORING_MOBILE_COUNTER_H_
 #define THIRD_PARTY_TENSORFLOW_CORE_LIB_MONITORING_MOBILE_COUNTER_H_
 
-#include "tensorflow/core/lib/monitoring/metric_def.h"
 #include "tensorflow/core/platform/macros.h"
+#include "tensorflow/core/platform/types.h"
 
 namespace tensorflow {
 namespace monitoring {
@@ -43,8 +43,8 @@ class Counter {
  public:
   ~Counter() {}
 
-  static Counter* New(
-      const MetricDef<MetricKind::kCumulative, int64, NumLabels>& metric_def) {
+  template <typename... MetricDefArgs>
+  static Counter* New(MetricDefArgs&&... metric_def_args) {
     return new Counter<NumLabels>();
   }