From 209430a038221f615e5840b0423f4ee312d06bf5 Mon Sep 17 00:00:00 2001
From: Deklan Dieterly <deklan.dieterly@hp.com>
Date: Fri, 7 Mar 2014 08:57:54 -0700
Subject: [PATCH] Warn if not tenantId found.

---
 .../disruptor/event/MetricMessageEventHandler.java   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/hpcloud/disruptor/event/MetricMessageEventHandler.java b/src/main/java/com/hpcloud/disruptor/event/MetricMessageEventHandler.java
index 2045a9f6..8d4ea42e 100644
--- a/src/main/java/com/hpcloud/disruptor/event/MetricMessageEventHandler.java
+++ b/src/main/java/com/hpcloud/disruptor/event/MetricMessageEventHandler.java
@@ -23,6 +23,7 @@ import java.util.concurrent.TimeUnit;
 public class MetricMessageEventHandler implements EventHandler<MetricMessageEvent> {
 
     private static final Logger logger = LoggerFactory.getLogger(MetricMessageEventHandler.class);
+    private static final String TENANT_ID = "tenantId";
 
     private final int ordinal;
     private final int numProcessors;
@@ -69,9 +70,16 @@ public class MetricMessageEventHandler implements EventHandler<MetricMessageEven
 
         MetricMessage metricMessage = metricMessageEvent.getMetricEnvelope().metric;
         Map<String, Object> meta = metricMessageEvent.getMetricEnvelope().meta;
-        String tenantId = (String) meta.get("tenantId");
+        String tenantId = "";
+        if (!meta.containsKey(TENANT_ID)) {
+            logger.warn("Failed to find 'tenantId' in message envelope meta data. Metric message may be mal-formed. Setting 'tenantId' to empty string.");
+            logger.warn(metricMessage.toString());
+            logger.warn("meta" + meta.toString());
+        } else {
+            tenantId = (String) meta.get(TENANT_ID);
+        }
 
-        String stringToHash = metricMessage.getName() + metricMessage.getRegion();
+        String stringToHash = metricMessage.getName() + tenantId + metricMessage.getRegion();
         if (metricMessage.getDimensions() != null) {
             for (String name : metricMessage.getDimensions().keySet()) {
                 String val = metricMessage.getDimensions().get(name);