(PE-38408) Add new metrics to PDB integration test

This updates the PDB integration acceptance test with the new metrics
brought in first by acd44da.

It also fixes an incorrect invocation of Enumerable#find that only errs
when it cannot find some metrics.

Author: justinstoller

acceptance/suites/tests/00_smoke/puppetdb_integration.rb

@@ -116,15 +116,26 @@
     # name passed to Puppet::Util::Profiler.profile over in the Ruby
     # terminus code of the PuppetDB project without realizing that is a
     # breaking change to metrics critical for measuring compiler performance.
-    %w[
-      facts_encode command_submit_replace_facts
-      catalog_munge command_submit_replace_catalog
-      report_convert_to_wire_format_hash command_submit_store_report
-      resource_search query
+    [
+      "query",
+      "resource_search",
+      "facts_find",
+      "catalog_save",
+      "facts_save",
+      "command_submit_replace_catalog",
+      "command_submit_replace_facts",
+      "report_process",
+      "command_submit_store_report",
+      "payload_format",
+      "facts_encode",
+      "catalog_munge",
+      "report_convert_to_wire_format_hash"
     ].each do |metric_name|
-      metric_data = pdb_metrics.find({}) {|m| m['metric'] == metric_name }
+      metric_data = pdb_metrics.find {|m| m['metric'] == metric_name } || {}
 
-      assert_operator(metric_data.fetch('count', 0), :>, 0,
+      metric_count = metric_data.fetch('count', 0)
+      logger.debug("PuppetDB metrics #{metric_name} recorded #{metric_count} times")
+      assert_operator(metric_count, :>, 0,
                       "PuppetDB metrics recorded for: #{metric_name}")
     end
   end