Merge branch 'master' of github.com:tensorflow/serving into ashahba/maintainer

Author: ashahba

tensorflow_serving/batching/batching_session.cc

@@ -47,8 +47,8 @@ namespace {
 void RecordPaddingSize(int32 padding_size, int32 execution_batch_size) {
   static auto* cell = tensorflow::monitoring::PercentileSampler<1>::New(
       {"/tensorflow/serving/batching_session/padding_size",
-       "execution_batch_size",
-       "Tracks the padding size distribution on batches."},
+       "Tracks the padding size distribution on batches.",
+       "execution_batch_size"},
       /*percentiles=*/{25.0, 50.0, 75.0, 90.0, 95.0, 99.0},
       /*max_samples=*/1024, tensorflow::monitoring::UnitOfMeasure::kNumber);
   cell->GetCell(absl::StrCat(execution_batch_size))

tensorflow_serving/batching/batching_session_test.cc

@@ -217,6 +217,25 @@ int GetPercentileTotal(string label) {
   return static_cast<int>(total_samples);
 }
 
+bool CheckDescriptor(string label, const string& description,
+                     const std::vector<string>& labels) {
+  auto* collection_registry = monitoring::CollectionRegistry::Default();
+  monitoring::CollectionRegistry::CollectMetricsOptions options;
+  const std::unique_ptr<monitoring::CollectedMetrics> collected_metrics =
+      collection_registry->CollectMetrics(options);
+  const auto& metric_descriptor_map = collected_metrics->metric_descriptor_map;
+  if (metric_descriptor_map.find(label) == metric_descriptor_map.end()) {
+    return false;
+  }
+  const monitoring::MetricDescriptor& desc = *metric_descriptor_map.at(label);
+  if (desc.description != description) return false;
+  if (labels.size() != desc.label_names.size()) return false;
+  for (int i = 0; i < labels.size(); ++i) {
+    if (labels[i] != desc.label_names[i]) return false;
+  }
+  return true;
+}
+
 TEST(BatchingSessionTest, TensorSignatureFromSignatureDef) {
   const SignatureDef signature_def =
       CreateSignatureDef({{"x0", "x1"}, {"y0", "y1"}});
@@ -497,6 +516,17 @@ TEST(BatchingSessionTest, AllowedBatchSizesRequirePadding) {
       "/tensorflow/serving/batching_session/processed_batch_size");
   int32 start_pad_value =
       GetPercentileTotal("/tensorflow/serving/batching_session/padding_size");
+  EXPECT_TRUE(
+      CheckDescriptor("/tensorflow/serving/batching_session/padding_size",
+                      "Tracks the padding size distribution on batches.",
+                      {"execution_batch_size"}));
+  EXPECT_TRUE(
+      CheckDescriptor("/tensorflow/serving/batching_session/input_batch_size",
+                      "Tracks the batch size distribution on the inputs.", {}));
+  EXPECT_TRUE(CheckDescriptor(
+      "/tensorflow/serving/batching_session/processed_batch_size",
+      "Tracks the batch size distribution on processing.", {}));
+
   // Arrange to capture the batch size.
   std::unique_ptr<BatchSizeCapturingSession> batch_size_capturing_session(
       new BatchSizeCapturingSession(CreateHalfPlusTwoSession()));

tensorflow_serving/servables/tensorflow/get_model_metadata_impl.cc

@@ -39,7 +39,7 @@ Status ValidateGetModelMetadataRequest(const GetModelMetadataRequest& request) {
   for (const auto& metadata_field : request.metadata_field()) {
     if (metadata_field != GetModelMetadataImpl::kSignatureDef) {
       return tensorflow::errors::InvalidArgument(
-          "Metadata field %s is not supported", metadata_field);
+          "Metadata field ", metadata_field, " is not supported");
     }
   }
   return tensorflow::Status::OK();
@@ -90,7 +90,7 @@ Status GetModelMetadataImpl::GetModelMetadataWithModelSpec(
           SavedModelGetSignatureDef(core, model_spec, request, response));
     } else {
       return tensorflow::errors::InvalidArgument(
-          "MetadataField %s is not supported", metadata_field);
+          "MetadataField ", metadata_field, " is not supported");
     }
   }
   return tensorflow::Status::OK();

tensorflow_serving/servables/tensorflow/tflite_session.cc

@@ -227,15 +227,15 @@ Status TfLiteSession::Create(string&& buffer,
       tflite::GetSignatureDefMap(model->GetModel(), &signature_defs);
   if (status != Status::OK()) {
     return errors::InvalidArgument(
-        "Invalid SignatureDefs found in TfLite model: %s",
+        "Invalid SignatureDefs found in TfLite model: ",
         status.error_message());
   }
   const bool has_lite_signature_def = !signature_defs.empty();
   if (has_lite_signature_def) {
     // TODO(b/157098128): Support multiple SignatureDefs by key.
     if (signature_defs.size() > 1) {
       return errors::InvalidArgument(
-          "Multiple SignatureDefs found in TfLite model: %s",
+          "Multiple SignatureDefs found in TfLite model: ",
           status.error_message());
     }
     lite_signature_def = signature_defs.begin()->second;