Remove varz shim from metron

[#92719926]

Signed-off-by: John Tuley <jtuley@pivotal.io>

src/integration_tests/metron/varz_healthz_test.go

@@ -60,32 +60,6 @@ var _ = Describe("/varz endpoint", func() {
 			return getMetricFromContext(agentListenerContext, "receivedMessageCount").Value
 		}).Should(BeNumerically(">=", expectedValue))
 	})
-
-	It("includes value metrics from sources", func() {
-		connection, _ := net.Dial("udp", "localhost:51161")
-		connection.Write(basicValueMessage())
-
-		Eventually(func() *instrumentation.Context { return getContext("forwarder") }).ShouldNot(BeNil())
-
-		metric := getMetricFromContext(getContext("forwarder"), "fake-origin-2.fake-metric-name")
-		Expect(metric).ToNot(BeNil())
-		Expect(metric.Name).To(Equal("fake-origin-2.fake-metric-name"))
-		Expect(metric.Value).To(BeNumerically("==", 42))
-		Expect(metric.Tags["component"]).To(Equal("test-component"))
-	})
-
-	It("includes counter event metrics from sources", func() {
-		connection, _ := net.Dial("udp", "localhost:51161")
-		connection.Write(basicCounterEventMessage())
-		connection.Write(basicCounterEventMessage())
-
-		Eventually(func() *instrumentation.Context { return getContext("forwarder") }).ShouldNot(BeNil())
-
-		metric := getMetricFromContext(getContext("forwarder"), "fake-origin-2.fake-counter-event-name")
-		Expect(metric.Name).To(Equal("fake-origin-2.fake-counter-event-name"))
-		Expect(metric.Value).To(BeNumerically("==", 2))
-		Expect(metric.Tags["component"]).To(Equal("test-component"))
-	})
 })
 
 var _ = Describe("/healthz", func() {

src/metron/main.go

@@ -13,7 +13,6 @@ import (
 	"metron/writers/messageaggregator"
 	"metron/writers/signer"
 	"metron/writers/tagger"
-	"metron/writers/varzforwarder"
 
 	"github.com/cloudfoundry/gosteno"
 	"github.com/cloudfoundry/gunk/workpool"
@@ -34,8 +33,6 @@ var (
 	debug          = flag.Bool("debug", false, "Debug logging")
 )
 
-var metricTTL = time.Second * 5
-
 func main() {
 	flag.Parse()
 	config, logger := parseConfig(*debug, *configFilePath, *logFilePath)
@@ -45,8 +42,7 @@ func main() {
 	dopplerForwarder := dopplerforwarder.New(dopplerClientPool, logger)
 	byteSigner := signer.New(config.SharedSecret, dopplerForwarder)
 	marshaller := eventmarshaller.New(byteSigner, logger)
-	varzShim := varzforwarder.New(config.Job, metricTTL, marshaller, logger)
-	messageTagger := tagger.New(config.Deployment, config.Job, config.Index, varzShim)
+	messageTagger := tagger.New(config.Deployment, config.Job, config.Index, marshaller)
 	aggregator := messageaggregator.New(messageTagger, logger)
 
 	dropsondeUnmarshaller := eventunmarshaller.New(aggregator, logger)
@@ -62,7 +58,6 @@ func main() {
 		legacyUnmarshaller,
 		dropsondeUnmarshaller,
 		aggregator,
-		varzShim,
 		marshaller,
 	}