Change component:dea to component:app

collector/lib/collector/handlers/router.rb

@@ -12,11 +12,11 @@ def process(context)
         varz["tags"].each do |key, values|
           values.each do |value, metrics|
             if key == "component" && value.start_with?("dea-")
-
-              # Sorry for this gem. We want to grab the DEA's number instead of its guid
-              # i.e. dea-1-deadbeef should be parsed out to 1. The dea- is there by convention
+              # dea_id looks like "dea-1", "dea-2", etc
               dea_id = value.split("-")[1]
-              tags = {:component => "dea", :dea_index => dea_id }
+
+              # These are app requests, not requests to the dea. So we change the component to "app".
+              tags = {:component => "app", :dea_index => dea_id }
             else
               tags = {key => value}
             end

collector/spec/unit/collector/handlers/router_spec.rb

@@ -137,7 +137,7 @@ def has_sent_data?(key, value, tags={})
       it "sends metrics tagged with component:dea and dea_index:x" do
         varz['tags']['component']['dea-2'] = component
 
-        tags = {:component => "dea", :dea_index => "2"}
+        tags = {:component => "app", :dea_index => "2"}
 
         handler.process(context)
         historian.should have_sent_data("router.requests", 2400, tags)