fix exploration sink data, it is on a different endpoint

Author: featheredtoast

Companion/exporter/exporter.go

@@ -29,7 +29,6 @@ func NewPrometheusExporter(frmApiHosts []string) *PrometheusExporter {
 	collectorRunners := []*CollectorRunner{}
 
 	for _, frmApiHost := range frmApiHosts {
-		//TODO: missing extractors!!!!
 		productionCollector := NewProductionCollector("/getProdStats")
 		powerCollector := NewPowerCollector("/getPower")
 		buildingCollector := NewFactoryBuildingCollector("/getFactory")
@@ -38,7 +37,7 @@ func NewPrometheusExporter(frmApiHosts []string) *PrometheusExporter {
 		vehicleStationCollector := NewVehicleStationCollector("/getTruckStation")
 		trainCollector := NewTrainCollector("/getTrains")
 		trainStationCollector := NewTrainStationCollector("/getTrainStation")
-		resourceSinkCollector := NewResourceSinkCollector("/getResourceSinkBuilding", "/getResourceSink")
+		resourceSinkCollector := NewResourceSinkCollector("/getResourceSinkBuilding", "/getResourceSink", "/getExplorationSink")
 		pumpCollector := NewPumpCollector("/getPump")
 		extractorCollector := NewExtractorCollector("/getExtractor")
 		portalCollector := NewPortalCollector("/getPortal")

Companion/exporter/frm_server_fake_test.go

@@ -9,23 +9,24 @@ import (
 )
 
 type FRMServerFake struct {
-	server                *httptest.Server
-	productionData        []exporter.ProductionDetails
-	powerData             []exporter.PowerDetails
-	factoryBuildings      []exporter.BuildingDetail
-	vehicleData           []exporter.VehicleDetails
-	trainData             []exporter.TrainDetails
-	droneData             []exporter.DroneStationDetails
-	vehicleStationData    []exporter.VehicleStationDetails
-	trainStationData      []exporter.TrainStationDetails
-	resourceSinkData      []exporter.ResourceSinkDetails
-	gloalResourceSinkData []exporter.ResourceSinkGlobalDetails
-	sessionInfoData       exporter.SessionInfo
-	pumpData              []exporter.PumpDetails
-	extractorData         []exporter.ExtractorDetails
-	portalData            []exporter.PortalDetails
-	hypertubeData         []exporter.HypertubeDetails
-	frackingData          []exporter.FrackingDetails
+	server                   *httptest.Server
+	productionData           []exporter.ProductionDetails
+	powerData                []exporter.PowerDetails
+	factoryBuildings         []exporter.BuildingDetail
+	vehicleData              []exporter.VehicleDetails
+	trainData                []exporter.TrainDetails
+	droneData                []exporter.DroneStationDetails
+	vehicleStationData       []exporter.VehicleStationDetails
+	trainStationData         []exporter.TrainStationDetails
+	resourceSinkData         []exporter.ResourceSinkDetails
+	gloalResourceSinkData    []exporter.GlobalSinkDetails
+	gloalExplorationSinkData []exporter.GlobalSinkDetails
+	sessionInfoData          exporter.SessionInfo
+	pumpData                 []exporter.PumpDetails
+	extractorData            []exporter.ExtractorDetails
+	portalData               []exporter.PortalDetails
+	hypertubeData            []exporter.HypertubeDetails
+	frackingData             []exporter.FrackingDetails
 }
 
 func NewFRMServerFake() *FRMServerFake {
@@ -45,6 +46,7 @@ func NewFRMServerFake() *FRMServerFake {
 	mux.Handle("/getTruckStation", http.HandlerFunc(getStatsHandler(&fake.vehicleStationData)))
 	mux.Handle("/getTrainStation", http.HandlerFunc(getStatsHandler(&fake.trainStationData)))
 	mux.Handle("/getResourceSink", http.HandlerFunc(getStatsHandler(&fake.gloalResourceSinkData)))
+	mux.Handle("/getExplorationSink", http.HandlerFunc(getStatsHandler(&fake.gloalExplorationSinkData)))
 	mux.Handle("/getResourceSinkBuilding", http.HandlerFunc(getStatsHandler(&fake.resourceSinkData)))
 	mux.Handle("/getSessionInfo", http.HandlerFunc(getStatsHandler(&fake.sessionInfoData)))
 	mux.Handle("/getPump", http.HandlerFunc(getStatsHandler(&fake.pumpData)))
@@ -106,10 +108,14 @@ func (e *FRMServerFake) ReturnsResourceSinkData(data []exporter.ResourceSinkDeta
 	e.resourceSinkData = data
 }
 
-func (e *FRMServerFake) ReturnsGlobalResourceSinkData(data []exporter.ResourceSinkGlobalDetails) {
+func (e *FRMServerFake) ReturnsGlobalResourceSinkData(data []exporter.GlobalSinkDetails) {
 	e.gloalResourceSinkData = data
 }
 
+func (e *FRMServerFake) ReturnsGlobalExplorationSinkData(data []exporter.GlobalSinkDetails) {
+	e.gloalExplorationSinkData = data
+}
+
 func (e *FRMServerFake) ReturnsPumpData(data []exporter.PumpDetails) {
 	e.pumpData = data
 }

Companion/exporter/resource_sink_collector.go

@@ -6,26 +6,28 @@ import (
 )
 
 type ResourceSinkCollector struct {
-	buildingEndpoint string
-	globalEndpoint   string
+	buildingEndpoint       string
+	globalResourceEndpoint string
+	globalExplorationEndpoint  string
 }
 
 type ResourceSinkDetails struct {
 	Location  Location  `json:"location"`
 	PowerInfo PowerInfo `json:"PowerInfo"`
 }
 
-type ResourceSinkGlobalDetails struct {
+type GlobalSinkDetails struct {
 	SinkType       string `json:"Name"`
 	NumCoupon      int    `json:"NumCoupon"`
 	TotalPoints    int    `json:"TotalPoints"`
 	PointsToCoupon int    `json:"PointsToCoupon"`
 }
 
-func NewResourceSinkCollector(buildingEndpoint, globalEndpoint string) *ResourceSinkCollector {
+func NewResourceSinkCollector(buildingEndpoint, globalResourceEndpoint, globalExplorationEndpoint string) *ResourceSinkCollector {
 	return &ResourceSinkCollector{
-		buildingEndpoint: buildingEndpoint,
-		globalEndpoint:   globalEndpoint,
+		buildingEndpoint:       buildingEndpoint,
+		globalResourceEndpoint: globalResourceEndpoint,
+		globalExplorationEndpoint:  globalExplorationEndpoint,
 	}
 }
 
@@ -37,19 +39,31 @@ func (c *ResourceSinkCollector) Collect(frmAddress string, sessionName string) {
 		return
 	}
 
-	globalDetails := []ResourceSinkGlobalDetails{}
-	err = retrieveData(frmAddress+c.globalEndpoint, &globalDetails)
+	globalResourceDetails := []GlobalSinkDetails{}
+	err = retrieveData(frmAddress+c.globalResourceEndpoint, &globalResourceDetails)
 	if err != nil {
 		log.Printf("error reading global resource sink statistics from FRM: %s\n", err)
 		return
 	}
 
-	for _, d := range globalDetails {
+	for _, d := range globalResourceDetails {
 		ResourceSinkTotalPoints.WithLabelValues(d.SinkType, frmAddress, sessionName).Set(float64(d.TotalPoints))
 		ResourceSinkPointsToCoupon.WithLabelValues(d.SinkType, frmAddress, sessionName).Set(float64(d.PointsToCoupon))
 		ResourceSinkCollectedCoupons.WithLabelValues(frmAddress, sessionName).Set(float64(d.NumCoupon))
 	}
 
+	globalExplorationDetails := []GlobalSinkDetails{}
+	err = retrieveData(frmAddress+c.globalExplorationEndpoint, &globalExplorationDetails)
+	if err != nil {
+		log.Printf("error reading global resource sink statistics from FRM: %s\n", err)
+		return
+	}
+
+	for _, d := range globalExplorationDetails {
+		ResourceSinkTotalPoints.WithLabelValues(d.SinkType, frmAddress, sessionName).Set(float64(d.TotalPoints))
+		ResourceSinkPointsToCoupon.WithLabelValues(d.SinkType, frmAddress, sessionName).Set(float64(d.PointsToCoupon))
+	}
+
 	powerInfo := map[float64]float64{}
 	maxPowerInfo := map[float64]float64{}
 	for _, d := range buildingDetails {

Companion/exporter/resource_sink_collector_test.go

@@ -14,7 +14,7 @@ var _ = Describe("ResourceSinkCollector", func() {
 	BeforeEach(func() {
 		FRMServer.Reset()
 		url = FRMServer.server.URL
-		collector = exporter.NewResourceSinkCollector("/getResourceSinkBuilding", "/getResourceSink")
+		collector = exporter.NewResourceSinkCollector("/getResourceSinkBuilding", "/getResourceSink", "/getExplorationSink")
 
 		FRMServer.ReturnsResourceSinkData([]exporter.ResourceSinkDetails{
 			{
@@ -40,13 +40,16 @@ var _ = Describe("ResourceSinkCollector", func() {
 			},
 		})
 
-		FRMServer.ReturnsGlobalResourceSinkData([]exporter.ResourceSinkGlobalDetails{
+		FRMServer.ReturnsGlobalResourceSinkData([]exporter.GlobalSinkDetails{
 			{
 				SinkType: "Resource",
 				TotalPoints:    100,
 				PointsToCoupon: 200,
 				NumCoupon:      1,
 			},
+		})
+
+		FRMServer.ReturnsGlobalExplorationSinkData([]exporter.GlobalSinkDetails{
 			{
 				SinkType: "Exploration",
 				TotalPoints:    1000,