From e84d06775b8a49545271f6dabee634097e74d4e9 Mon Sep 17 00:00:00 2001
From: James Faulkner <jfaulkner@expediagroup.com>
Date: Mon, 8 Jun 2026 10:23:52 +0100
Subject: [PATCH 01/29] feat: add Micrometer KafkaClientMetrics to
 KafkaMessageReader

Binds the Kafka consumer's native metrics (~30 out of the box: fetch
latency, consumer lag, heartbeat rate, etc.) to a MeterRegistry via
KafkaClientMetrics. The registry is injected explicitly via the builder
withMeterRegistry(...) and defaults to null (opt-in). Bumps Micrometer
from 1.9.9 to 1.14.14 to pick up KafkaClientMetrics support.

Also adds .sdkmanrc pinning Java 11 for local builds (required by
Spotless/google-java-format compatibility).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .sdkmanrc                                     |  1 +
 .../kafka-metastore-receiver/pom.xml          |  4 +++
 .../kafka/messaging/KafkaMessageReader.java   | 27 +++++++++++++++----
 .../messaging/KafkaMessageReaderTest.java     |  8 ++++--
 pom.xml                                       |  2 +-
 5 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 .sdkmanrc

diff --git a/.sdkmanrc b/.sdkmanrc
new file mode 100644
index 00000000..598592aa
--- /dev/null
+++ b/.sdkmanrc
@@ -0,0 +1 @@
+java=11.0.28-tem
diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/pom.xml b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/pom.xml
index e50a44c4..d7b821be 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/pom.xml
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/pom.xml
@@ -22,6 +22,10 @@
       <artifactId>kafka-clients</artifactId>
       <version>${kafka.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-core</artifactId>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
index 81ec7bd9..97712e85 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020 Expedia, Inc.
+ * Copyright (C) 2018-2026 Expedia, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,9 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
+
 import com.google.common.annotations.VisibleForTesting;
 
 import com.expediagroup.apiary.extensions.events.metastore.event.ApiaryListenerEvent;
@@ -42,16 +45,21 @@ public class KafkaMessageReader implements Iterator<ApiaryListenerEvent>, Closea
   private KafkaConsumer<Long, byte[]> consumer;
   private MetaStoreEventSerDe eventSerDe;
   private Iterator<ConsumerRecord<Long, byte[]>> records;
+  private KafkaClientMetrics kafkaClientMetrics;
 
-  private KafkaMessageReader(String topicName, MetaStoreEventSerDe eventSerDe, Properties consumerProperties) {
-    this(topicName, eventSerDe, new KafkaConsumer(consumerProperties));
+  private KafkaMessageReader(String topicName, MetaStoreEventSerDe eventSerDe, Properties consumerProperties, MeterRegistry meterRegistry) {
+    this(topicName, eventSerDe, new KafkaConsumer(consumerProperties), meterRegistry);
   }
 
   @VisibleForTesting
-  KafkaMessageReader(String topicName, MetaStoreEventSerDe eventSerDe, KafkaConsumer<Long, byte[]> consumer) {
+  KafkaMessageReader(String topicName, MetaStoreEventSerDe eventSerDe, KafkaConsumer<Long, byte[]> consumer, MeterRegistry meterRegistry) {
     this.eventSerDe = eventSerDe;
     this.consumer = consumer;
     this.consumer.subscribe(Collections.singletonList(topicName));
+    if (meterRegistry != null) {
+      this.kafkaClientMetrics = new KafkaClientMetrics(consumer);
+      this.kafkaClientMetrics.bindTo(meterRegistry);
+    }
   }
 
   @Override
@@ -73,6 +81,9 @@ public void remove() {
 
   @Override
   public void close() {
+    if (kafkaClientMetrics != null) {
+      kafkaClientMetrics.close();
+    }
     consumer.close();
   }
 
@@ -89,6 +100,7 @@ public static final class KafkaMessageReaderBuilder {
     private String groupId = "apiary-kafka-metastore-receiver-";
     private MetaStoreEventSerDe metaStoreEventSerDe = new JsonMetaStoreEventSerDe();
     private Properties consumerProperties = new Properties();
+    private MeterRegistry meterRegistry;
 
     private KafkaMessageReaderBuilder(String bootstrapServers, String topicName, String applicationName) {
       this.bootstrapServers = bootstrapServers;
@@ -114,6 +126,11 @@ public KafkaMessageReaderBuilder withConsumerProperties(Properties consumerPrope
       return this;
     }
 
+    public KafkaMessageReaderBuilder withMeterRegistry(MeterRegistry meterRegistry) {
+      this.meterRegistry = meterRegistry;
+      return this;
+    }
+
     public KafkaMessageReader build() {
       Properties props = new Properties();
       props.put(BOOTSTRAP_SERVERS_CONFIG, bootstrapServers);
@@ -121,7 +138,7 @@ public KafkaMessageReader build() {
       props.put("key.deserializer", "org.apache.kafka.common.serialization.LongDeserializer");
       props.put("value.deserializer", "org.apache.kafka.common.serialization.ByteArrayDeserializer");
       consumerProperties.forEach((key, value) -> props.merge(key, value, (v1, v2) -> v1));
-      return new KafkaMessageReader(topicName, metaStoreEventSerDe, props);
+      return new KafkaMessageReader(topicName, metaStoreEventSerDe, props, meterRegistry);
     }
   }
 }
diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/test/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReaderTest.java b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/test/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReaderTest.java
index 87373ab8..beb493bf 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/test/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReaderTest.java
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/test/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReaderTest.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2020 Expedia, Inc.
+ * Copyright (C) 2018-2026 Expedia, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,6 +37,8 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
@@ -60,9 +62,11 @@ public class KafkaMessageReaderTest {
 
   private ConsumerRecords<Long, byte[]> messages;
   private KafkaMessageReader reader;
+  private SimpleMeterRegistry meterRegistry;
 
   @Before
   public void init() {
+    meterRegistry = new SimpleMeterRegistry();
     List<ConsumerRecord<Long, byte[]>> messageList = ImmutableList.of(message);
     Map<TopicPartition, List<ConsumerRecord<Long, byte[]>>> messageMap = ImmutableMap
         .of(new TopicPartition(TOPIC_NAME, PARTITION), messageList);
@@ -70,7 +74,7 @@ public void init() {
     when(consumer.poll(any(Duration.class))).thenReturn(messages);
     when(message.value()).thenReturn(MESSAGE_CONTENT);
     when(serDe.unmarshal(MESSAGE_CONTENT)).thenReturn(event);
-    reader = new KafkaMessageReader(TOPIC_NAME, serDe, consumer);
+    reader = new KafkaMessageReader(TOPIC_NAME, serDe, consumer, meterRegistry);
   }
 
   @Test
diff --git a/pom.xml b/pom.xml
index 8fb9cca5..114ddbfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
     <hadoop.version>2.7.1</hadoop.version>
     <hive.version>2.3.7</hive.version>
     <iceberg.version>1.0.0</iceberg.version>
-    <io.micrometer.version>1.9.9</io.micrometer.version>
+    <io.micrometer.version>1.14.14</io.micrometer.version>
     <!-- micrometer-registry-jmx pulls in metrics-jmx 4.x; pin it here to prevent Maven
          nearest-wins from resolving an incompatible version. The shade plugin in
          apiary-gluesync-listener relocates com.codahale.metrics to the shaded namespace to

From 42797a708f23500458f11b15dfae7513d9d4c2fd Mon Sep 17 00:00:00 2001
From: James Faulkner <jfaulkner@expediagroup.com>
Date: Mon, 8 Jun 2026 10:24:57 +0100
Subject: [PATCH 02/29] chore: ignore dependency-reduced-pom.xml maven shade
 artifact

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index f3939a82..9c30c83b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ dependency-reduced-pom.xml
 
 # Jenv file
 .java-version
+
+# Maven shade plugin artifact
+dependency-reduced-pom.xml

From 7de7eaa74ab798c9b46951005787cf115cd9dc8c Mon Sep 17 00:00:00 2001
From: James Faulkner <jfaulkner@expediagroup.com>
Date: Mon, 8 Jun 2026 10:41:27 +0100
Subject: [PATCH 03/29] feat: add tagged outcome counters to ApiaryGlueSync
 event handlers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adds per-operation counters with an `outcome` tag alongside the existing
binary success/failure counters. Each of the 8 event handler methods now
emits a tagged counter (e.g. glue_listener_create_database{outcome="created"})
capturing ignored events, specific outcomes (created/updated/deleted/renamed/
not_found), and exception class names for failures — without changing existing
metric behaviour.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../gluesync/listener/ApiaryGlueSync.java     | 31 +++++++++++++++++++
 .../listener/metrics/MetricConstants.java     | 11 ++++++-
 .../listener/metrics/MetricService.java       |  8 +++++
 .../gluesync/listener/ApiaryGlueSyncTest.java | 14 +++++++++
 4 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
index 0031518d..a57e1070 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
@@ -106,19 +106,23 @@ public ApiaryGlueSync(Configuration config, AWSGlue glueClient, String gluePrefi
   @Override
   public void onCreateDatabase(CreateDatabaseEvent event) throws MetaException {
     if (!event.getStatus()) {
+      metricService.incrementCounter(MetricConstants.CREATE_DATABASE, "ignored");
       return;
     }
     Database database = event.getDatabase();
     try {
       glueDatabaseService.create(database);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
+      metricService.incrementCounter(MetricConstants.CREATE_DATABASE, "created");
     } catch (AlreadyExistsException e) {
       log.info(database + " database already exists in glue, updating....");
       glueDatabaseService.update(database);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
+      metricService.incrementCounter(MetricConstants.CREATE_DATABASE, "updated");
     } catch (Exception e) {
       log.error("Failed create database {} in glue", database.getName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_FAILURE);
+      metricService.incrementCounter(MetricConstants.CREATE_DATABASE, e.getClass().getSimpleName());
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -128,15 +132,18 @@ public void onCreateDatabase(CreateDatabaseEvent event) throws MetaException {
   @Override
   public void onDropDatabase(DropDatabaseEvent event) throws MetaException {
     if (!event.getStatus()) {
+      metricService.incrementCounter(MetricConstants.DROP_DATABASE, "ignored");
       return;
     }
     Database database = event.getDatabase();
     try {
       glueDatabaseService.delete(database);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
+      metricService.incrementCounter(MetricConstants.DROP_DATABASE, "deleted");
     } catch (Exception e) {
       log.error("Failed drop database {} in glue", database.getName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_FAILURE);
+      metricService.incrementCounter(MetricConstants.DROP_DATABASE, e.getClass().getSimpleName());
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -146,19 +153,23 @@ public void onDropDatabase(DropDatabaseEvent event) throws MetaException {
   @Override
   public void onCreateTable(CreateTableEvent event) throws MetaException {
     if (!event.getStatus()) {
+      metricService.incrementCounter(MetricConstants.CREATE_TABLE, "ignored");
       return;
     }
     Table table = event.getTable();
     try {
       glueTableService.create(table);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+      metricService.incrementCounter(MetricConstants.CREATE_TABLE, "created");
     } catch (AlreadyExistsException e) {
       log.info(table + " table already exists in glue, updating....");
       glueTableService.update(table);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+      metricService.incrementCounter(MetricConstants.CREATE_TABLE, "updated");
     } catch (Exception e) {
       log.error("Failed create table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
+      metricService.incrementCounter(MetricConstants.CREATE_TABLE, e.getClass().getSimpleName());
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -168,20 +179,24 @@ public void onCreateTable(CreateTableEvent event) throws MetaException {
   @Override
   public void onDropTable(DropTableEvent event) throws MetaException {
     if (!event.getStatus()) {
+      metricService.incrementCounter(MetricConstants.DROP_TABLE, "ignored");
       return;
     }
     Table table = event.getTable();
     try {
       glueTableService.delete(table);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+      metricService.incrementCounter(MetricConstants.DROP_TABLE, "deleted");
     } catch (EntityNotFoundException e) {
       log.info(table + " table doesn't exist in glue catalog");
+      metricService.incrementCounter(MetricConstants.DROP_TABLE, "not_found");
       if (throwExceptions) {
         throw wrap(e);
       }
     } catch (Exception e) {
       log.error("Failed drop table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
+      metricService.incrementCounter(MetricConstants.DROP_TABLE, e.getClass().getSimpleName());
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -191,6 +206,7 @@ public void onDropTable(DropTableEvent event) throws MetaException {
   @Override
   public void onAlterTable(AlterTableEvent event) throws MetaException {
     if (!event.getStatus()) {
+      metricService.incrementCounter(MetricConstants.ALTER_TABLE, "ignored");
       return;
     }
     Table oldTable = event.getOldTable();
@@ -204,16 +220,19 @@ public void onAlterTable(AlterTableEvent event) throws MetaException {
       }
       glueTableService.update(newTable);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+      metricService.incrementCounter(MetricConstants.ALTER_TABLE, "updated");
     } catch (EntityNotFoundException e) {
       log.info(newTable + " table doesn't exist in glue, creating....");
       glueTableService.create(newTable);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+      metricService.incrementCounter(MetricConstants.ALTER_TABLE, "created");
       if (throwExceptions) {
         throw wrap(e);
       }
     } catch (Exception e) {
       log.error("Failed alter table {}.{} in glue", oldTable.getDbName(), oldTable.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
+      metricService.incrementCounter(MetricConstants.ALTER_TABLE, e.getClass().getSimpleName());
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -227,6 +246,7 @@ private void doRenameOperation(Table oldTable, Table newTable) {
     gluePartitionService.copyPartitions(newTable, gluePartitionService.getPartitions(oldTable));
     glueTableService.delete(oldTable);
     metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+    metricService.incrementCounter(MetricConstants.ALTER_TABLE, "renamed");
     long duration = System.currentTimeMillis() - startTime;
     log.info("{} glue table rename to {} finised in {}ms", oldTable.getTableName(), newTable.getTableName(), duration);
   }
@@ -238,6 +258,7 @@ private boolean isTableRename(Table oldTable, Table newTable) {
   @Override
   public void onAddPartition(AddPartitionEvent event) throws MetaException {
     if (!event.getStatus()) {
+      metricService.incrementCounter(MetricConstants.ADD_PARTITION, "ignored");
       return;
     }
     Table table = event.getTable();
@@ -247,12 +268,15 @@ public void onAddPartition(AddPartitionEvent event) throws MetaException {
       try {
         gluePartitionService.create(table, partition);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
+        metricService.incrementCounter(MetricConstants.ADD_PARTITION, "created");
       } catch (AlreadyExistsException e) {
         gluePartitionService.update(table, partition);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
+        metricService.incrementCounter(MetricConstants.ADD_PARTITION, "updated");
       } catch (Exception e) {
         log.error("Failed add partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
+        metricService.incrementCounter(MetricConstants.ADD_PARTITION, e.getClass().getSimpleName());
         if (throwExceptions) {
           throw wrap(e);
         }
@@ -263,6 +287,7 @@ public void onAddPartition(AddPartitionEvent event) throws MetaException {
   @Override
   public void onDropPartition(DropPartitionEvent event) throws MetaException {
     if (!event.getStatus()) {
+      metricService.incrementCounter(MetricConstants.DROP_PARTITION, "ignored");
       return;
     }
     Table table = event.getTable();
@@ -272,9 +297,11 @@ public void onDropPartition(DropPartitionEvent event) throws MetaException {
       try {
         gluePartitionService.delete(table, partition);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
+        metricService.incrementCounter(MetricConstants.DROP_PARTITION, "deleted");
       } catch (Exception e) {
         log.error("Failed drop partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
+        metricService.incrementCounter(MetricConstants.DROP_PARTITION, e.getClass().getSimpleName());
         if (throwExceptions) {
           throw wrap(e);
         }
@@ -285,6 +312,7 @@ public void onDropPartition(DropPartitionEvent event) throws MetaException {
   @Override
   public void onAlterPartition(AlterPartitionEvent event) throws MetaException {
     if (!event.getStatus()) {
+      metricService.incrementCounter(MetricConstants.ALTER_PARTITION, "ignored");
       return;
     }
     Table table = event.getTable();
@@ -292,15 +320,18 @@ public void onAlterPartition(AlterPartitionEvent event) throws MetaException {
     try {
       gluePartitionService.update(table, partition);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
+      metricService.incrementCounter(MetricConstants.ALTER_PARTITION, "updated");
     } catch (EntityNotFoundException e) {
       gluePartitionService.create(table, partition);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
+      metricService.incrementCounter(MetricConstants.ALTER_PARTITION, "created");
       if (throwExceptions) {
         throw wrap(e);
       }
     } catch (Exception e) {
       log.error("Failed alter partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
+      metricService.incrementCounter(MetricConstants.ALTER_PARTITION, e.getClass().getSimpleName());
       if (throwExceptions) {
         throw wrap(e);
       }
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java
index ed6e0575..3e018f14 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2025 Expedia, Inc.
+ * Copyright (C) 2018-2026 Expedia, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,15 @@ public class MetricConstants {
   public static final String LISTENER_PARTITION_FAILURE = "glue_listener_partition_failure";
   public static final String LISTENER_PARTITION_SUCCESS = "glue_listener_partition_success";
 
+  public static final String CREATE_DATABASE = "glue_listener_create_database";
+  public static final String DROP_DATABASE = "glue_listener_drop_database";
+  public static final String CREATE_TABLE = "glue_listener_create_table";
+  public static final String DROP_TABLE = "glue_listener_drop_table";
+  public static final String ALTER_TABLE = "glue_listener_alter_table";
+  public static final String ADD_PARTITION = "glue_listener_add_partition";
+  public static final String DROP_PARTITION = "glue_listener_drop_partition";
+  public static final String ALTER_PARTITION = "glue_listener_alter_partition";
+
   public static final List<String> LISTENER_METRICS = Arrays.asList(
       LISTENER_DATABASE_FAILURE,
       LISTENER_DATABASE_SUCCESS,
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
index b332194d..e3112f61 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
@@ -64,4 +64,12 @@ public void incrementCounter(String name) {
       log.warn("Unable to increment counter {}", name, e);
     }
   }
+
+  public void incrementCounter(String name, String outcome) {
+    try {
+      Counter.builder(name).tag("outcome", outcome).register(Metrics.globalRegistry).increment();
+    } catch (Exception e) {
+      log.warn("Unable to increment counter {} with outcome {}", name, outcome, e);
+    }
+  }
 }
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
index aca9cc66..2dabd090 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
@@ -155,6 +155,7 @@ public void onCreateDatabase() throws MetaException {
 
     verify(glueClient).createDatabase(createDatabaseRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.CREATE_DATABASE, "created");
     CreateDatabaseRequest createDatabaseRequest = createDatabaseRequestCaptor.getValue();
 
     assertThat(createDatabaseRequest.getDatabaseInput().getName(), is(gluePrefix + dbName));
@@ -175,6 +176,7 @@ public void onCreateDatabaseThatAlreadyExists() throws MetaException {
     verify(glueClient).createDatabase(createDatabaseRequestCaptor.capture());
     verify(glueClient).updateDatabase(updateDatabaseRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.CREATE_DATABASE, "updated");
     UpdateDatabaseRequest updateDatabaseRequest = updateDatabaseRequestCaptor.getValue();
 
     assertThat(updateDatabaseRequest.getName(), is(gluePrefix + dbName));
@@ -195,6 +197,7 @@ public void onDropDatabase() throws MetaException {
 
     verify(glueClient).deleteDatabase(deleteDatabaseRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.DROP_DATABASE, "deleted");
     DeleteDatabaseRequest deleteDatabaseRequest = deleteDatabaseRequestCaptor.getValue();
     assertThat(deleteDatabaseRequest.getName(), is(gluePrefix + dbName));
   }
@@ -212,6 +215,7 @@ public void onDropDatabaseThatDoesntExist() throws MetaException {
 
     verify(glueClient).getDatabase(any());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.DROP_DATABASE, "deleted");
     verify(glueClient).deleteDatabase(deleteDatabaseRequestCaptor.capture());
   }
 
@@ -227,6 +231,7 @@ public void onDropDatabaseNotCreatedByGlueSync() throws MetaException {
 
     verify(glueClient).getDatabase(any());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.DROP_DATABASE, "deleted");
     verifyNoMoreInteractions(glueClient);
   }
 
@@ -242,6 +247,7 @@ public void onCreateHiveTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.CREATE_TABLE, "created");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -269,6 +275,7 @@ public void onCreateHiveTable_withIncorrectFormat() throws MetaException {
 
     verify(glueClient, times(2)).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.CREATE_TABLE, "created");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -288,6 +295,7 @@ public void onCreateIcebergTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.CREATE_TABLE, "created");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -314,6 +322,7 @@ public void onCreateHiveView() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.CREATE_TABLE, "created");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -339,6 +348,7 @@ public void onAlterHiveTable() throws MetaException {
 
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.ALTER_TABLE, "updated");
     UpdateTableRequest updateTableRequest = updateTableRequestCaptor.getValue();
 
     assertThat(updateTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -366,6 +376,7 @@ public void onAlterHiveTableSkipArchiveOverride() throws MetaException {
 
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.ALTER_TABLE, "updated");
     UpdateTableRequest updateTableRequest = updateTableRequestCaptor.getValue();
 
     assertThat(updateTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -465,6 +476,7 @@ public void onAlterHiveTable_RenameTable() throws MetaException {
     BatchCreatePartitionRequest batchCreatePartitionRequest = batchCreatePartitionRequestCaptor.getValue();
     verify(glueClient).deleteTable(deleteTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.ALTER_TABLE, "renamed");
     DeleteTableRequest deleteTableRequest = deleteTableRequestCaptor.getValue();
 
     // test create new table
@@ -495,6 +507,7 @@ public void onCreateUnpartitionedHiveTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.CREATE_TABLE, "created");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -529,6 +542,7 @@ public void onAddPartition_withIncorrectFormat() throws MetaException {
 
     verify(glueClient, times(2)).createPartition(createPartitionRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
+    verify(metricService).incrementCounter(MetricConstants.ADD_PARTITION, "created");
     CreatePartitionRequest createTableRequest = createPartitionRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));

From 71f8cb859ee41d1675e3b43f5775df15b0547036 Mon Sep 17 00:00:00 2001
From: James Faulkner <jfaulkner@expediagroup.com>
Date: Mon, 8 Jun 2026 11:07:28 +0100
Subject: [PATCH 04/29] refactor: redesign gluesync tagged metrics to single
 counter with Tag varargs

Replaces the per-operation metric names with a single glue_listener_event
counter, tagged with operation, result (success/failure/ignored), and outcome
(created/updated/deleted/renamed/not_found, or exception class name).
MetricService.incrementCounter now accepts Tag... for caller-controlled
tagging. Tag keys and result values are centralised as constants in
MetricConstants.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../gluesync/listener/ApiaryGlueSync.java     | 64 ++++++++++---------
 .../listener/metrics/MetricConstants.java     | 26 +++++---
 .../listener/metrics/MetricService.java       |  8 ++-
 .../gluesync/listener/ApiaryGlueSyncTest.java | 30 +++++----
 4 files changed, 72 insertions(+), 56 deletions(-)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
index a57e1070..5e2724b1 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
@@ -36,6 +36,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.micrometer.core.instrument.Tag;
+
 import com.amazonaws.services.glue.AWSGlue;
 import com.amazonaws.services.glue.AWSGlueClientBuilder;
 import com.amazonaws.services.glue.model.AlreadyExistsException;
@@ -106,23 +108,23 @@ public ApiaryGlueSync(Configuration config, AWSGlue glueClient, String gluePrefi
   @Override
   public void onCreateDatabase(CreateDatabaseEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.CREATE_DATABASE, "ignored");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
       return;
     }
     Database database = event.getDatabase();
     try {
       glueDatabaseService.create(database);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.CREATE_DATABASE, "created");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
     } catch (AlreadyExistsException e) {
       log.info(database + " database already exists in glue, updating....");
       glueDatabaseService.update(database);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.CREATE_DATABASE, "updated");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
     } catch (Exception e) {
       log.error("Failed create database {} in glue", database.getName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_FAILURE);
-      metricService.incrementCounter(MetricConstants.CREATE_DATABASE, e.getClass().getSimpleName());
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -132,18 +134,18 @@ public void onCreateDatabase(CreateDatabaseEvent event) throws MetaException {
   @Override
   public void onDropDatabase(DropDatabaseEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.DROP_DATABASE, "ignored");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
       return;
     }
     Database database = event.getDatabase();
     try {
       glueDatabaseService.delete(database);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.DROP_DATABASE, "deleted");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "deleted"));
     } catch (Exception e) {
       log.error("Failed drop database {} in glue", database.getName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_FAILURE);
-      metricService.incrementCounter(MetricConstants.DROP_DATABASE, e.getClass().getSimpleName());
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -153,23 +155,23 @@ public void onDropDatabase(DropDatabaseEvent event) throws MetaException {
   @Override
   public void onCreateTable(CreateTableEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.CREATE_TABLE, "ignored");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
       return;
     }
     Table table = event.getTable();
     try {
       glueTableService.create(table);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.CREATE_TABLE, "created");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
     } catch (AlreadyExistsException e) {
       log.info(table + " table already exists in glue, updating....");
       glueTableService.update(table);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.CREATE_TABLE, "updated");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
     } catch (Exception e) {
       log.error("Failed create table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
-      metricService.incrementCounter(MetricConstants.CREATE_TABLE, e.getClass().getSimpleName());
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -179,24 +181,24 @@ public void onCreateTable(CreateTableEvent event) throws MetaException {
   @Override
   public void onDropTable(DropTableEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.DROP_TABLE, "ignored");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
       return;
     }
     Table table = event.getTable();
     try {
       glueTableService.delete(table);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.DROP_TABLE, "deleted");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "deleted"));
     } catch (EntityNotFoundException e) {
       log.info(table + " table doesn't exist in glue catalog");
-      metricService.incrementCounter(MetricConstants.DROP_TABLE, "not_found");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "not_found"));
       if (throwExceptions) {
         throw wrap(e);
       }
     } catch (Exception e) {
       log.error("Failed drop table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
-      metricService.incrementCounter(MetricConstants.DROP_TABLE, e.getClass().getSimpleName());
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -206,7 +208,7 @@ public void onDropTable(DropTableEvent event) throws MetaException {
   @Override
   public void onAlterTable(AlterTableEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.ALTER_TABLE, "ignored");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
       return;
     }
     Table oldTable = event.getOldTable();
@@ -220,19 +222,19 @@ public void onAlterTable(AlterTableEvent event) throws MetaException {
       }
       glueTableService.update(newTable);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.ALTER_TABLE, "updated");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
     } catch (EntityNotFoundException e) {
       log.info(newTable + " table doesn't exist in glue, creating....");
       glueTableService.create(newTable);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.ALTER_TABLE, "created");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
       if (throwExceptions) {
         throw wrap(e);
       }
     } catch (Exception e) {
       log.error("Failed alter table {}.{} in glue", oldTable.getDbName(), oldTable.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
-      metricService.incrementCounter(MetricConstants.ALTER_TABLE, e.getClass().getSimpleName());
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -246,7 +248,7 @@ private void doRenameOperation(Table oldTable, Table newTable) {
     gluePartitionService.copyPartitions(newTable, gluePartitionService.getPartitions(oldTable));
     glueTableService.delete(oldTable);
     metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    metricService.incrementCounter(MetricConstants.ALTER_TABLE, "renamed");
+    metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "renamed"));
     long duration = System.currentTimeMillis() - startTime;
     log.info("{} glue table rename to {} finised in {}ms", oldTable.getTableName(), newTable.getTableName(), duration);
   }
@@ -258,7 +260,7 @@ private boolean isTableRename(Table oldTable, Table newTable) {
   @Override
   public void onAddPartition(AddPartitionEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.ADD_PARTITION, "ignored");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ADD_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
       return;
     }
     Table table = event.getTable();
@@ -268,15 +270,15 @@ public void onAddPartition(AddPartitionEvent event) throws MetaException {
       try {
         gluePartitionService.create(table, partition);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-        metricService.incrementCounter(MetricConstants.ADD_PARTITION, "created");
+        metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ADD_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
       } catch (AlreadyExistsException e) {
         gluePartitionService.update(table, partition);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-        metricService.incrementCounter(MetricConstants.ADD_PARTITION, "updated");
+        metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ADD_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
       } catch (Exception e) {
         log.error("Failed add partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
-        metricService.incrementCounter(MetricConstants.ADD_PARTITION, e.getClass().getSimpleName());
+        metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ADD_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
         if (throwExceptions) {
           throw wrap(e);
         }
@@ -287,7 +289,7 @@ public void onAddPartition(AddPartitionEvent event) throws MetaException {
   @Override
   public void onDropPartition(DropPartitionEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.DROP_PARTITION, "ignored");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
       return;
     }
     Table table = event.getTable();
@@ -297,11 +299,11 @@ public void onDropPartition(DropPartitionEvent event) throws MetaException {
       try {
         gluePartitionService.delete(table, partition);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-        metricService.incrementCounter(MetricConstants.DROP_PARTITION, "deleted");
+        metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "deleted"));
       } catch (Exception e) {
         log.error("Failed drop partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
-        metricService.incrementCounter(MetricConstants.DROP_PARTITION, e.getClass().getSimpleName());
+        metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
         if (throwExceptions) {
           throw wrap(e);
         }
@@ -312,7 +314,7 @@ public void onDropPartition(DropPartitionEvent event) throws MetaException {
   @Override
   public void onAlterPartition(AlterPartitionEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.ALTER_PARTITION, "ignored");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
       return;
     }
     Table table = event.getTable();
@@ -320,18 +322,18 @@ public void onAlterPartition(AlterPartitionEvent event) throws MetaException {
     try {
       gluePartitionService.update(table, partition);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-      metricService.incrementCounter(MetricConstants.ALTER_PARTITION, "updated");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
     } catch (EntityNotFoundException e) {
       gluePartitionService.create(table, partition);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-      metricService.incrementCounter(MetricConstants.ALTER_PARTITION, "created");
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
       if (throwExceptions) {
         throw wrap(e);
       }
     } catch (Exception e) {
       log.error("Failed alter partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
-      metricService.incrementCounter(MetricConstants.ALTER_PARTITION, e.getClass().getSimpleName());
+      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
       if (throwExceptions) {
         throw wrap(e);
       }
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java
index 3e018f14..8d391566 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java
@@ -27,14 +27,24 @@ public class MetricConstants {
   public static final String LISTENER_PARTITION_FAILURE = "glue_listener_partition_failure";
   public static final String LISTENER_PARTITION_SUCCESS = "glue_listener_partition_success";
 
-  public static final String CREATE_DATABASE = "glue_listener_create_database";
-  public static final String DROP_DATABASE = "glue_listener_drop_database";
-  public static final String CREATE_TABLE = "glue_listener_create_table";
-  public static final String DROP_TABLE = "glue_listener_drop_table";
-  public static final String ALTER_TABLE = "glue_listener_alter_table";
-  public static final String ADD_PARTITION = "glue_listener_add_partition";
-  public static final String DROP_PARTITION = "glue_listener_drop_partition";
-  public static final String ALTER_PARTITION = "glue_listener_alter_partition";
+  public static final String LISTENER_EVENT = "glue_listener_event";
+
+  public static final String TAG_OPERATION = "operation";
+  public static final String TAG_RESULT    = "result";
+  public static final String TAG_OUTCOME   = "outcome";
+
+  public static final String RESULT_SUCCESS = "success";
+  public static final String RESULT_FAILURE = "failure";
+  public static final String RESULT_IGNORED = "ignored";
+
+  public static final String CREATE_DATABASE = "create_database";
+  public static final String DROP_DATABASE   = "drop_database";
+  public static final String CREATE_TABLE    = "create_table";
+  public static final String DROP_TABLE      = "drop_table";
+  public static final String ALTER_TABLE     = "alter_table";
+  public static final String ADD_PARTITION   = "add_partition";
+  public static final String DROP_PARTITION  = "drop_partition";
+  public static final String ALTER_PARTITION = "alter_partition";
 
   public static final List<String> LISTENER_METRICS = Arrays.asList(
       LISTENER_DATABASE_FAILURE,
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
index e3112f61..93e0a46a 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
@@ -15,6 +15,7 @@
  */
 package com.expediagroup.apiary.extensions.gluesync.listener.metrics;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -25,6 +26,7 @@
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Tag;
 import io.micrometer.jmx.JmxConfig;
 import io.micrometer.jmx.JmxMeterRegistry;
 
@@ -65,11 +67,11 @@ public void incrementCounter(String name) {
     }
   }
 
-  public void incrementCounter(String name, String outcome) {
+  public void incrementCounter(String name, Tag... tags) {
     try {
-      Counter.builder(name).tag("outcome", outcome).register(Metrics.globalRegistry).increment();
+      Counter.builder(name).tags(Arrays.asList(tags)).register(Metrics.globalRegistry).increment();
     } catch (Exception e) {
-      log.warn("Unable to increment counter {} with outcome {}", name, outcome, e);
+      log.warn("Unable to increment counter {} with tags {}", name, Arrays.toString(tags), e);
     }
   }
 }
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
index 2dabd090..f185cf7f 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
@@ -70,6 +70,8 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import io.micrometer.core.instrument.Tag;
+
 import com.amazonaws.services.glue.AWSGlue;
 import com.amazonaws.services.glue.model.AlreadyExistsException;
 import com.amazonaws.services.glue.model.BatchCreatePartitionRequest;
@@ -155,7 +157,7 @@ public void onCreateDatabase() throws MetaException {
 
     verify(glueClient).createDatabase(createDatabaseRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.CREATE_DATABASE, "created");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
     CreateDatabaseRequest createDatabaseRequest = createDatabaseRequestCaptor.getValue();
 
     assertThat(createDatabaseRequest.getDatabaseInput().getName(), is(gluePrefix + dbName));
@@ -176,7 +178,7 @@ public void onCreateDatabaseThatAlreadyExists() throws MetaException {
     verify(glueClient).createDatabase(createDatabaseRequestCaptor.capture());
     verify(glueClient).updateDatabase(updateDatabaseRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.CREATE_DATABASE, "updated");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
     UpdateDatabaseRequest updateDatabaseRequest = updateDatabaseRequestCaptor.getValue();
 
     assertThat(updateDatabaseRequest.getName(), is(gluePrefix + dbName));
@@ -197,7 +199,7 @@ public void onDropDatabase() throws MetaException {
 
     verify(glueClient).deleteDatabase(deleteDatabaseRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.DROP_DATABASE, "deleted");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "deleted"));
     DeleteDatabaseRequest deleteDatabaseRequest = deleteDatabaseRequestCaptor.getValue();
     assertThat(deleteDatabaseRequest.getName(), is(gluePrefix + dbName));
   }
@@ -215,7 +217,7 @@ public void onDropDatabaseThatDoesntExist() throws MetaException {
 
     verify(glueClient).getDatabase(any());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.DROP_DATABASE, "deleted");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "deleted"));
     verify(glueClient).deleteDatabase(deleteDatabaseRequestCaptor.capture());
   }
 
@@ -231,7 +233,7 @@ public void onDropDatabaseNotCreatedByGlueSync() throws MetaException {
 
     verify(glueClient).getDatabase(any());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.DROP_DATABASE, "deleted");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "deleted"));
     verifyNoMoreInteractions(glueClient);
   }
 
@@ -247,7 +249,7 @@ public void onCreateHiveTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.CREATE_TABLE, "created");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -275,7 +277,7 @@ public void onCreateHiveTable_withIncorrectFormat() throws MetaException {
 
     verify(glueClient, times(2)).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.CREATE_TABLE, "created");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -295,7 +297,7 @@ public void onCreateIcebergTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.CREATE_TABLE, "created");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -322,7 +324,7 @@ public void onCreateHiveView() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.CREATE_TABLE, "created");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -348,7 +350,7 @@ public void onAlterHiveTable() throws MetaException {
 
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.ALTER_TABLE, "updated");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
     UpdateTableRequest updateTableRequest = updateTableRequestCaptor.getValue();
 
     assertThat(updateTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -376,7 +378,7 @@ public void onAlterHiveTableSkipArchiveOverride() throws MetaException {
 
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.ALTER_TABLE, "updated");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
     UpdateTableRequest updateTableRequest = updateTableRequestCaptor.getValue();
 
     assertThat(updateTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -476,7 +478,7 @@ public void onAlterHiveTable_RenameTable() throws MetaException {
     BatchCreatePartitionRequest batchCreatePartitionRequest = batchCreatePartitionRequestCaptor.getValue();
     verify(glueClient).deleteTable(deleteTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.ALTER_TABLE, "renamed");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "renamed"));
     DeleteTableRequest deleteTableRequest = deleteTableRequestCaptor.getValue();
 
     // test create new table
@@ -507,7 +509,7 @@ public void onCreateUnpartitionedHiveTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.CREATE_TABLE, "created");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -542,7 +544,7 @@ public void onAddPartition_withIncorrectFormat() throws MetaException {
 
     verify(glueClient, times(2)).createPartition(createPartitionRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.ADD_PARTITION, "created");
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ADD_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
     CreatePartitionRequest createTableRequest = createPartitionRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));

From 5f34706a36ac9e1014020041979ce2d4e9310e84 Mon Sep 17 00:00:00 2001
From: James Faulkner <jfaulkner@expediagroup.com>
Date: Mon, 8 Jun 2026 12:18:22 +0100
Subject: [PATCH 05/29] refactor: replace Tag.of chains with
 MetricService.recordEvent

Introduces recordEvent(operation, result, outcome) on MetricService,
encapsulating the LISTENER_EVENT metric name and tag key construction.
Removes incrementCounter(String, Tag...) and the Tag import from
ApiaryGlueSync. Each outcome path is now a single readable line instead
of a 200-char Tag.of chain.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../gluesync/listener/ApiaryGlueSync.java     | 64 +++++++++----------
 .../listener/metrics/MetricService.java       | 13 ++--
 .../gluesync/listener/ApiaryGlueSyncTest.java | 30 ++++-----
 3 files changed, 53 insertions(+), 54 deletions(-)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
index 5e2724b1..c2d8d426 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
@@ -36,8 +36,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.micrometer.core.instrument.Tag;
-
 import com.amazonaws.services.glue.AWSGlue;
 import com.amazonaws.services.glue.AWSGlueClientBuilder;
 import com.amazonaws.services.glue.model.AlreadyExistsException;
@@ -108,23 +106,23 @@ public ApiaryGlueSync(Configuration config, AWSGlue glueClient, String gluePrefi
   @Override
   public void onCreateDatabase(CreateDatabaseEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
+      metricService.recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_IGNORED, "ignored");
       return;
     }
     Database database = event.getDatabase();
     try {
       glueDatabaseService.create(database);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
+      metricService.recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, "created");
     } catch (AlreadyExistsException e) {
       log.info(database + " database already exists in glue, updating....");
       glueDatabaseService.update(database);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
+      metricService.recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, "updated");
     } catch (Exception e) {
       log.error("Failed create database {} in glue", database.getName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_FAILURE);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
+      metricService.recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -134,18 +132,18 @@ public void onCreateDatabase(CreateDatabaseEvent event) throws MetaException {
   @Override
   public void onDropDatabase(DropDatabaseEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
+      metricService.recordEvent(MetricConstants.DROP_DATABASE, MetricConstants.RESULT_IGNORED, "ignored");
       return;
     }
     Database database = event.getDatabase();
     try {
       glueDatabaseService.delete(database);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "deleted"));
+      metricService.recordEvent(MetricConstants.DROP_DATABASE, MetricConstants.RESULT_SUCCESS, "deleted");
     } catch (Exception e) {
       log.error("Failed drop database {} in glue", database.getName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_FAILURE);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
+      metricService.recordEvent(MetricConstants.DROP_DATABASE, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -155,23 +153,23 @@ public void onDropDatabase(DropDatabaseEvent event) throws MetaException {
   @Override
   public void onCreateTable(CreateTableEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
+      metricService.recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_IGNORED, "ignored");
       return;
     }
     Table table = event.getTable();
     try {
       glueTableService.create(table);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
+      metricService.recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "created");
     } catch (AlreadyExistsException e) {
       log.info(table + " table already exists in glue, updating....");
       glueTableService.update(table);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
+      metricService.recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "updated");
     } catch (Exception e) {
       log.error("Failed create table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
+      metricService.recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -181,24 +179,24 @@ public void onCreateTable(CreateTableEvent event) throws MetaException {
   @Override
   public void onDropTable(DropTableEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
+      metricService.recordEvent(MetricConstants.DROP_TABLE, MetricConstants.RESULT_IGNORED, "ignored");
       return;
     }
     Table table = event.getTable();
     try {
       glueTableService.delete(table);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "deleted"));
+      metricService.recordEvent(MetricConstants.DROP_TABLE, MetricConstants.RESULT_SUCCESS, "deleted");
     } catch (EntityNotFoundException e) {
       log.info(table + " table doesn't exist in glue catalog");
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "not_found"));
+      metricService.recordEvent(MetricConstants.DROP_TABLE, MetricConstants.RESULT_SUCCESS, "not_found");
       if (throwExceptions) {
         throw wrap(e);
       }
     } catch (Exception e) {
       log.error("Failed drop table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
+      metricService.recordEvent(MetricConstants.DROP_TABLE, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -208,7 +206,7 @@ public void onDropTable(DropTableEvent event) throws MetaException {
   @Override
   public void onAlterTable(AlterTableEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
+      metricService.recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_IGNORED, "ignored");
       return;
     }
     Table oldTable = event.getOldTable();
@@ -222,19 +220,19 @@ public void onAlterTable(AlterTableEvent event) throws MetaException {
       }
       glueTableService.update(newTable);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
+      metricService.recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "updated");
     } catch (EntityNotFoundException e) {
       log.info(newTable + " table doesn't exist in glue, creating....");
       glueTableService.create(newTable);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
+      metricService.recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "created");
       if (throwExceptions) {
         throw wrap(e);
       }
     } catch (Exception e) {
       log.error("Failed alter table {}.{} in glue", oldTable.getDbName(), oldTable.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
+      metricService.recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -248,7 +246,7 @@ private void doRenameOperation(Table oldTable, Table newTable) {
     gluePartitionService.copyPartitions(newTable, gluePartitionService.getPartitions(oldTable));
     glueTableService.delete(oldTable);
     metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "renamed"));
+    metricService.recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "renamed");
     long duration = System.currentTimeMillis() - startTime;
     log.info("{} glue table rename to {} finised in {}ms", oldTable.getTableName(), newTable.getTableName(), duration);
   }
@@ -260,7 +258,7 @@ private boolean isTableRename(Table oldTable, Table newTable) {
   @Override
   public void onAddPartition(AddPartitionEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ADD_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
+      metricService.recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_IGNORED, "ignored");
       return;
     }
     Table table = event.getTable();
@@ -270,15 +268,15 @@ public void onAddPartition(AddPartitionEvent event) throws MetaException {
       try {
         gluePartitionService.create(table, partition);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-        metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ADD_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
+        metricService.recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, "created");
       } catch (AlreadyExistsException e) {
         gluePartitionService.update(table, partition);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-        metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ADD_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
+        metricService.recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, "updated");
       } catch (Exception e) {
         log.error("Failed add partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
-        metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ADD_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
+        metricService.recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
         if (throwExceptions) {
           throw wrap(e);
         }
@@ -289,7 +287,7 @@ public void onAddPartition(AddPartitionEvent event) throws MetaException {
   @Override
   public void onDropPartition(DropPartitionEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
+      metricService.recordEvent(MetricConstants.DROP_PARTITION, MetricConstants.RESULT_IGNORED, "ignored");
       return;
     }
     Table table = event.getTable();
@@ -299,11 +297,11 @@ public void onDropPartition(DropPartitionEvent event) throws MetaException {
       try {
         gluePartitionService.delete(table, partition);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-        metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "deleted"));
+        metricService.recordEvent(MetricConstants.DROP_PARTITION, MetricConstants.RESULT_SUCCESS, "deleted");
       } catch (Exception e) {
         log.error("Failed drop partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
-        metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
+        metricService.recordEvent(MetricConstants.DROP_PARTITION, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
         if (throwExceptions) {
           throw wrap(e);
         }
@@ -314,7 +312,7 @@ public void onDropPartition(DropPartitionEvent event) throws MetaException {
   @Override
   public void onAlterPartition(AlterPartitionEvent event) throws MetaException {
     if (!event.getStatus()) {
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_IGNORED), Tag.of(MetricConstants.TAG_OUTCOME, "ignored"));
+      metricService.recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_IGNORED, "ignored");
       return;
     }
     Table table = event.getTable();
@@ -322,18 +320,18 @@ public void onAlterPartition(AlterPartitionEvent event) throws MetaException {
     try {
       gluePartitionService.update(table, partition);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
+      metricService.recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_SUCCESS, "updated");
     } catch (EntityNotFoundException e) {
       gluePartitionService.create(table, partition);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
+      metricService.recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_SUCCESS, "created");
       if (throwExceptions) {
         throw wrap(e);
       }
     } catch (Exception e) {
       log.error("Failed alter partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
-      metricService.incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_FAILURE), Tag.of(MetricConstants.TAG_OUTCOME, e.getClass().getSimpleName()));
+      metricService.recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
       if (throwExceptions) {
         throw wrap(e);
       }
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
index 93e0a46a..a524d41b 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
@@ -15,7 +15,6 @@
  */
 package com.expediagroup.apiary.extensions.gluesync.listener.metrics;
 
-import java.util.Arrays;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -26,7 +25,6 @@
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Metrics;
-import io.micrometer.core.instrument.Tag;
 import io.micrometer.jmx.JmxConfig;
 import io.micrometer.jmx.JmxMeterRegistry;
 
@@ -67,11 +65,16 @@ public void incrementCounter(String name) {
     }
   }
 
-  public void incrementCounter(String name, Tag... tags) {
+  public void recordEvent(String operation, String result, String outcome) {
     try {
-      Counter.builder(name).tags(Arrays.asList(tags)).register(Metrics.globalRegistry).increment();
+      Counter.builder(MetricConstants.LISTENER_EVENT)
+          .tags(MetricConstants.TAG_OPERATION, operation,
+              MetricConstants.TAG_RESULT, result,
+              MetricConstants.TAG_OUTCOME, outcome)
+          .register(Metrics.globalRegistry)
+          .increment();
     } catch (Exception e) {
-      log.warn("Unable to increment counter {} with tags {}", name, Arrays.toString(tags), e);
+      log.warn("Unable to record event {} {} {}", operation, result, outcome, e);
     }
   }
 }
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
index f185cf7f..ad48f3b1 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
@@ -70,8 +70,6 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import io.micrometer.core.instrument.Tag;
-
 import com.amazonaws.services.glue.AWSGlue;
 import com.amazonaws.services.glue.model.AlreadyExistsException;
 import com.amazonaws.services.glue.model.BatchCreatePartitionRequest;
@@ -157,7 +155,7 @@ public void onCreateDatabase() throws MetaException {
 
     verify(glueClient).createDatabase(createDatabaseRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
+    verify(metricService).recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, "created");
     CreateDatabaseRequest createDatabaseRequest = createDatabaseRequestCaptor.getValue();
 
     assertThat(createDatabaseRequest.getDatabaseInput().getName(), is(gluePrefix + dbName));
@@ -178,7 +176,7 @@ public void onCreateDatabaseThatAlreadyExists() throws MetaException {
     verify(glueClient).createDatabase(createDatabaseRequestCaptor.capture());
     verify(glueClient).updateDatabase(updateDatabaseRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
+    verify(metricService).recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, "updated");
     UpdateDatabaseRequest updateDatabaseRequest = updateDatabaseRequestCaptor.getValue();
 
     assertThat(updateDatabaseRequest.getName(), is(gluePrefix + dbName));
@@ -199,7 +197,7 @@ public void onDropDatabase() throws MetaException {
 
     verify(glueClient).deleteDatabase(deleteDatabaseRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "deleted"));
+    verify(metricService).recordEvent(MetricConstants.DROP_DATABASE, MetricConstants.RESULT_SUCCESS, "deleted");
     DeleteDatabaseRequest deleteDatabaseRequest = deleteDatabaseRequestCaptor.getValue();
     assertThat(deleteDatabaseRequest.getName(), is(gluePrefix + dbName));
   }
@@ -217,7 +215,7 @@ public void onDropDatabaseThatDoesntExist() throws MetaException {
 
     verify(glueClient).getDatabase(any());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "deleted"));
+    verify(metricService).recordEvent(MetricConstants.DROP_DATABASE, MetricConstants.RESULT_SUCCESS, "deleted");
     verify(glueClient).deleteDatabase(deleteDatabaseRequestCaptor.capture());
   }
 
@@ -233,7 +231,7 @@ public void onDropDatabaseNotCreatedByGlueSync() throws MetaException {
 
     verify(glueClient).getDatabase(any());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.DROP_DATABASE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "deleted"));
+    verify(metricService).recordEvent(MetricConstants.DROP_DATABASE, MetricConstants.RESULT_SUCCESS, "deleted");
     verifyNoMoreInteractions(glueClient);
   }
 
@@ -249,7 +247,7 @@ public void onCreateHiveTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "created");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -277,7 +275,7 @@ public void onCreateHiveTable_withIncorrectFormat() throws MetaException {
 
     verify(glueClient, times(2)).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "created");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -297,7 +295,7 @@ public void onCreateIcebergTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "created");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -324,7 +322,7 @@ public void onCreateHiveView() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "created");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -350,7 +348,7 @@ public void onAlterHiveTable() throws MetaException {
 
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
+    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "updated");
     UpdateTableRequest updateTableRequest = updateTableRequestCaptor.getValue();
 
     assertThat(updateTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -378,7 +376,7 @@ public void onAlterHiveTableSkipArchiveOverride() throws MetaException {
 
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "updated"));
+    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "updated");
     UpdateTableRequest updateTableRequest = updateTableRequestCaptor.getValue();
 
     assertThat(updateTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -478,7 +476,7 @@ public void onAlterHiveTable_RenameTable() throws MetaException {
     BatchCreatePartitionRequest batchCreatePartitionRequest = batchCreatePartitionRequestCaptor.getValue();
     verify(glueClient).deleteTable(deleteTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ALTER_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "renamed"));
+    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "renamed");
     DeleteTableRequest deleteTableRequest = deleteTableRequestCaptor.getValue();
 
     // test create new table
@@ -509,7 +507,7 @@ public void onCreateUnpartitionedHiveTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.CREATE_TABLE), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "created");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -544,7 +542,7 @@ public void onAddPartition_withIncorrectFormat() throws MetaException {
 
     verify(glueClient, times(2)).createPartition(createPartitionRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-    verify(metricService).incrementCounter(MetricConstants.LISTENER_EVENT, Tag.of(MetricConstants.TAG_OPERATION, MetricConstants.ADD_PARTITION), Tag.of(MetricConstants.TAG_RESULT, MetricConstants.RESULT_SUCCESS), Tag.of(MetricConstants.TAG_OUTCOME, "created"));
+    verify(metricService).recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, "created");
     CreatePartitionRequest createTableRequest = createPartitionRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));

From 99a6c64289c1e9a81958a97bea731a2d2cae5616 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Wed, 10 Jun 2026 17:22:07 +0100
Subject: [PATCH 06/29] fix: fill observability gaps in ApiaryGlueSync

- Record rename duration as a Micrometer Timer
  (glue_listener_table_rename_duration) so latency is visible in
  metrics, not just logged
- Handle EntityNotFoundException in onDropPartition as a success
  (not_found outcome) matching the existing onDropTable pattern, so
  idempotent deletes no longer increment the failure counter
- Store the MeterRegistry as a field in MetricService so recordEvent
  and recordDuration both use the injected registry consistently

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../gluesync/listener/ApiaryGlueSync.java     |  9 +++++++-
 .../listener/metrics/MetricConstants.java     |  1 +
 .../listener/metrics/MetricService.java       | 16 +++++++++++++-
 .../listener/service/GlueTableService.java    |  2 +-
 .../gluesync/listener/ApiaryGlueSyncTest.java | 21 +++++++++++++++++++
 .../listener/metrics/MetricServiceTest.java   | 12 +++++++++++
 6 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
index c2d8d426..6b9ae69e 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
@@ -248,7 +248,8 @@ private void doRenameOperation(Table oldTable, Table newTable) {
     metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
     metricService.recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "renamed");
     long duration = System.currentTimeMillis() - startTime;
-    log.info("{} glue table rename to {} finised in {}ms", oldTable.getTableName(), newTable.getTableName(), duration);
+    metricService.recordDuration(MetricConstants.LISTENER_TABLE_RENAME_DURATION, duration);
+    log.info("{} glue table rename to {} finished in {}ms", oldTable.getTableName(), newTable.getTableName(), duration);
   }
 
   private boolean isTableRename(Table oldTable, Table newTable) {
@@ -298,6 +299,12 @@ public void onDropPartition(DropPartitionEvent event) throws MetaException {
         gluePartitionService.delete(table, partition);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
         metricService.recordEvent(MetricConstants.DROP_PARTITION, MetricConstants.RESULT_SUCCESS, "deleted");
+      } catch (EntityNotFoundException e) {
+        log.info("{} partition doesn't exist in glue catalog", partition);
+        metricService.recordEvent(MetricConstants.DROP_PARTITION, MetricConstants.RESULT_SUCCESS, "not_found");
+        if (throwExceptions) {
+          throw wrap(e);
+        }
       } catch (Exception e) {
         log.error("Failed drop partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java
index 8d391566..bc1680fa 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java
@@ -28,6 +28,7 @@ public class MetricConstants {
   public static final String LISTENER_PARTITION_SUCCESS = "glue_listener_partition_success";
 
   public static final String LISTENER_EVENT = "glue_listener_event";
+  public static final String LISTENER_TABLE_RENAME_DURATION = "glue_listener_table_rename_duration";
 
   public static final String TAG_OPERATION = "operation";
   public static final String TAG_RESULT    = "result";
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
index a524d41b..bc13a84c 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
@@ -16,6 +16,7 @@
 package com.expediagroup.apiary.extensions.gluesync.listener.metrics;
 
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
@@ -25,15 +26,18 @@
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Timer;
 import io.micrometer.jmx.JmxConfig;
 import io.micrometer.jmx.JmxMeterRegistry;
 
 public class MetricService {
 
   private static final Logger log = LoggerFactory.getLogger(MetricService.class);
+  private final MeterRegistry registry;
   private final Map<String, Counter> metrics;
 
   public MetricService(MeterRegistry registry) {
+    this.registry = registry;
     this.metrics = MetricConstants.LISTENER_METRICS.stream()
         .collect(Collectors.toMap(
             metricName -> metricName,
@@ -65,13 +69,23 @@ public void incrementCounter(String name) {
     }
   }
 
+  public void recordDuration(String name, long durationMs) {
+    try {
+      Timer.builder(name)
+          .register(registry)
+          .record(durationMs, TimeUnit.MILLISECONDS);
+    } catch (Exception e) {
+      log.warn("Unable to record duration {} {}ms", name, durationMs, e);
+    }
+  }
+
   public void recordEvent(String operation, String result, String outcome) {
     try {
       Counter.builder(MetricConstants.LISTENER_EVENT)
           .tags(MetricConstants.TAG_OPERATION, operation,
               MetricConstants.TAG_RESULT, result,
               MetricConstants.TAG_OUTCOME, outcome)
-          .register(Metrics.globalRegistry)
+          .register(registry)
           .increment();
     } catch (Exception e) {
       log.warn("Unable to record event {} {} {}", operation, result, outcome, e);
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/service/GlueTableService.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/service/GlueTableService.java
index 32f08e71..2e82fe40 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/service/GlueTableService.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/service/GlueTableService.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2018-2025 Expedia, Inc.
+ * Copyright (C) 2018-2026 Expedia, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
index ad48f3b1..305e3826 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
@@ -21,7 +21,9 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -477,6 +479,7 @@ public void onAlterHiveTable_RenameTable() throws MetaException {
     verify(glueClient).deleteTable(deleteTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
     verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "renamed");
+    verify(metricService).recordDuration(eq(MetricConstants.LISTENER_TABLE_RENAME_DURATION), anyLong());
     DeleteTableRequest deleteTableRequest = deleteTableRequestCaptor.getValue();
 
     // test create new table
@@ -789,6 +792,24 @@ public void onAlterIcebergTable_RenameTableSkipsRenameOperation() throws MetaExc
     verify(glueClient, times(0)).batchCreatePartition(any());
   }
 
+  @Test
+  public void onDropPartition_partitionNotFoundInGlue() throws MetaException {
+    DropPartitionEvent event = mock(DropPartitionEvent.class);
+    when(event.getStatus()).thenReturn(true);
+
+    Table table = simpleHiveTable(simpleSchema(), simplePartitioning());
+    Partition partition = new Partition();
+    partition.setValues(Arrays.asList("part1Value", "part2Value"));
+    partition.setSd(table.getSd());
+    when(event.getTable()).thenReturn(table);
+    when(event.getPartitionIterator()).thenReturn(Arrays.asList(partition).iterator());
+    when(glueClient.deletePartition(any())).thenThrow(new EntityNotFoundException(""));
+
+    glueSync.onDropPartition(event);
+
+    verify(metricService).recordEvent(MetricConstants.DROP_PARTITION, MetricConstants.RESULT_SUCCESS, "not_found");
+    verifyNoMoreInteractions(metricService);
+  }
   private Table simpleHiveTable(List<FieldSchema> schema, List<FieldSchema> partitions) {
     Table table = new Table();
     table.setTableName(tableName);
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricServiceTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricServiceTest.java
index ab8c275a..e5987cdc 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricServiceTest.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricServiceTest.java
@@ -20,6 +20,7 @@
 
 import java.lang.management.ManagementFactory;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
@@ -60,6 +61,17 @@ public void allMetricsRegisteredOnConstruction() {
     }
   }
 
+  @Test
+  public void recordDurationRegistersTimer() {
+    MeterRegistry registry = new SimpleMeterRegistry();
+    MetricService metricService = new MetricService(registry);
+
+    metricService.recordDuration(MetricConstants.LISTENER_TABLE_RENAME_DURATION, 500L);
+
+    assertThat(registry.get(MetricConstants.LISTENER_TABLE_RENAME_DURATION).timer().count(), is(1L));
+    assertThat(registry.get(MetricConstants.LISTENER_TABLE_RENAME_DURATION).timer().totalTime(TimeUnit.MILLISECONDS), is(500.0));
+  }
+
   @Test
   public void jmxRegistryExposesCountersAsMBeans() throws Exception {
     JmxMeterRegistry jmxRegistry = new JmxMeterRegistry(JmxConfig.DEFAULT, Clock.SYSTEM);

From fa7201f9a9993366ff6577cde75f9d3e28fc7e19 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Wed, 17 Jun 2026 12:29:29 +0100
Subject: [PATCH 07/29] fix: align KafkaMessageReader metrics with GlueSync
 JMX/Spring Boot pattern
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

KafkaMessageReaderBuilder.build() now calls configuredRegistry() instead of
defaulting to null (no metrics). In plain JVM deployments a JmxMeterRegistry
is added to Metrics.globalRegistry; in Spring Boot the existing registry is
reused unchanged — matching the pattern established in MetricService.

Adds micrometer-registry-jmx to kafka-metastore-receiver (no shading needed;
this module does not run inside HMS). Both configuredRegistry() copies carry a
comment explaining why a shared utility would break the GlueSync shading.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../kafka-metastore-receiver/pom.xml          |  4 ++++
 .../kafka/messaging/KafkaMessageReader.java   | 19 ++++++++++++++++++-
 .../listener/metrics/MetricService.java       |  5 +++++
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/pom.xml b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/pom.xml
index d7b821be..968aa915 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/pom.xml
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/pom.xml
@@ -26,6 +26,10 @@
       <groupId>io.micrometer</groupId>
       <artifactId>micrometer-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.micrometer</groupId>
+      <artifactId>micrometer-registry-jmx</artifactId>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
index 97712e85..a02d924d 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
@@ -29,8 +29,12 @@
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 
+import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.Metrics;
 import io.micrometer.core.instrument.binder.kafka.KafkaClientMetrics;
+import io.micrometer.jmx.JmxConfig;
+import io.micrometer.jmx.JmxMeterRegistry;
 
 import com.google.common.annotations.VisibleForTesting;
 
@@ -138,7 +142,20 @@ public KafkaMessageReader build() {
       props.put("key.deserializer", "org.apache.kafka.common.serialization.LongDeserializer");
       props.put("value.deserializer", "org.apache.kafka.common.serialization.ByteArrayDeserializer");
       consumerProperties.forEach((key, value) -> props.merge(key, value, (v1, v2) -> v1));
-      return new KafkaMessageReader(topicName, metaStoreEventSerDe, props, meterRegistry);
+      MeterRegistry registry = meterRegistry != null ? meterRegistry : configuredRegistry();
+      return new KafkaMessageReader(topicName, metaStoreEventSerDe, props, registry);
+    }
+
+    // DO NOT extract to a shared utility. MetricService in apiary-gluesync-listener contains an
+    // identical copy, but that module shades and relocates micrometer-jmx because it runs inside
+    // HMS (Codahale classpath conflict). Shading breaks Spring Boot auto-configuration, so each
+    // module must own this method and use the correct (shaded or unshaded) JmxMeterRegistry for
+    // its deployment context. Keep these two copies in sync manually.
+    private static MeterRegistry configuredRegistry() {
+      if (Metrics.globalRegistry.getRegistries().isEmpty()) {
+        Metrics.addRegistry(new JmxMeterRegistry(JmxConfig.DEFAULT, Clock.SYSTEM));
+      }
+      return Metrics.globalRegistry;
     }
   }
 }
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
index bc13a84c..8514e28a 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
@@ -49,6 +49,11 @@ public MetricService() {
     this(configuredRegistry());
   }
 
+  // DO NOT extract to a shared utility. KafkaMessageReaderBuilder in kafka-metastore-receiver
+  // contains an identical copy, but this module shades and relocates micrometer-jmx because it
+  // runs inside HMS (Codahale classpath conflict). Shading breaks Spring Boot auto-configuration,
+  // so each module must own this method and use the correct (shaded or unshaded) JmxMeterRegistry
+  // for its deployment context. Keep these two copies in sync manually.
   private static MeterRegistry configuredRegistry() {
     if (Metrics.globalRegistry.getRegistries().isEmpty()) {
       Metrics.addRegistry(new JmxMeterRegistry(JmxConfig.DEFAULT, Clock.SYSTEM));

From e2eb03e1211d25f185126f1bff8a548b2715ca51 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Wed, 17 Jun 2026 12:38:57 +0100
Subject: [PATCH 08/29] fix: log when JmxMeterRegistry is auto-registered in
 KafkaMessageReader

Helps diagnose why metrics are flowing to JMX rather than an existing
registry in plain JVM deployments.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../events/metastore/kafka/messaging/KafkaMessageReader.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
index a02d924d..29835b93 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
@@ -28,6 +28,8 @@
 
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -44,6 +46,7 @@
 
 public class KafkaMessageReader implements Iterator<ApiaryListenerEvent>, Closeable {
 
+  private static final Logger log = LoggerFactory.getLogger(KafkaMessageReader.class);
   private static final Duration POLL_TIMEOUT = Duration.ofMinutes(5);
 
   private KafkaConsumer<Long, byte[]> consumer;
@@ -153,6 +156,7 @@ public KafkaMessageReader build() {
     // its deployment context. Keep these two copies in sync manually.
     private static MeterRegistry configuredRegistry() {
       if (Metrics.globalRegistry.getRegistries().isEmpty()) {
+        log.info("No MeterRegistry found; registering JmxMeterRegistry for Kafka consumer metrics");
         Metrics.addRegistry(new JmxMeterRegistry(JmxConfig.DEFAULT, Clock.SYSTEM));
       }
       return Metrics.globalRegistry;

From 208de29e8e7f92c009297e23c2ab211d566b1f56 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Thu, 18 Jun 2026 14:55:30 +0100
Subject: [PATCH 09/29] fix: bound metric tag cardinality in ApiaryGlueSync
 failure paths

Replace unbounded e.getClass().getSimpleName() tag values with a fixed
vocabulary derived from a KNOWN_EXCEPTIONS allowlist, preventing
indefinite registry growth under degraded Glue conditions.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../gluesync/listener/ApiaryGlueSync.java     | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
index 6b9ae69e..b0b2385b 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
@@ -18,6 +18,7 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Iterator;
+import java.util.List;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hive.metastore.MetaStoreEventListener;
@@ -36,10 +37,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.amazonaws.AmazonServiceException;
 import com.amazonaws.services.glue.AWSGlue;
 import com.amazonaws.services.glue.AWSGlueClientBuilder;
 import com.amazonaws.services.glue.model.AlreadyExistsException;
 import com.amazonaws.services.glue.model.EntityNotFoundException;
+import com.amazonaws.services.glue.model.InvalidInputException;
+import com.amazonaws.services.glue.model.OperationTimeoutException;
 
 import com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants;
 import com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricService;
@@ -52,6 +56,12 @@ public class ApiaryGlueSync extends MetaStoreEventListener {
 
   private static final Logger log = LoggerFactory.getLogger(ApiaryGlueSync.class);
 
+  private static final List<Class<? extends Exception>> KNOWN_EXCEPTIONS = List.of(
+      OperationTimeoutException.class,
+      InvalidInputException.class,
+      AmazonServiceException.class
+  );
+
   private final AWSGlue glueClient;
   private final GlueDatabaseService glueDatabaseService;
   private final GlueTableService glueTableService;
@@ -122,7 +132,7 @@ public void onCreateDatabase(CreateDatabaseEvent event) throws MetaException {
     } catch (Exception e) {
       log.error("Failed create database {} in glue", database.getName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_FAILURE);
-      metricService.recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
+      metricService.recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_FAILURE, toOutcome(e));
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -143,7 +153,7 @@ public void onDropDatabase(DropDatabaseEvent event) throws MetaException {
     } catch (Exception e) {
       log.error("Failed drop database {} in glue", database.getName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_FAILURE);
-      metricService.recordEvent(MetricConstants.DROP_DATABASE, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
+      metricService.recordEvent(MetricConstants.DROP_DATABASE, MetricConstants.RESULT_FAILURE, toOutcome(e));
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -169,7 +179,7 @@ public void onCreateTable(CreateTableEvent event) throws MetaException {
     } catch (Exception e) {
       log.error("Failed create table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
-      metricService.recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
+      metricService.recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_FAILURE, toOutcome(e));
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -196,7 +206,7 @@ public void onDropTable(DropTableEvent event) throws MetaException {
     } catch (Exception e) {
       log.error("Failed drop table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
-      metricService.recordEvent(MetricConstants.DROP_TABLE, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
+      metricService.recordEvent(MetricConstants.DROP_TABLE, MetricConstants.RESULT_FAILURE, toOutcome(e));
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -232,7 +242,7 @@ public void onAlterTable(AlterTableEvent event) throws MetaException {
     } catch (Exception e) {
       log.error("Failed alter table {}.{} in glue", oldTable.getDbName(), oldTable.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
-      metricService.recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
+      metricService.recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_FAILURE, toOutcome(e));
       if (throwExceptions) {
         throw wrap(e);
       }
@@ -277,7 +287,7 @@ public void onAddPartition(AddPartitionEvent event) throws MetaException {
       } catch (Exception e) {
         log.error("Failed add partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
-        metricService.recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
+        metricService.recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_FAILURE, toOutcome(e));
         if (throwExceptions) {
           throw wrap(e);
         }
@@ -308,7 +318,7 @@ public void onDropPartition(DropPartitionEvent event) throws MetaException {
       } catch (Exception e) {
         log.error("Failed drop partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
-        metricService.recordEvent(MetricConstants.DROP_PARTITION, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
+        metricService.recordEvent(MetricConstants.DROP_PARTITION, MetricConstants.RESULT_FAILURE, toOutcome(e));
         if (throwExceptions) {
           throw wrap(e);
         }
@@ -338,13 +348,22 @@ public void onAlterPartition(AlterPartitionEvent event) throws MetaException {
     } catch (Exception e) {
       log.error("Failed alter partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
-      metricService.recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_FAILURE, e.getClass().getSimpleName());
+      metricService.recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_FAILURE, toOutcome(e));
       if (throwExceptions) {
         throw wrap(e);
       }
     }
   }
 
+  private static String toOutcome(Exception e) {
+    for (Class<? extends Exception> type : KNOWN_EXCEPTIONS) {
+      if (type.isInstance(e)) {
+        return type.getSimpleName();
+      }
+    }
+    return "other";
+  }
+
   /*
    * Helper method to wrap random exceptions into a MetaException along with their
    * stack traces so we don't lose info. This is really only needed in the CLI

From 1a50facd22f80eb5234fabc077ad7df7e03c9522 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Thu, 18 Jun 2026 15:02:01 +0100
Subject: [PATCH 10/29] fix: prevent duplicate JmxMeterRegistry registration
 under concurrent init

Synchronize configuredRegistry() in both MetricService and KafkaMessageReader
to close the TOCTOU race where two HMS worker threads could each observe an
empty registry and add a second JmxMeterRegistry, causing MBean registration
failures on startup.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../events/metastore/kafka/messaging/KafkaMessageReader.java    | 2 +-
 .../extensions/gluesync/listener/metrics/MetricService.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
index 29835b93..1fa206cc 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
@@ -154,7 +154,7 @@ public KafkaMessageReader build() {
     // HMS (Codahale classpath conflict). Shading breaks Spring Boot auto-configuration, so each
     // module must own this method and use the correct (shaded or unshaded) JmxMeterRegistry for
     // its deployment context. Keep these two copies in sync manually.
-    private static MeterRegistry configuredRegistry() {
+    private static synchronized MeterRegistry configuredRegistry() {
       if (Metrics.globalRegistry.getRegistries().isEmpty()) {
         log.info("No MeterRegistry found; registering JmxMeterRegistry for Kafka consumer metrics");
         Metrics.addRegistry(new JmxMeterRegistry(JmxConfig.DEFAULT, Clock.SYSTEM));
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
index 8514e28a..3d3da1e1 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
@@ -54,7 +54,7 @@ public MetricService() {
   // runs inside HMS (Codahale classpath conflict). Shading breaks Spring Boot auto-configuration,
   // so each module must own this method and use the correct (shaded or unshaded) JmxMeterRegistry
   // for its deployment context. Keep these two copies in sync manually.
-  private static MeterRegistry configuredRegistry() {
+  private static synchronized MeterRegistry configuredRegistry() {
     if (Metrics.globalRegistry.getRegistries().isEmpty()) {
       Metrics.addRegistry(new JmxMeterRegistry(JmxConfig.DEFAULT, Clock.SYSTEM));
     }

From 99d2bd1fd6a0763a50de58e0309cf853cdc26cbc Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Thu, 18 Jun 2026 15:06:39 +0100
Subject: [PATCH 11/29] fix: ensure consumer.close() is called if
 kafkaClientMetrics.close() throws

Wrap metric deregistration in try-finally so a JMX InstanceNotFoundException
during shutdown cannot leave the Kafka consumer's threads and broker
connections alive.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../metastore/kafka/messaging/KafkaMessageReader.java    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
index 1fa206cc..db839b8c 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
@@ -88,10 +88,13 @@ public void remove() {
 
   @Override
   public void close() {
-    if (kafkaClientMetrics != null) {
-      kafkaClientMetrics.close();
+    try {
+      if (kafkaClientMetrics != null) {
+        kafkaClientMetrics.close();
+      }
+    } finally {
+      consumer.close();
     }
-    consumer.close();
   }
 
   private void readRecordsIfNeeded() {

From 65a278eefb59eba0754521e98d1993edf3f1a71b Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Thu, 18 Jun 2026 15:18:04 +0100
Subject: [PATCH 12/29] fix: cache recordEvent counters to avoid per-call Tags
 allocation in partition loops

Replace Counter.builder().register() on every recordEvent() call with a
lazy ConcurrentHashMap cache, matching the pre-registration pattern used
by incrementCounter(). Eliminates Tags array allocation on hot partition
event paths.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../listener/metrics/MetricService.java        | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
index 3d3da1e1..76050c21 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
@@ -16,6 +16,7 @@
 package com.expediagroup.apiary.extensions.gluesync.listener.metrics;
 
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -30,11 +31,17 @@
 import io.micrometer.jmx.JmxConfig;
 import io.micrometer.jmx.JmxMeterRegistry;
 
+import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.LISTENER_EVENT;
+import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.TAG_OPERATION;
+import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.TAG_OUTCOME;
+import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.TAG_RESULT;
+
 public class MetricService {
 
   private static final Logger log = LoggerFactory.getLogger(MetricService.class);
   private final MeterRegistry registry;
   private final Map<String, Counter> metrics;
+  private final Map<String, Counter> events = new ConcurrentHashMap<>();
 
   public MetricService(MeterRegistry registry) {
     this.registry = registry;
@@ -51,7 +58,7 @@ public MetricService() {
 
   // DO NOT extract to a shared utility. KafkaMessageReaderBuilder in kafka-metastore-receiver
   // contains an identical copy, but this module shades and relocates micrometer-jmx because it
-  // runs inside HMS (Codahale classpath conflict). Shading breaks Spring Boot auto-configuration,
+  // runs inside HMS (classpath conflicts). Shading breaks Spring Boot auto-configuration,
   // so each module must own this method and use the correct (shaded or unshaded) JmxMeterRegistry
   // for its deployment context. Keep these two copies in sync manually.
   private static synchronized MeterRegistry configuredRegistry() {
@@ -86,11 +93,10 @@ public void recordDuration(String name, long durationMs) {
 
   public void recordEvent(String operation, String result, String outcome) {
     try {
-      Counter.builder(MetricConstants.LISTENER_EVENT)
-          .tags(MetricConstants.TAG_OPERATION, operation,
-              MetricConstants.TAG_RESULT, result,
-              MetricConstants.TAG_OUTCOME, outcome)
-          .register(registry)
+      events.computeIfAbsent(operation + "|" + result + "|" + outcome, k ->
+          Counter.builder(LISTENER_EVENT)
+              .tags(TAG_OPERATION, operation, TAG_RESULT, result, TAG_OUTCOME, outcome)
+              .register(registry))
           .increment();
     } catch (Exception e) {
       log.warn("Unable to record event {} {} {}", operation, result, outcome, e);

From e4946bc65ee1d70156733077a4f35e95bacc1de2 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Thu, 18 Jun 2026 16:36:44 +0100
Subject: [PATCH 13/29] refactor: extract GlueOutcome enum and private helpers
 for create/update recovery in ApiaryGlueSync

Replace inline nested catch blocks for AlreadyExistsException/EntityNotFoundException
recovery with a shared GlueOutcome enum (CREATED/UPDATED) and extracted private methods:
createOrUpdateDatabase, createOrUpdateTable, updateOrCreateTable, updateOrCreatePartition.
Each event handler is now a flat single-catch structure with outcome.name() as the metric tag.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../gluesync/listener/ApiaryGlueSync.java     | 87 ++++++++++++-------
 1 file changed, 54 insertions(+), 33 deletions(-)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
index b0b2385b..066beb4f 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
@@ -56,6 +56,8 @@ public class ApiaryGlueSync extends MetaStoreEventListener {
 
   private static final Logger log = LoggerFactory.getLogger(ApiaryGlueSync.class);
 
+  private enum GlueOutcome { UPDATED, CREATED }
+
   private static final List<Class<? extends Exception>> KNOWN_EXCEPTIONS = List.of(
       OperationTimeoutException.class,
       InvalidInputException.class,
@@ -121,14 +123,9 @@ public void onCreateDatabase(CreateDatabaseEvent event) throws MetaException {
     }
     Database database = event.getDatabase();
     try {
-      glueDatabaseService.create(database);
+      GlueOutcome outcome = createOrUpdateDatabase(database);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-      metricService.recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, "created");
-    } catch (AlreadyExistsException e) {
-      log.info(database + " database already exists in glue, updating....");
-      glueDatabaseService.update(database);
-      metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-      metricService.recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, "updated");
+      metricService.recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, outcome.name());
     } catch (Exception e) {
       log.error("Failed create database {} in glue", database.getName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_FAILURE);
@@ -168,14 +165,9 @@ public void onCreateTable(CreateTableEvent event) throws MetaException {
     }
     Table table = event.getTable();
     try {
-      glueTableService.create(table);
+      GlueOutcome outcome = createOrUpdateTable(table);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "created");
-    } catch (AlreadyExistsException e) {
-      log.info(table + " table already exists in glue, updating....");
-      glueTableService.update(table);
-      metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "updated");
+      metricService.recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, outcome.name());
     } catch (Exception e) {
       log.error("Failed create table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
@@ -228,17 +220,9 @@ public void onAlterTable(AlterTableEvent event) throws MetaException {
         doRenameOperation(oldTable, newTable);
         return;
       }
-      glueTableService.update(newTable);
-      metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "updated");
-    } catch (EntityNotFoundException e) {
-      log.info(newTable + " table doesn't exist in glue, creating....");
-      glueTableService.create(newTable);
+      GlueOutcome outcome = updateOrCreateTable(newTable);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "created");
-      if (throwExceptions) {
-        throw wrap(e);
-      }
+      metricService.recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, outcome.name());
     } catch (Exception e) {
       log.error("Failed alter table {}.{} in glue", oldTable.getDbName(), oldTable.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
@@ -249,6 +233,50 @@ public void onAlterTable(AlterTableEvent event) throws MetaException {
     }
   }
 
+  private GlueOutcome createOrUpdateDatabase(Database database) {
+    try {
+      glueDatabaseService.create(database);
+      return GlueOutcome.CREATED;
+    } catch (AlreadyExistsException e) {
+      log.info("{} database already exists in glue, updating....", database.getName());
+      glueDatabaseService.update(database);
+      return GlueOutcome.UPDATED;
+    }
+  }
+
+  private GlueOutcome createOrUpdateTable(Table table) {
+    try {
+      glueTableService.create(table);
+      return GlueOutcome.CREATED;
+    } catch (AlreadyExistsException e) {
+      log.info("{} table already exists in glue, updating....", table.getTableName());
+      glueTableService.update(table);
+      return GlueOutcome.UPDATED;
+    }
+  }
+
+  private GlueOutcome updateOrCreateTable(Table table) {
+    try {
+      glueTableService.update(table);
+      return GlueOutcome.UPDATED;
+    } catch (EntityNotFoundException e) {
+      log.info("{} table doesn't exist in glue, creating....", table.getTableName());
+      glueTableService.create(table);
+      return GlueOutcome.CREATED;
+    }
+  }
+
+  private GlueOutcome updateOrCreatePartition(Table table, Partition partition) {
+    try {
+      gluePartitionService.update(table, partition);
+      return GlueOutcome.UPDATED;
+    } catch (EntityNotFoundException e) {
+      log.info("{} partition doesn't exist in glue, creating....", partition);
+      gluePartitionService.create(table, partition);
+      return GlueOutcome.CREATED;
+    }
+  }
+
   private void doRenameOperation(Table oldTable, Table newTable) {
     log.info("{} glue table rename detected to {}", oldTable.getTableName(), newTable.getTableName());
     long startTime = System.currentTimeMillis();
@@ -335,16 +363,9 @@ public void onAlterPartition(AlterPartitionEvent event) throws MetaException {
     Table table = event.getTable();
     Partition partition = event.getNewPartition();
     try {
-      gluePartitionService.update(table, partition);
+      GlueOutcome outcome = updateOrCreatePartition(table, partition);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-      metricService.recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_SUCCESS, "updated");
-    } catch (EntityNotFoundException e) {
-      gluePartitionService.create(table, partition);
-      metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-      metricService.recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_SUCCESS, "created");
-      if (throwExceptions) {
-        throw wrap(e);
-      }
+      metricService.recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_SUCCESS, outcome.name());
     } catch (Exception e) {
       log.error("Failed alter partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);

From ebc4daaa9b41cc7e346f82010504fa48038a22d5 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Thu, 18 Jun 2026 16:38:26 +0100
Subject: [PATCH 14/29] refactor: apply GlueOutcome enum pattern to
 onAddPartition

Extract createOrUpdatePartition (create-first, AlreadyExistsException -> update)
to flatten onAddPartition's nested catch into the same single-catch structure
used by the other event handlers.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../gluesync/listener/ApiaryGlueSync.java     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
index 066beb4f..766f210e 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
@@ -266,6 +266,17 @@ private GlueOutcome updateOrCreateTable(Table table) {
     }
   }
 
+  private GlueOutcome createOrUpdatePartition(Table table, Partition partition) {
+    try {
+      gluePartitionService.create(table, partition);
+      return GlueOutcome.CREATED;
+    } catch (AlreadyExistsException e) {
+      log.info("{} partition already exists in glue, updating....", partition);
+      gluePartitionService.update(table, partition);
+      return GlueOutcome.UPDATED;
+    }
+  }
+
   private GlueOutcome updateOrCreatePartition(Table table, Partition partition) {
     try {
       gluePartitionService.update(table, partition);
@@ -305,13 +316,9 @@ public void onAddPartition(AddPartitionEvent event) throws MetaException {
     while (partitions.hasNext()) {
       Partition partition = partitions.next();
       try {
-        gluePartitionService.create(table, partition);
-        metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-        metricService.recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, "created");
-      } catch (AlreadyExistsException e) {
-        gluePartitionService.update(table, partition);
+        GlueOutcome outcome = createOrUpdatePartition(table, partition);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-        metricService.recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, "updated");
+        metricService.recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, outcome.name());
       } catch (Exception e) {
         log.error("Failed add partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);

From 854f5488f3d131ceb3aec47362d017008081f3b4 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Thu, 18 Jun 2026 16:50:14 +0100
Subject: [PATCH 15/29] test: add coverage for recovery paths in ApiaryGlueSync
 and fix outcome tag case

Add tests for the five previously uncovered recovery branches:
onCreateHiveTableThatAlreadyExists, onAlterHiveTableThatDoesntExistInGlue,
onAlterPartition (happy path), onAlterPartitionThatDoesntExistInGlue,
onAddPartitionThatAlreadyExists.

Update existing recordEvent assertions from lowercase "created"/"updated" to
"CREATED"/"UPDATED" to match the GlueOutcome enum values emitted via outcome.name().

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../gluesync/listener/ApiaryGlueSyncTest.java | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
index 305e3826..3a2a514b 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
@@ -157,7 +157,7 @@ public void onCreateDatabase() throws MetaException {
 
     verify(glueClient).createDatabase(createDatabaseRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, "created");
+    verify(metricService).recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, "CREATED");
     CreateDatabaseRequest createDatabaseRequest = createDatabaseRequestCaptor.getValue();
 
     assertThat(createDatabaseRequest.getDatabaseInput().getName(), is(gluePrefix + dbName));
@@ -178,7 +178,7 @@ public void onCreateDatabaseThatAlreadyExists() throws MetaException {
     verify(glueClient).createDatabase(createDatabaseRequestCaptor.capture());
     verify(glueClient).updateDatabase(updateDatabaseRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, "updated");
+    verify(metricService).recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, "UPDATED");
     UpdateDatabaseRequest updateDatabaseRequest = updateDatabaseRequestCaptor.getValue();
 
     assertThat(updateDatabaseRequest.getName(), is(gluePrefix + dbName));
@@ -249,7 +249,7 @@ public void onCreateHiveTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "created");
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "CREATED");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -277,7 +277,7 @@ public void onCreateHiveTable_withIncorrectFormat() throws MetaException {
 
     verify(glueClient, times(2)).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "created");
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "CREATED");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -297,7 +297,7 @@ public void onCreateIcebergTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "created");
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "CREATED");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -324,7 +324,7 @@ public void onCreateHiveView() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "created");
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "CREATED");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -350,7 +350,7 @@ public void onAlterHiveTable() throws MetaException {
 
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "updated");
+    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "UPDATED");
     UpdateTableRequest updateTableRequest = updateTableRequestCaptor.getValue();
 
     assertThat(updateTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -378,7 +378,7 @@ public void onAlterHiveTableSkipArchiveOverride() throws MetaException {
 
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "updated");
+    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "UPDATED");
     UpdateTableRequest updateTableRequest = updateTableRequestCaptor.getValue();
 
     assertThat(updateTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -510,7 +510,7 @@ public void onCreateUnpartitionedHiveTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "created");
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "CREATED");
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -545,7 +545,7 @@ public void onAddPartition_withIncorrectFormat() throws MetaException {
 
     verify(glueClient, times(2)).createPartition(createPartitionRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, "created");
+    verify(metricService).recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, "CREATED");
     CreatePartitionRequest createTableRequest = createPartitionRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -565,6 +565,7 @@ public void onCreateHiveTableThatAlreadyExists() throws MetaException {
     verify(glueClient).createTable(any());
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "UPDATED");
     assertThat(updateTableRequestCaptor.getValue().getDatabaseName(), is(gluePrefix + dbName));
     assertThat(updateTableRequestCaptor.getValue().getTableInput().getName(), is(tableName));
   }
@@ -583,6 +584,7 @@ public void onAlterHiveTableThatDoesntExistInGlue() throws MetaException {
     verify(glueClient).updateTable(any());
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "CREATED");
     assertThat(createTableRequestCaptor.getValue().getDatabaseName(), is(gluePrefix + dbName));
     assertThat(createTableRequestCaptor.getValue().getTableInput().getName(), is(tableName));
   }
@@ -602,6 +604,7 @@ public void onAlterPartition() throws MetaException {
 
     verify(glueClient).updatePartition(updatePartitionRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
+    verify(metricService).recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_SUCCESS, "UPDATED");
     assertThat(updatePartitionRequestCaptor.getValue().getDatabaseName(), is(gluePrefix + dbName));
     assertThat(updatePartitionRequestCaptor.getValue().getTableName(), is(tableName));
   }
@@ -623,6 +626,7 @@ public void onAlterPartitionThatDoesntExistInGlue() throws MetaException {
     verify(glueClient).updatePartition(any());
     verify(glueClient).createPartition(createPartitionRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
+    verify(metricService).recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_SUCCESS, "CREATED");
     assertThat(createPartitionRequestCaptor.getValue().getDatabaseName(), is(gluePrefix + dbName));
     assertThat(createPartitionRequestCaptor.getValue().getTableName(), is(tableName));
   }
@@ -663,6 +667,7 @@ public void onAddPartitionThatAlreadyExists() throws MetaException {
     verify(glueClient).createPartition(any());
     verify(glueClient).updatePartition(updatePartitionRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
+    verify(metricService).recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, "UPDATED");
     assertThat(updatePartitionRequestCaptor.getValue().getDatabaseName(), is(gluePrefix + dbName));
     assertThat(updatePartitionRequestCaptor.getValue().getTableName(), is(tableName));
   }
@@ -810,6 +815,7 @@ public void onDropPartition_partitionNotFoundInGlue() throws MetaException {
     verify(metricService).recordEvent(MetricConstants.DROP_PARTITION, MetricConstants.RESULT_SUCCESS, "not_found");
     verifyNoMoreInteractions(metricService);
   }
+
   private Table simpleHiveTable(List<FieldSchema> schema, List<FieldSchema> partitions) {
     Table table = new Table();
     table.setTableName(tableName);

From f15b9de863f48a547d0e467c66b9c5f53da4fe53 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Fri, 19 Jun 2026 08:40:30 +0100
Subject: [PATCH 16/29] test: add onDropTable tests and a single ignored-event
 test covering all handlers

Add onDropTable (happy path) and onDropTableThatDoesntExistInGlue (EntityNotFoundException
-> not_found) to cover the previously untested handler. Add
allHandlers_ignoredWhenEventStatusFalse which fires all 8 event handlers with
getStatus()=false and asserts the RESULT_IGNORED metric is recorded and glueClient
is never called.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../gluesync/listener/ApiaryGlueSyncTest.java          | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
index 3a2a514b..24fd59eb 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
@@ -682,6 +682,7 @@ public void onDropTable() throws MetaException {
 
     verify(glueClient).deleteTable(deleteTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+    verify(metricService).recordEvent(MetricConstants.DROP_TABLE, MetricConstants.RESULT_SUCCESS, "deleted");
     assertThat(deleteTableRequestCaptor.getValue().getDatabaseName(), is(gluePrefix + dbName));
     assertThat(deleteTableRequestCaptor.getValue().getName(), is(tableName));
   }
@@ -696,6 +697,7 @@ public void onDropTableThatDoesntExistInGlue() throws MetaException {
     glueSync.onDropTable(event);
 
     verify(glueClient).deleteTable(any());
+    verify(metricService).recordEvent(MetricConstants.DROP_TABLE, MetricConstants.RESULT_SUCCESS, "not_found");
     verifyNoMoreInteractions(metricService);
   }
 
@@ -745,6 +747,14 @@ public void allHandlers_ignoredWhenEventStatusFalse() throws MetaException {
     glueSync.onAlterPartition(alterPartition);
 
     verifyZeroInteractions(glueClient);
+    verify(metricService).recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_IGNORED, "ignored");
+    verify(metricService).recordEvent(MetricConstants.DROP_DATABASE, MetricConstants.RESULT_IGNORED, "ignored");
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_IGNORED, "ignored");
+    verify(metricService).recordEvent(MetricConstants.DROP_TABLE, MetricConstants.RESULT_IGNORED, "ignored");
+    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_IGNORED, "ignored");
+    verify(metricService).recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_IGNORED, "ignored");
+    verify(metricService).recordEvent(MetricConstants.DROP_PARTITION, MetricConstants.RESULT_IGNORED, "ignored");
+    verify(metricService).recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_IGNORED, "ignored");
     verifyNoMoreInteractions(metricService);
   }
 

From 20bdb8f5bd69cd5e56168079d9fe71fdb0e470e5 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Fri, 19 Jun 2026 08:45:50 +0100
Subject: [PATCH 17/29] test: add onDropPartition happy path, generic failure,
 and throwExceptions=true tests

Add onDropPartition to cover the missing success path for partition deletion.
Add onCreateTable_failureMetricsRecordedOnException to verify RESULT_FAILURE metrics
and toOutcome() tag (OperationTimeoutException) are recorded when a non-recovery
exception is thrown. Add onCreateTable_exceptionRethrownWhenThrowExceptionsEnabled
to verify exceptions are wrapped as MetaException and rethrown when throwExceptions=true.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../extensions/gluesync/listener/ApiaryGlueSyncTest.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
index 24fd59eb..0d635498 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
@@ -716,6 +716,7 @@ public void onDropPartition() throws MetaException {
 
     verify(glueClient).deletePartition(any());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
+    verify(metricService).recordEvent(MetricConstants.DROP_PARTITION, MetricConstants.RESULT_SUCCESS, "deleted");
   }
 
   @Test
@@ -768,6 +769,7 @@ public void onCreateTable_failureMetricsRecordedOnException() throws MetaExcepti
     glueSync.onCreateTable(event);
 
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_FAILURE, "OperationTimeoutException");
     verifyNoMoreInteractions(metricService);
   }
 
@@ -787,6 +789,7 @@ public void onCreateTable_exceptionRethrownWhenThrowExceptionsEnabled() throws M
     }
 
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_FAILURE, "OperationTimeoutException");
   }
 
   @Test

From 6b8a1a08010fdfe1187f7fbfa3fe954eb89f5398 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Fri, 19 Jun 2026 08:49:37 +0100
Subject: [PATCH 18/29] test: add onAddPartition happy path, Iceberg rename,
 and rename failure tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add onAddPartition to cover the simple create-succeeds path independently of
the service-layer retry test. Add onAlterIcebergTable_RenameTableSkipsRenameOperation
to verify Iceberg renames bypass doRenameOperation and go through updateOrCreateTable
instead. Add onAlterHiveTable_RenameOperationFailureIsMetered to verify that a
mid-rename exception is caught and recorded as RESULT_FAILURE — this was unmetered
on main before the try-block refactor.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../gluesync/listener/ApiaryGlueSyncTest.java | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
index 0d635498..e6f0e3a1 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
@@ -646,6 +646,7 @@ public void onAddPartition() throws MetaException {
 
     verify(glueClient).createPartition(createPartitionRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
+    verify(metricService).recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, "CREATED");
     assertThat(createPartitionRequestCaptor.getValue().getDatabaseName(), is(gluePrefix + dbName));
     assertThat(createPartitionRequestCaptor.getValue().getTableName(), is(tableName));
   }
@@ -701,6 +702,23 @@ public void onDropTableThatDoesntExistInGlue() throws MetaException {
     verifyNoMoreInteractions(metricService);
   }
 
+  @Test
+  public void onAlterHiveTable_RenameOperationFailureIsMetered() throws MetaException {
+    AlterTableEvent event = mock(AlterTableEvent.class);
+    when(event.getStatus()).thenReturn(true);
+    Table oldTable = simpleHiveTable(simpleSchema(), simplePartitioning());
+    Table newTable = simpleHiveTable(simpleSchema(), simplePartitioning());
+    newTable.setTableName("table_renamed");
+    when(event.getOldTable()).thenReturn(oldTable);
+    when(event.getNewTable()).thenReturn(newTable);
+    when(glueClient.createTable(any())).thenThrow(new OperationTimeoutException("timeout"));
+
+    glueSync.onAlterTable(event);
+
+    verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
+    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_FAILURE, "OperationTimeoutException");
+  }
+
   @Test
   public void onDropPartition() throws MetaException {
     DropPartitionEvent event = mock(DropPartitionEvent.class);
@@ -805,7 +823,9 @@ public void onAlterIcebergTable_RenameTableSkipsRenameOperation() throws MetaExc
 
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
+    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "UPDATED");
     assertThat(updateTableRequestCaptor.getValue().getTableInput().getName(), is("table_renamed"));
+    // rename operation (copy+delete) must not be triggered for Iceberg tables
     verify(glueClient, times(0)).deleteTable(any());
     verify(glueClient, times(0)).batchCreatePartition(any());
   }

From 9aa1c90338e35766fb57abcb1c4134809a48ce28 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Fri, 19 Jun 2026 08:50:12 +0100
Subject: [PATCH 19/29] chore: reorder static imports in MetricService and
 tighten KafkaMessageReader comment

Move static imports to top of MetricService per Java convention. Update comment
in KafkaMessageReader from "Codahale classpath conflict" to "classpath conflicts"
to avoid referencing a specific library name that may not always be the cause.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../metastore/kafka/messaging/KafkaMessageReader.java  |  2 +-
 .../gluesync/listener/metrics/MetricService.java       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
index db839b8c..9bd7e320 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
@@ -154,7 +154,7 @@ public KafkaMessageReader build() {
 
     // DO NOT extract to a shared utility. MetricService in apiary-gluesync-listener contains an
     // identical copy, but that module shades and relocates micrometer-jmx because it runs inside
-    // HMS (Codahale classpath conflict). Shading breaks Spring Boot auto-configuration, so each
+    // HMS (classpath conflicts). Shading breaks Spring Boot auto-configuration, so each
     // module must own this method and use the correct (shaded or unshaded) JmxMeterRegistry for
     // its deployment context. Keep these two copies in sync manually.
     private static synchronized MeterRegistry configuredRegistry() {
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
index 76050c21..7c916ce0 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
@@ -15,6 +15,11 @@
  */
 package com.expediagroup.apiary.extensions.gluesync.listener.metrics;
 
+import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.LISTENER_EVENT;
+import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.TAG_OPERATION;
+import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.TAG_OUTCOME;
+import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.TAG_RESULT;
+
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
@@ -31,11 +36,6 @@
 import io.micrometer.jmx.JmxConfig;
 import io.micrometer.jmx.JmxMeterRegistry;
 
-import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.LISTENER_EVENT;
-import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.TAG_OPERATION;
-import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.TAG_OUTCOME;
-import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.TAG_RESULT;
-
 public class MetricService {
 
   private static final Logger log = LoggerFactory.getLogger(MetricService.class);

From a3d6b189f02599c34b664df3abda1105ab68ea74 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Fri, 19 Jun 2026 09:37:24 +0100
Subject: [PATCH 20/29] chore: align .sdkmanrc with project Java 8
 source/target

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .sdkmanrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.sdkmanrc b/.sdkmanrc
index 598592aa..a49f7da8 100644
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -1 +1 @@
-java=11.0.28-tem
+java=8.0.472-amzn

From 9b698f9b2ad224859a20c7aa1ad3765d2e1f98e5 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Fri, 19 Jun 2026 11:10:48 +0100
Subject: [PATCH 21/29] fix: replace GlueOutcome enum with lowercase string
 constants and document KNOWN_EXCEPTIONS ordering

GlueOutcome.name() was emitting uppercase tag values ("CREATED", "UPDATED") while all
other outcome strings were lowercase, breaking dashboard filtering on the outcome tag.
Replaced with OUTCOME_CREATED/OUTCOME_UPDATED constants in MetricConstants and updated
all call sites and test assertions. Added a comment above KNOWN_EXCEPTIONS explaining
the subclass-before-superclass ordering constraint.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../gluesync/listener/ApiaryGlueSync.java     | 54 +++++++++----------
 .../listener/metrics/MetricConstants.java     |  3 ++
 .../gluesync/listener/ApiaryGlueSyncTest.java | 34 ++++++------
 3 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
index 766f210e..e44a437b 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
@@ -56,8 +56,8 @@ public class ApiaryGlueSync extends MetaStoreEventListener {
 
   private static final Logger log = LoggerFactory.getLogger(ApiaryGlueSync.class);
 
-  private enum GlueOutcome { UPDATED, CREATED }
-
+  // Order matters: subclasses must precede their superclass so isInstance() matches the most specific type first.
+  // OperationTimeoutException and InvalidInputException both extend AmazonServiceException.
   private static final List<Class<? extends Exception>> KNOWN_EXCEPTIONS = List.of(
       OperationTimeoutException.class,
       InvalidInputException.class,
@@ -123,9 +123,9 @@ public void onCreateDatabase(CreateDatabaseEvent event) throws MetaException {
     }
     Database database = event.getDatabase();
     try {
-      GlueOutcome outcome = createOrUpdateDatabase(database);
+      String outcome = createOrUpdateDatabase(database);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-      metricService.recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, outcome.name());
+      metricService.recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, outcome);
     } catch (Exception e) {
       log.error("Failed create database {} in glue", database.getName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_DATABASE_FAILURE);
@@ -165,9 +165,9 @@ public void onCreateTable(CreateTableEvent event) throws MetaException {
     }
     Table table = event.getTable();
     try {
-      GlueOutcome outcome = createOrUpdateTable(table);
+      String outcome = createOrUpdateTable(table);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, outcome.name());
+      metricService.recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, outcome);
     } catch (Exception e) {
       log.error("Failed create table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
@@ -220,9 +220,9 @@ public void onAlterTable(AlterTableEvent event) throws MetaException {
         doRenameOperation(oldTable, newTable);
         return;
       }
-      GlueOutcome outcome = updateOrCreateTable(newTable);
+      String outcome = updateOrCreateTable(newTable);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-      metricService.recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, outcome.name());
+      metricService.recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, outcome);
     } catch (Exception e) {
       log.error("Failed alter table {}.{} in glue", oldTable.getDbName(), oldTable.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_TABLE_FAILURE);
@@ -233,58 +233,58 @@ public void onAlterTable(AlterTableEvent event) throws MetaException {
     }
   }
 
-  private GlueOutcome createOrUpdateDatabase(Database database) {
+  private String createOrUpdateDatabase(Database database) {
     try {
       glueDatabaseService.create(database);
-      return GlueOutcome.CREATED;
+      return MetricConstants.OUTCOME_CREATED;
     } catch (AlreadyExistsException e) {
       log.info("{} database already exists in glue, updating....", database.getName());
       glueDatabaseService.update(database);
-      return GlueOutcome.UPDATED;
+      return MetricConstants.OUTCOME_UPDATED;
     }
   }
 
-  private GlueOutcome createOrUpdateTable(Table table) {
+  private String createOrUpdateTable(Table table) {
     try {
       glueTableService.create(table);
-      return GlueOutcome.CREATED;
+      return MetricConstants.OUTCOME_CREATED;
     } catch (AlreadyExistsException e) {
       log.info("{} table already exists in glue, updating....", table.getTableName());
       glueTableService.update(table);
-      return GlueOutcome.UPDATED;
+      return MetricConstants.OUTCOME_UPDATED;
     }
   }
 
-  private GlueOutcome updateOrCreateTable(Table table) {
+  private String updateOrCreateTable(Table table) {
     try {
       glueTableService.update(table);
-      return GlueOutcome.UPDATED;
+      return MetricConstants.OUTCOME_UPDATED;
     } catch (EntityNotFoundException e) {
       log.info("{} table doesn't exist in glue, creating....", table.getTableName());
       glueTableService.create(table);
-      return GlueOutcome.CREATED;
+      return MetricConstants.OUTCOME_CREATED;
     }
   }
 
-  private GlueOutcome createOrUpdatePartition(Table table, Partition partition) {
+  private String createOrUpdatePartition(Table table, Partition partition) {
     try {
       gluePartitionService.create(table, partition);
-      return GlueOutcome.CREATED;
+      return MetricConstants.OUTCOME_CREATED;
     } catch (AlreadyExistsException e) {
       log.info("{} partition already exists in glue, updating....", partition);
       gluePartitionService.update(table, partition);
-      return GlueOutcome.UPDATED;
+      return MetricConstants.OUTCOME_UPDATED;
     }
   }
 
-  private GlueOutcome updateOrCreatePartition(Table table, Partition partition) {
+  private String updateOrCreatePartition(Table table, Partition partition) {
     try {
       gluePartitionService.update(table, partition);
-      return GlueOutcome.UPDATED;
+      return MetricConstants.OUTCOME_UPDATED;
     } catch (EntityNotFoundException e) {
       log.info("{} partition doesn't exist in glue, creating....", partition);
       gluePartitionService.create(table, partition);
-      return GlueOutcome.CREATED;
+      return MetricConstants.OUTCOME_CREATED;
     }
   }
 
@@ -316,9 +316,9 @@ public void onAddPartition(AddPartitionEvent event) throws MetaException {
     while (partitions.hasNext()) {
       Partition partition = partitions.next();
       try {
-        GlueOutcome outcome = createOrUpdatePartition(table, partition);
+        String outcome = createOrUpdatePartition(table, partition);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-        metricService.recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, outcome.name());
+        metricService.recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, outcome);
       } catch (Exception e) {
         log.error("Failed add partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
         metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
@@ -370,9 +370,9 @@ public void onAlterPartition(AlterPartitionEvent event) throws MetaException {
     Table table = event.getTable();
     Partition partition = event.getNewPartition();
     try {
-      GlueOutcome outcome = updateOrCreatePartition(table, partition);
+      String outcome = updateOrCreatePartition(table, partition);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-      metricService.recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_SUCCESS, outcome.name());
+      metricService.recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_SUCCESS, outcome);
     } catch (Exception e) {
       log.error("Failed alter partition on table {}.{} in glue", table.getDbName(), table.getTableName(), e);
       metricService.incrementCounter(MetricConstants.LISTENER_PARTITION_FAILURE);
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java
index bc1680fa..618181a7 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricConstants.java
@@ -38,6 +38,9 @@ public class MetricConstants {
   public static final String RESULT_FAILURE = "failure";
   public static final String RESULT_IGNORED = "ignored";
 
+  public static final String OUTCOME_CREATED = "created";
+  public static final String OUTCOME_UPDATED = "updated";
+
   public static final String CREATE_DATABASE = "create_database";
   public static final String DROP_DATABASE   = "drop_database";
   public static final String CREATE_TABLE    = "create_table";
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
index e6f0e3a1..cc04e51f 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
@@ -157,7 +157,7 @@ public void onCreateDatabase() throws MetaException {
 
     verify(glueClient).createDatabase(createDatabaseRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, "CREATED");
+    verify(metricService).recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_CREATED);
     CreateDatabaseRequest createDatabaseRequest = createDatabaseRequestCaptor.getValue();
 
     assertThat(createDatabaseRequest.getDatabaseInput().getName(), is(gluePrefix + dbName));
@@ -178,7 +178,7 @@ public void onCreateDatabaseThatAlreadyExists() throws MetaException {
     verify(glueClient).createDatabase(createDatabaseRequestCaptor.capture());
     verify(glueClient).updateDatabase(updateDatabaseRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_DATABASE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, "UPDATED");
+    verify(metricService).recordEvent(MetricConstants.CREATE_DATABASE, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_UPDATED);
     UpdateDatabaseRequest updateDatabaseRequest = updateDatabaseRequestCaptor.getValue();
 
     assertThat(updateDatabaseRequest.getName(), is(gluePrefix + dbName));
@@ -249,7 +249,7 @@ public void onCreateHiveTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "CREATED");
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_CREATED);
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -277,7 +277,7 @@ public void onCreateHiveTable_withIncorrectFormat() throws MetaException {
 
     verify(glueClient, times(2)).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "CREATED");
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_CREATED);
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -297,7 +297,7 @@ public void onCreateIcebergTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "CREATED");
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_CREATED);
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -324,7 +324,7 @@ public void onCreateHiveView() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "CREATED");
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_CREATED);
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -350,7 +350,7 @@ public void onAlterHiveTable() throws MetaException {
 
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "UPDATED");
+    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_UPDATED);
     UpdateTableRequest updateTableRequest = updateTableRequestCaptor.getValue();
 
     assertThat(updateTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -378,7 +378,7 @@ public void onAlterHiveTableSkipArchiveOverride() throws MetaException {
 
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "UPDATED");
+    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_UPDATED);
     UpdateTableRequest updateTableRequest = updateTableRequestCaptor.getValue();
 
     assertThat(updateTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -510,7 +510,7 @@ public void onCreateUnpartitionedHiveTable() throws MetaException {
 
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "CREATED");
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_CREATED);
     CreateTableRequest createTableRequest = createTableRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -545,7 +545,7 @@ public void onAddPartition_withIncorrectFormat() throws MetaException {
 
     verify(glueClient, times(2)).createPartition(createPartitionRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, "CREATED");
+    verify(metricService).recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_CREATED);
     CreatePartitionRequest createTableRequest = createPartitionRequestCaptor.getValue();
 
     assertThat(createTableRequest.getDatabaseName(), is(gluePrefix + dbName));
@@ -565,7 +565,7 @@ public void onCreateHiveTableThatAlreadyExists() throws MetaException {
     verify(glueClient).createTable(any());
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, "UPDATED");
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_UPDATED);
     assertThat(updateTableRequestCaptor.getValue().getDatabaseName(), is(gluePrefix + dbName));
     assertThat(updateTableRequestCaptor.getValue().getTableInput().getName(), is(tableName));
   }
@@ -584,7 +584,7 @@ public void onAlterHiveTableThatDoesntExistInGlue() throws MetaException {
     verify(glueClient).updateTable(any());
     verify(glueClient).createTable(createTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "CREATED");
+    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_CREATED);
     assertThat(createTableRequestCaptor.getValue().getDatabaseName(), is(gluePrefix + dbName));
     assertThat(createTableRequestCaptor.getValue().getTableInput().getName(), is(tableName));
   }
@@ -604,7 +604,7 @@ public void onAlterPartition() throws MetaException {
 
     verify(glueClient).updatePartition(updatePartitionRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_SUCCESS, "UPDATED");
+    verify(metricService).recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_UPDATED);
     assertThat(updatePartitionRequestCaptor.getValue().getDatabaseName(), is(gluePrefix + dbName));
     assertThat(updatePartitionRequestCaptor.getValue().getTableName(), is(tableName));
   }
@@ -626,7 +626,7 @@ public void onAlterPartitionThatDoesntExistInGlue() throws MetaException {
     verify(glueClient).updatePartition(any());
     verify(glueClient).createPartition(createPartitionRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_SUCCESS, "CREATED");
+    verify(metricService).recordEvent(MetricConstants.ALTER_PARTITION, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_CREATED);
     assertThat(createPartitionRequestCaptor.getValue().getDatabaseName(), is(gluePrefix + dbName));
     assertThat(createPartitionRequestCaptor.getValue().getTableName(), is(tableName));
   }
@@ -646,7 +646,7 @@ public void onAddPartition() throws MetaException {
 
     verify(glueClient).createPartition(createPartitionRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, "CREATED");
+    verify(metricService).recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_CREATED);
     assertThat(createPartitionRequestCaptor.getValue().getDatabaseName(), is(gluePrefix + dbName));
     assertThat(createPartitionRequestCaptor.getValue().getTableName(), is(tableName));
   }
@@ -668,7 +668,7 @@ public void onAddPartitionThatAlreadyExists() throws MetaException {
     verify(glueClient).createPartition(any());
     verify(glueClient).updatePartition(updatePartitionRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_PARTITION_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, "UPDATED");
+    verify(metricService).recordEvent(MetricConstants.ADD_PARTITION, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_UPDATED);
     assertThat(updatePartitionRequestCaptor.getValue().getDatabaseName(), is(gluePrefix + dbName));
     assertThat(updatePartitionRequestCaptor.getValue().getTableName(), is(tableName));
   }
@@ -823,7 +823,7 @@ public void onAlterIcebergTable_RenameTableSkipsRenameOperation() throws MetaExc
 
     verify(glueClient).updateTable(updateTableRequestCaptor.capture());
     verify(metricService).incrementCounter(MetricConstants.LISTENER_TABLE_SUCCESS);
-    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, "UPDATED");
+    verify(metricService).recordEvent(MetricConstants.ALTER_TABLE, MetricConstants.RESULT_SUCCESS, MetricConstants.OUTCOME_UPDATED);
     assertThat(updateTableRequestCaptor.getValue().getTableInput().getName(), is("table_renamed"));
     // rename operation (copy+delete) must not be triggered for Iceberg tables
     verify(glueClient, times(0)).deleteTable(any());

From 6f3b10eed3e4e5803da493ba3da2061276d3d2ab Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Fri, 19 Jun 2026 13:41:48 +0100
Subject: [PATCH 22/29] chore: update changelog for 8.1.19

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8f01c3b..297ccb65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## 8.1.19 - TBD
+### Added
+- `apiary-gluesync-listener`: per-event observability via a new `glue_listener_event` Micrometer counter, tagged with `operation` (e.g. `create_table`), `result` (`success`, `failure`, `ignored`), and `outcome` (e.g. `created`, `updated`, `deleted`, `not_found`, `renamed`, exception class name). Covers all 8 HMS event handlers. A `glue_listener_table_rename_duration` timer is also recorded on every table rename.
+- `kafka-metastore-receiver`: Kafka consumer metrics via Micrometer `KafkaClientMetrics`. Bind a registry at build time with `KafkaMessageReaderBuilder.withMeterRegistry(registry)`.
+### Fixed
+- `apiary-gluesync-listener`: fallback Glue operations (update-after-`AlreadyExistsException`, create-after-`EntityNotFoundException`) that previously escaped their catch blocks unhandled are now consistently caught, logged, and metered by the outer exception handler.
+### Changed
+- Bump Micrometer from `1.9.9` to `1.14.14`.
+
 ## 8.1.18 - 2026-06-09
 ### Fixed
 - `apiary-gluesync-listener`: glue sync metrics were silently dropped in HMS deployments; counters are now exported via JMX. In framework deployments (e.g. Dronefly/Spring Boot), metrics continue to flow to the existing registry (e.g. Prometheus) unchanged.

From 84e8fdb5d0d7e447e05a76ccd5918e2c9d87a1ff Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Fri, 19 Jun 2026 14:00:00 +0100
Subject: [PATCH 23/29] fix: replace List.of() with Arrays.asList() for Java 8
 compatibility

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../apiary/extensions/gluesync/listener/ApiaryGlueSync.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
index e44a437b..853486d3 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
@@ -17,6 +17,7 @@
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 
@@ -58,7 +59,7 @@ public class ApiaryGlueSync extends MetaStoreEventListener {
 
   // Order matters: subclasses must precede their superclass so isInstance() matches the most specific type first.
   // OperationTimeoutException and InvalidInputException both extend AmazonServiceException.
-  private static final List<Class<? extends Exception>> KNOWN_EXCEPTIONS = List.of(
+  private static final List<Class<? extends Exception>> KNOWN_EXCEPTIONS = Arrays.asList(
       OperationTimeoutException.class,
       InvalidInputException.class,
       AmazonServiceException.class

From 39f03150d5376167c1676ad8667c2453e95b2e57 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Fri, 19 Jun 2026 15:10:15 +0100
Subject: [PATCH 24/29] fix: use simple name string matching in toOutcome to
 survive Maven shade relocation

KNOWN_EXCEPTIONS used Class.isInstance() against class literals that don't match the
shaded runtime types (com.expediagroup.apiary.shaded.com.amazonaws.*). Walk the class
hierarchy using getSimpleName() instead so the outcome tag resolves correctly whether
or not the shade plugin has relocated the AWS SDK classes.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../gluesync/listener/ApiaryGlueSync.java     | 23 ++++++------
 .../gluesync/listener/ApiaryGlueSyncTest.java | 37 +++++++++++++++++++
 2 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
index 853486d3..23d99a55 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSync.java
@@ -38,13 +38,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.amazonaws.AmazonServiceException;
 import com.amazonaws.services.glue.AWSGlue;
 import com.amazonaws.services.glue.AWSGlueClientBuilder;
 import com.amazonaws.services.glue.model.AlreadyExistsException;
 import com.amazonaws.services.glue.model.EntityNotFoundException;
-import com.amazonaws.services.glue.model.InvalidInputException;
-import com.amazonaws.services.glue.model.OperationTimeoutException;
 
 import com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants;
 import com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricService;
@@ -57,12 +54,14 @@ public class ApiaryGlueSync extends MetaStoreEventListener {
 
   private static final Logger log = LoggerFactory.getLogger(ApiaryGlueSync.class);
 
-  // Order matters: subclasses must precede their superclass so isInstance() matches the most specific type first.
-  // OperationTimeoutException and InvalidInputException both extend AmazonServiceException.
-  private static final List<Class<? extends Exception>> KNOWN_EXCEPTIONS = Arrays.asList(
-      OperationTimeoutException.class,
-      InvalidInputException.class,
-      AmazonServiceException.class
+  // Simple names of AWS exception types to surface as outcome tags. Walking the class hierarchy
+  // from specific to general means subclasses (e.g. OperationTimeoutException) are matched before
+  // their superclass (AmazonServiceException) without relying on class literals, which break when
+  // the shade plugin relocates com.amazonaws.* to a shaded package at runtime.
+  private static final List<String> KNOWN_EXCEPTION_NAMES = Arrays.asList(
+      "OperationTimeoutException",
+      "InvalidInputException",
+      "AmazonServiceException"
   );
 
   private final AWSGlue glueClient;
@@ -385,10 +384,12 @@ public void onAlterPartition(AlterPartitionEvent event) throws MetaException {
   }
 
   private static String toOutcome(Exception e) {
-    for (Class<? extends Exception> type : KNOWN_EXCEPTIONS) {
-      if (type.isInstance(e)) {
+    Class<?> type = e.getClass();
+    while (type != null) {
+      if (KNOWN_EXCEPTION_NAMES.contains(type.getSimpleName())) {
         return type.getSimpleName();
       }
+      type = type.getSuperclass();
     }
     return "other";
   }
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
index cc04e51f..347ac736 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/ApiaryGlueSyncTest.java
@@ -72,6 +72,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import com.amazonaws.AmazonServiceException;
 import com.amazonaws.services.glue.AWSGlue;
 import com.amazonaws.services.glue.model.AlreadyExistsException;
 import com.amazonaws.services.glue.model.BatchCreatePartitionRequest;
@@ -791,6 +792,36 @@ public void onCreateTable_failureMetricsRecordedOnException() throws MetaExcepti
     verifyNoMoreInteractions(metricService);
   }
 
+  // KNOWN_EXCEPTION_NAMES holds simple class names (strings) rather than Class literals because the
+  // Maven shade plugin relocates com.amazonaws.* to com.expediagroup.apiary.shaded.com.amazonaws.*
+  // at runtime. Class.isInstance() against the original class literal would never match the shaded
+  // runtime type; getSimpleName() is package-agnostic and survives relocation.
+  @Test
+  public void toOutcome_awsSubclassNotInKnownList_matchesSuperclassName() throws MetaException {
+    // UnknownGlueException extends AmazonServiceException but is not in KNOWN_EXCEPTION_NAMES.
+    // The hierarchy walk should surface "AmazonServiceException" rather than "other".
+    CreateTableEvent event = mock(CreateTableEvent.class);
+    when(event.getStatus()).thenReturn(true);
+    when(event.getTable()).thenReturn(simpleHiveTable(simpleSchema(), simplePartitioning()));
+    when(glueClient.createTable(any())).thenThrow(new UnknownGlueException("unlisted AWS error"));
+
+    glueSync.onCreateTable(event);
+
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_FAILURE, "AmazonServiceException");
+  }
+
+  @Test
+  public void toOutcome_unknownException_returnsOther() throws MetaException {
+    CreateTableEvent event = mock(CreateTableEvent.class);
+    when(event.getStatus()).thenReturn(true);
+    when(event.getTable()).thenReturn(simpleHiveTable(simpleSchema(), simplePartitioning()));
+    when(glueClient.createTable(any())).thenThrow(new RuntimeException("unexpected"));
+
+    glueSync.onCreateTable(event);
+
+    verify(metricService).recordEvent(MetricConstants.CREATE_TABLE, MetricConstants.RESULT_FAILURE, "other");
+  }
+
   @Test
   public void onCreateTable_exceptionRethrownWhenThrowExceptionsEnabled() throws MetaException {
     ApiaryGlueSync throwingSync = new ApiaryGlueSync(configuration, glueClient, gluePrefix, metricService, true);
@@ -901,4 +932,10 @@ private GetDatabaseResult getGlueDatabaseResult(Map<String, String> params) {
     return new GetDatabaseResult().withDatabase(new com.amazonaws.services.glue.model.Database().withName(
         dbName).withParameters(params));
   }
+
+  private static class UnknownGlueException extends AmazonServiceException {
+    UnknownGlueException(String msg) {
+      super(msg);
+    }
+  }
 }

From fe9f09d6b5c3dcfd4f0f122d241dca0f783296ef Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Fri, 19 Jun 2026 16:37:59 +0100
Subject: [PATCH 25/29] feat: expose Micrometer tags as JMX ObjectName key
 properties via TaggedObjectNameFactory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replaces the default JmxMeterRegistry with one backed by a Dropwizard MetricRegistry and
a custom TaggedObjectNameFactory. taggedNameMapper() encodes tags into the Dropwizard
metric name as "name[key=value,...]"; TaggedObjectNameFactory then promotes those pairs
to real JMX ObjectName key properties so monitoring tools can filter by operation/result/outcome.

Performance characteristics:
- Registration cost is one-time per unique (operation, result, outcome) combination.
  After the first call, computeIfAbsent returns the cached Counter and the hot path is
  counter.increment() — a lock-free LongAdder.add(1). TaggedObjectNameFactory never
  touches the request thread again after initial registration.
- Cardinality is bounded: ~8 operations × 3 results × 3-5 outcomes ≤ 72 unique counters,
  all registered within the first minutes of steady-state traffic.
- recordEvent() is called inside the per-partition loop on onAddPartition/onDropPartition,
  where a single HMS event can carry hundreds of partitions. The string concat for the
  cache key allocates a small object per call, but computeIfAbsent hits the already-
  populated ConcurrentHashMap after the first call (hash lookup only). This is negligible
  compared to the synchronous Glue API call that precedes each partition operation.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../listener/metrics/MetricService.java       | 36 ++++++++++-
 .../metrics/TaggedObjectNameFactory.java      | 62 +++++++++++++++++++
 .../listener/metrics/MetricServiceTest.java   | 29 +++++++++
 .../metrics/TaggedObjectNameFactoryTest.java  | 58 +++++++++++++++++
 4 files changed, 184 insertions(+), 1 deletion(-)
 create mode 100644 hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/TaggedObjectNameFactory.java
 create mode 100644 hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/TaggedObjectNameFactoryTest.java

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
index 7c916ce0..dc758346 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
@@ -20,6 +20,7 @@
 import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.TAG_OUTCOME;
 import static com.expediagroup.apiary.extensions.gluesync.listener.metrics.MetricConstants.TAG_RESULT;
 
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
@@ -28,11 +29,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.jmx.JmxReporter;
+
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Metrics;
+import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Timer;
+import io.micrometer.core.instrument.util.HierarchicalNameMapper;
 import io.micrometer.jmx.JmxConfig;
 import io.micrometer.jmx.JmxMeterRegistry;
 
@@ -63,11 +69,39 @@ public MetricService() {
   // for its deployment context. Keep these two copies in sync manually.
   private static synchronized MeterRegistry configuredRegistry() {
     if (Metrics.globalRegistry.getRegistries().isEmpty()) {
-      Metrics.addRegistry(new JmxMeterRegistry(JmxConfig.DEFAULT, Clock.SYSTEM));
+      MetricRegistry dropwizardRegistry = new MetricRegistry();
+      JmxReporter reporter = JmxReporter.forRegistry(dropwizardRegistry)
+          .inDomain("metrics")
+          .createsObjectNamesWith(new TaggedObjectNameFactory())
+          .build();
+      Metrics.addRegistry(new JmxMeterRegistry(JmxConfig.DEFAULT, Clock.SYSTEM, taggedNameMapper(), dropwizardRegistry, reporter));
     }
     return Metrics.globalRegistry;
   }
 
+  // Encodes Micrometer tags as "name[key=value,key=value]" in the Dropwizard metric name so that
+  // TaggedObjectNameFactory can promote them to proper JMX ObjectName key properties.
+  static HierarchicalNameMapper taggedNameMapper() {
+    return (id, convention) -> {
+      String baseName = convention.name(id.getName(), id.getType(), id.getBaseUnit());
+      List<Tag> tags = id.getTags();
+      if (tags.isEmpty()) {
+        return baseName;
+      }
+      StringBuilder sb = new StringBuilder(baseName).append('[');
+      for (int i = 0; i < tags.size(); i++) {
+        Tag tag = tags.get(i);
+        if (i > 0) {
+          sb.append(',');
+        }
+        sb.append(convention.tagKey(tag.getKey()))
+            .append('=')
+            .append(convention.tagValue(tag.getValue()));
+      }
+      return sb.append(']').toString();
+    };
+  }
+
   public void incrementCounter(String name) {
     try {
       Counter counter = metrics.get(name);
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/TaggedObjectNameFactory.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/TaggedObjectNameFactory.java
new file mode 100644
index 00000000..2ab7b609
--- /dev/null
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/TaggedObjectNameFactory.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (C) 2018-2026 Expedia, Inc.
+ *
+ * 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.
+ */
+package com.expediagroup.apiary.extensions.gluesync.listener.metrics;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.codahale.metrics.jmx.ObjectNameFactory;
+
+/**
+ * Decodes tag key-value pairs encoded as {@code name[k=v,k=v]} by
+ * {@link MetricService#taggedNameMapper()} into proper JMX ObjectName key properties,
+ * so jmx-exporter can reference them as Prometheus labels without regex string-splitting.
+ *
+ * <p>Un-tagged metrics (no {@code [}) fall back to the standard
+ * {@code domain:name=<name>,type=<type>} ObjectName.
+ */
+class TaggedObjectNameFactory implements ObjectNameFactory {
+
+  private static final Logger log = LoggerFactory.getLogger(TaggedObjectNameFactory.class);
+
+  @Override
+  public ObjectName createName(String type, String domain, String name) {
+    int bracketIdx = name.indexOf('[');
+    try {
+      if (bracketIdx < 0) {
+        return new ObjectName(domain + ":name=" + name + ",type=" + type);
+      }
+      String baseName = name.substring(0, bracketIdx);
+      String tagStr = name.substring(bracketIdx + 1, name.length() - 1);
+      StringBuilder sb = new StringBuilder(domain).append(":name=").append(baseName);
+      for (String kv : tagStr.split(",")) {
+        sb.append(',').append(kv);
+      }
+      sb.append(",type=").append(type);
+      return new ObjectName(sb.toString());
+    } catch (MalformedObjectNameException e) {
+      log.warn("Could not create JMX ObjectName for metric '{}', falling back to quoted name", name, e);
+      try {
+        return new ObjectName(domain + ":name=" + ObjectName.quote(name) + ",type=" + type);
+      } catch (MalformedObjectNameException ex) {
+        throw new RuntimeException(ex);
+      }
+    }
+  }
+}
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricServiceTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricServiceTest.java
index e5987cdc..4057b394 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricServiceTest.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricServiceTest.java
@@ -27,6 +27,9 @@
 
 import org.junit.Test;
 
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.jmx.JmxReporter;
+
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
@@ -87,4 +90,30 @@ public void jmxRegistryExposesCountersAsMBeans() throws Exception {
 
     jmxRegistry.close();
   }
+
+  @Test
+  public void taggedEventCounterExposesTagsAsJmxKeyProperties() throws Exception {
+    MetricRegistry dropwizardRegistry = new MetricRegistry();
+    JmxReporter reporter = JmxReporter.forRegistry(dropwizardRegistry)
+        .inDomain("metrics")
+        .createsObjectNamesWith(new TaggedObjectNameFactory())
+        .build();
+    JmxMeterRegistry jmxRegistry = new JmxMeterRegistry(
+        JmxConfig.DEFAULT, Clock.SYSTEM,
+        MetricService.taggedNameMapper(), dropwizardRegistry, reporter);
+    MetricService metricService = new MetricService(jmxRegistry);
+
+    metricService.recordEvent("alter_table", "failure", "other");
+
+    MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+    Set<ObjectName> beans = mbs.queryNames(
+        new ObjectName("metrics:name=" + MetricConstants.LISTENER_EVENT + ",*"), null);
+    assertThat("expected exactly one event MBean", beans.size(), is(1));
+    ObjectName bean = beans.iterator().next();
+    assertThat(bean.getKeyProperty("operation"), is("alter_table"));
+    assertThat(bean.getKeyProperty("result"), is("failure"));
+    assertThat(bean.getKeyProperty("outcome"), is("other"));
+
+    jmxRegistry.close();
+  }
 }
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/TaggedObjectNameFactoryTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/TaggedObjectNameFactoryTest.java
new file mode 100644
index 00000000..29f8aa8b
--- /dev/null
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/TaggedObjectNameFactoryTest.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright (C) 2018-2026 Expedia, Inc.
+ *
+ * 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.
+ */
+package com.expediagroup.apiary.extensions.gluesync.listener.metrics;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+import javax.management.ObjectName;
+
+import org.junit.Test;
+
+public class TaggedObjectNameFactoryTest {
+
+  private final TaggedObjectNameFactory factory = new TaggedObjectNameFactory();
+
+  @Test
+  public void untaggedMetricProducesStandardObjectName() throws Exception {
+    ObjectName name = factory.createName("meters", "metrics", "glue_listener_table_failure");
+
+    assertThat(name.getDomain(), is("metrics"));
+    assertThat(name.getKeyProperty("name"), is("glue_listener_table_failure"));
+    assertThat(name.getKeyProperty("type"), is("meters"));
+  }
+
+  @Test
+  public void taggedMetricPromotesTagsToKeyProperties() throws Exception {
+    ObjectName name = factory.createName("meters", "metrics",
+        "glue_listener_event[operation=alter_table,outcome=other,result=failure]");
+
+    assertThat(name.getDomain(), is("metrics"));
+    assertThat(name.getKeyProperty("name"), is("glue_listener_event"));
+    assertThat(name.getKeyProperty("type"), is("meters"));
+    assertThat(name.getKeyProperty("operation"), is("alter_table"));
+    assertThat(name.getKeyProperty("outcome"), is("other"));
+    assertThat(name.getKeyProperty("result"), is("failure"));
+  }
+
+  @Test
+  public void untaggedMetricHasNoExtraKeyProperties() throws Exception {
+    ObjectName name = factory.createName("meters", "metrics", "glue_listener_table_success");
+
+    assertThat(name.getKeyProperty("operation"), is(nullValue()));
+  }
+}

From 5ce4c5d255901a9a31caa447f184d92f08857997 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Fri, 19 Jun 2026 16:51:10 +0100
Subject: [PATCH 26/29] docs: clarify configuredRegistry divergence between
 MetricService and KafkaMessageReader
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The two copies are no longer equivalent — MetricService now uses a Dropwizard-backed
JmxMeterRegistry with TaggedObjectNameFactory for tagged JMX ObjectName properties,
while KafkaMessageReader retains the plain JmxMeterRegistry. Updated comments to
reflect the intentional difference and drop the stale "keep in sync" instruction.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../metastore/kafka/messaging/KafkaMessageReader.java | 11 ++++++-----
 .../gluesync/listener/metrics/MetricService.java      |  9 +++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
index 9bd7e320..41e38788 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
@@ -152,11 +152,12 @@ public KafkaMessageReader build() {
       return new KafkaMessageReader(topicName, metaStoreEventSerDe, props, registry);
     }
 
-    // DO NOT extract to a shared utility. MetricService in apiary-gluesync-listener contains an
-    // identical copy, but that module shades and relocates micrometer-jmx because it runs inside
-    // HMS (classpath conflicts). Shading breaks Spring Boot auto-configuration, so each
-    // module must own this method and use the correct (shaded or unshaded) JmxMeterRegistry for
-    // its deployment context. Keep these two copies in sync manually.
+    // DO NOT extract to a shared utility. MetricService in apiary-gluesync-listener has a
+    // similar method, but the two implementations intentionally differ: that module shades and
+    // relocates micrometer-jmx for HMS classpath isolation, and uses a Dropwizard-backed
+    // JmxMeterRegistry with TaggedObjectNameFactory for tagged JMX ObjectName properties. This
+    // module runs outside HMS and uses a plain JmxMeterRegistry without tag promotion.
+    // Each module must own its own copy.
     private static synchronized MeterRegistry configuredRegistry() {
       if (Metrics.globalRegistry.getRegistries().isEmpty()) {
         log.info("No MeterRegistry found; registering JmxMeterRegistry for Kafka consumer metrics");
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
index dc758346..8208bfbf 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
@@ -63,10 +63,11 @@ public MetricService() {
   }
 
   // DO NOT extract to a shared utility. KafkaMessageReaderBuilder in kafka-metastore-receiver
-  // contains an identical copy, but this module shades and relocates micrometer-jmx because it
-  // runs inside HMS (classpath conflicts). Shading breaks Spring Boot auto-configuration,
-  // so each module must own this method and use the correct (shaded or unshaded) JmxMeterRegistry
-  // for its deployment context. Keep these two copies in sync manually.
+  // has a similar method, but the two implementations intentionally differ: this module shades
+  // and relocates micrometer-jmx for HMS classpath isolation, and uses a Dropwizard-backed
+  // JmxMeterRegistry with TaggedObjectNameFactory to promote Micrometer tags to proper JMX
+  // ObjectName key properties. KafkaMessageReaderBuilder runs outside HMS and uses a plain
+  // JmxMeterRegistry without tag promotion. Each module must own its own copy.
   private static synchronized MeterRegistry configuredRegistry() {
     if (Metrics.globalRegistry.getRegistries().isEmpty()) {
       MetricRegistry dropwizardRegistry = new MetricRegistry();

From bd07cc6599398a4eff8a73bf06c969a941ed1e55 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Tue, 23 Jun 2026 14:03:08 +0100
Subject: [PATCH 27/29] chore: reorder imports in MetricService and
 MetricServiceTest

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../extensions/gluesync/listener/metrics/MetricService.java | 6 +++---
 .../gluesync/listener/metrics/MetricServiceTest.java        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
index 8208bfbf..4caa0080 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/main/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricService.java
@@ -29,9 +29,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.jmx.JmxReporter;
-
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -42,6 +39,9 @@
 import io.micrometer.jmx.JmxConfig;
 import io.micrometer.jmx.JmxMeterRegistry;
 
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.jmx.JmxReporter;
+
 public class MetricService {
 
   private static final Logger log = LoggerFactory.getLogger(MetricService.class);
diff --git a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricServiceTest.java b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricServiceTest.java
index 4057b394..2464887c 100644
--- a/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricServiceTest.java
+++ b/hive-event-listeners/apiary-gluesync-listener/src/test/java/com/expediagroup/apiary/extensions/gluesync/listener/metrics/MetricServiceTest.java
@@ -27,15 +27,15 @@
 
 import org.junit.Test;
 
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.jmx.JmxReporter;
-
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
 import io.micrometer.jmx.JmxConfig;
 import io.micrometer.jmx.JmxMeterRegistry;
 
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.jmx.JmxReporter;
+
 public class MetricServiceTest {
 
   @Test

From 3cbe1320be3cc86bfbdbbcffa3ab0a1dc63d97f7 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Tue, 23 Jun 2026 14:35:35 +0100
Subject: [PATCH 28/29] chore: log existing registry when skipping
 JmxMeterRegistry in KafkaMessageReader

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../events/metastore/kafka/messaging/KafkaMessageReader.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
index 41e38788..a2367171 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/src/main/java/com/expediagroup/apiary/extensions/events/metastore/kafka/messaging/KafkaMessageReader.java
@@ -162,6 +162,8 @@ private static synchronized MeterRegistry configuredRegistry() {
       if (Metrics.globalRegistry.getRegistries().isEmpty()) {
         log.info("No MeterRegistry found; registering JmxMeterRegistry for Kafka consumer metrics");
         Metrics.addRegistry(new JmxMeterRegistry(JmxConfig.DEFAULT, Clock.SYSTEM));
+      } else {
+        log.info("Using existing MeterRegistry for Kafka consumer metrics: {}", Metrics.globalRegistry);
       }
       return Metrics.globalRegistry;
     }

From 4c9b9e98cd33af546ae29a677870e0ed75657f38 Mon Sep 17 00:00:00 2001
From: James Faulkner <jamespfaulkner@gmail.com>
Date: Tue, 23 Jun 2026 15:06:29 +0100
Subject: [PATCH 29/29] chore: bump version to 8.2.0-SNAPSHOT

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 CHANGELOG.md                                                    | 2 +-
 apiary-metastore-events/apiary-hive-events/pom.xml              | 2 +-
 .../kafka-metastore-integration-tests/pom.xml                   | 2 +-
 .../kafka-metastore-events/kafka-metastore-listener/pom.xml     | 2 +-
 .../kafka-metastore-events/kafka-metastore-receiver/pom.xml     | 2 +-
 apiary-metastore-events/kafka-metastore-events/pom.xml          | 2 +-
 apiary-metastore-events/pom.xml                                 | 2 +-
 .../metastore-consumer-common/pom.xml                           | 2 +-
 .../sns-metastore-events/apiary-metastore-consumers/pom.xml     | 2 +-
 .../apiary-metastore-consumers/privileges-grantor/pom.xml       | 2 +-
 .../privileges-grantor/privileges-grantor-core/pom.xml          | 2 +-
 .../privileges-grantor/privileges-grantor-lambda/pom.xml        | 2 +-
 .../sns-metastore-events/apiary-metastore-listener/pom.xml      | 2 +-
 .../apiary-receivers/apiary-receiver-common/pom.xml             | 2 +-
 .../apiary-receivers/apiary-receiver-sqs/pom.xml                | 2 +-
 .../sns-metastore-events/apiary-receivers/pom.xml               | 2 +-
 apiary-metastore-events/sns-metastore-events/pom.xml            | 2 +-
 apiary-metastore-metrics/pom.xml                                | 2 +-
 hive-event-listeners/apiary-gluesync-listener/pom.xml           | 2 +-
 hive-event-listeners/apiary-metastore-auth/pom.xml              | 2 +-
 hive-event-listeners/apiary-ranger-metastore-plugin/pom.xml     | 2 +-
 hive-event-listeners/pom.xml                                    | 2 +-
 hive-hooks/pom.xml                                              | 2 +-
 pom.xml                                                         | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 297ccb65..d75f04cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## 8.1.19 - TBD
+## 8.2.0 - TBD
 ### Added
 - `apiary-gluesync-listener`: per-event observability via a new `glue_listener_event` Micrometer counter, tagged with `operation` (e.g. `create_table`), `result` (`success`, `failure`, `ignored`), and `outcome` (e.g. `created`, `updated`, `deleted`, `not_found`, `renamed`, exception class name). Covers all 8 HMS event handlers. A `glue_listener_table_rename_duration` timer is also recorded on every table rename.
 - `kafka-metastore-receiver`: Kafka consumer metrics via Micrometer `KafkaClientMetrics`. Bind a registry at build time with `KafkaMessageReaderBuilder.withMeterRegistry(registry)`.
diff --git a/apiary-metastore-events/apiary-hive-events/pom.xml b/apiary-metastore-events/apiary-hive-events/pom.xml
index 59146dee..dfa22fd2 100644
--- a/apiary-metastore-events/apiary-hive-events/pom.xml
+++ b/apiary-metastore-events/apiary-hive-events/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>apiary-metastore-events-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apiary-hive-events</artifactId>
diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-integration-tests/pom.xml b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-integration-tests/pom.xml
index 59115fa1..eb442755 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-integration-tests/pom.xml
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-integration-tests/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>kafka-metastore-events-parent</artifactId>
     <groupId>com.expediagroup.apiary</groupId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kafka-metastore-integration-tests</artifactId>
diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-listener/pom.xml b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-listener/pom.xml
index 715e86ae..96e7cf78 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-listener/pom.xml
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-listener/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>kafka-metastore-events-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kafka-metastore-listener</artifactId>
diff --git a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/pom.xml b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/pom.xml
index 968aa915..4dc1d3ed 100644
--- a/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/pom.xml
+++ b/apiary-metastore-events/kafka-metastore-events/kafka-metastore-receiver/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>kafka-metastore-events-parent</artifactId>
     <groupId>com.expediagroup.apiary</groupId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kafka-metastore-receiver</artifactId>
diff --git a/apiary-metastore-events/kafka-metastore-events/pom.xml b/apiary-metastore-events/kafka-metastore-events/pom.xml
index 266ee69d..66e16569 100644
--- a/apiary-metastore-events/kafka-metastore-events/pom.xml
+++ b/apiary-metastore-events/kafka-metastore-events/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>apiary-metastore-events-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>kafka-metastore-events-parent</artifactId>
diff --git a/apiary-metastore-events/pom.xml b/apiary-metastore-events/pom.xml
index e94857d6..af761b37 100644
--- a/apiary-metastore-events/pom.xml
+++ b/apiary-metastore-events/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>apiary-extensions-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apiary-metastore-events-parent</artifactId>
diff --git a/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/metastore-consumer-common/pom.xml b/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/metastore-consumer-common/pom.xml
index 31c787e5..d2b504cd 100644
--- a/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/metastore-consumer-common/pom.xml
+++ b/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/metastore-consumer-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>apiary-metastore-consumers-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>metastore-consumer-common</artifactId>
diff --git a/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/pom.xml b/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/pom.xml
index 7d5964ea..f51bcb86 100644
--- a/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/pom.xml
+++ b/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>sns-metastore-events-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apiary-metastore-consumers-parent</artifactId>
diff --git a/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/privileges-grantor/pom.xml b/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/privileges-grantor/pom.xml
index c12881a6..1901662b 100644
--- a/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/privileges-grantor/pom.xml
+++ b/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/privileges-grantor/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>apiary-metastore-consumers-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apiary-privileges-grantor-parent</artifactId>
diff --git a/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/privileges-grantor/privileges-grantor-core/pom.xml b/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/privileges-grantor/privileges-grantor-core/pom.xml
index 5c6dafb4..8b3d18d7 100644
--- a/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/privileges-grantor/privileges-grantor-core/pom.xml
+++ b/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/privileges-grantor/privileges-grantor-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>apiary-privileges-grantor-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apiary-privileges-grantor-core</artifactId>
diff --git a/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/privileges-grantor/privileges-grantor-lambda/pom.xml b/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/privileges-grantor/privileges-grantor-lambda/pom.xml
index 1aa7fdb8..26babf9c 100644
--- a/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/privileges-grantor/privileges-grantor-lambda/pom.xml
+++ b/apiary-metastore-events/sns-metastore-events/apiary-metastore-consumers/privileges-grantor/privileges-grantor-lambda/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>apiary-privileges-grantor-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apiary-privileges-grantor-lambda</artifactId>
diff --git a/apiary-metastore-events/sns-metastore-events/apiary-metastore-listener/pom.xml b/apiary-metastore-events/sns-metastore-events/apiary-metastore-listener/pom.xml
index 993a4171..3ebe8379 100644
--- a/apiary-metastore-events/sns-metastore-events/apiary-metastore-listener/pom.xml
+++ b/apiary-metastore-events/sns-metastore-events/apiary-metastore-listener/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>sns-metastore-events-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apiary-metastore-listener</artifactId>
diff --git a/apiary-metastore-events/sns-metastore-events/apiary-receivers/apiary-receiver-common/pom.xml b/apiary-metastore-events/sns-metastore-events/apiary-receivers/apiary-receiver-common/pom.xml
index 18f9f9de..5447611a 100644
--- a/apiary-metastore-events/sns-metastore-events/apiary-receivers/apiary-receiver-common/pom.xml
+++ b/apiary-metastore-events/sns-metastore-events/apiary-receivers/apiary-receiver-common/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>apiary-receivers-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apiary-receiver-common</artifactId>
diff --git a/apiary-metastore-events/sns-metastore-events/apiary-receivers/apiary-receiver-sqs/pom.xml b/apiary-metastore-events/sns-metastore-events/apiary-receivers/apiary-receiver-sqs/pom.xml
index a60877a5..bf13ddfe 100644
--- a/apiary-metastore-events/sns-metastore-events/apiary-receivers/apiary-receiver-sqs/pom.xml
+++ b/apiary-metastore-events/sns-metastore-events/apiary-receivers/apiary-receiver-sqs/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>apiary-receivers-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apiary-receiver-sqs</artifactId>
diff --git a/apiary-metastore-events/sns-metastore-events/apiary-receivers/pom.xml b/apiary-metastore-events/sns-metastore-events/apiary-receivers/pom.xml
index d2ed2eba..e5d8a643 100644
--- a/apiary-metastore-events/sns-metastore-events/apiary-receivers/pom.xml
+++ b/apiary-metastore-events/sns-metastore-events/apiary-receivers/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>sns-metastore-events-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apiary-receivers-parent</artifactId>
diff --git a/apiary-metastore-events/sns-metastore-events/pom.xml b/apiary-metastore-events/sns-metastore-events/pom.xml
index 37b5fbd4..36b09fd8 100644
--- a/apiary-metastore-events/sns-metastore-events/pom.xml
+++ b/apiary-metastore-events/sns-metastore-events/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>apiary-metastore-events-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>sns-metastore-events-parent</artifactId>
diff --git a/apiary-metastore-metrics/pom.xml b/apiary-metastore-metrics/pom.xml
index 361a628e..d55bff51 100644
--- a/apiary-metastore-metrics/pom.xml
+++ b/apiary-metastore-metrics/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>apiary-extensions-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apiary-metastore-metrics</artifactId>
diff --git a/hive-event-listeners/apiary-gluesync-listener/pom.xml b/hive-event-listeners/apiary-gluesync-listener/pom.xml
index 3b468594..62a0355d 100644
--- a/hive-event-listeners/apiary-gluesync-listener/pom.xml
+++ b/hive-event-listeners/apiary-gluesync-listener/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>hive-event-listeners-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>apiary-gluesync-listener</artifactId>
   <name>Apiary GlueSync Listener</name>
diff --git a/hive-event-listeners/apiary-metastore-auth/pom.xml b/hive-event-listeners/apiary-metastore-auth/pom.xml
index d8a75e83..44ba5956 100644
--- a/hive-event-listeners/apiary-metastore-auth/pom.xml
+++ b/hive-event-listeners/apiary-metastore-auth/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>hive-event-listeners-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apiary-metastore-auth</artifactId>
diff --git a/hive-event-listeners/apiary-ranger-metastore-plugin/pom.xml b/hive-event-listeners/apiary-ranger-metastore-plugin/pom.xml
index 34a77696..8dc93400 100644
--- a/hive-event-listeners/apiary-ranger-metastore-plugin/pom.xml
+++ b/hive-event-listeners/apiary-ranger-metastore-plugin/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.expediagroup.apiary</groupId>
     <artifactId>hive-event-listeners-parent</artifactId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apiary-ranger-metastore-plugin</artifactId>
diff --git a/hive-event-listeners/pom.xml b/hive-event-listeners/pom.xml
index 69772d3b..977404a0 100644
--- a/hive-event-listeners/pom.xml
+++ b/hive-event-listeners/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>apiary-extensions-parent</artifactId>
     <groupId>com.expediagroup.apiary</groupId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>hive-event-listeners-parent</artifactId>
diff --git a/hive-hooks/pom.xml b/hive-hooks/pom.xml
index 769a70fb..d7bac07b 100644
--- a/hive-hooks/pom.xml
+++ b/hive-hooks/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>apiary-extensions-parent</artifactId>
     <groupId>com.expediagroup.apiary</groupId>
-    <version>8.1.19-SNAPSHOT</version>
+    <version>8.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>hive-hooks</artifactId>
diff --git a/pom.xml b/pom.xml
index 114ddbfe..12c031ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
   <groupId>com.expediagroup.apiary</groupId>
   <artifactId>apiary-extensions-parent</artifactId>
   <description>Various extensions to Apiary that provide additional, optional functionality</description>
-  <version>8.1.19-SNAPSHOT</version>
+  <version>8.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apiary Extensions</name>
   <inceptionYear>2018</inceptionYear>