wip

Author: stevie9868

metacat-common/src/main/java/com/netflix/metacat/common/QualifiedName.java

@@ -501,6 +501,21 @@ public Map<String, String> toJson() {
         return map;
     }
 
+    /**
+     * Returns the catalog and database name in parts.
+     *
+     * @return parts of the qualified name as a Map
+     */
+    public Map<String, String> partsWithCatalogAndDatabase() {
+        final Map<String, String> map = new HashMap<>(2);
+        map.put("catalogName", catalogName);
+
+        if (!databaseName.isEmpty()) {
+            map.put("databaseName", databaseName);
+        }
+        return map;
+    }
+
     /**
      * Returns the qualified name in parts.
      *

metacat-main/src/main/java/com/netflix/metacat/main/api/RequestWrapper.java

@@ -153,8 +153,9 @@ public <R> R processRequest(
         final Map<String, String> requestTags,
         final Supplier<R> supplier) {
         final long start = registry.clock().wallTime();
-        final Map<String, String> tags = new HashMap<>(name.parts());
+        final Map<String, String> tags = new HashMap<>(name.partsWithCatalogAndDatabase());
         final Map<String, String> percentileTags = Maps.newHashMap();
+
         if (requestTags != null) {
             tags.putAll(requestTags);
         }