Remove deprecated metrics (#166)

Signed-off-by: Peter Halasz <[email protected]>

Author: peterhalasz

internal/server/billing_metrics_exporter.go

@@ -96,11 +96,6 @@ func (c *BillingMetricsExporter) collectOrgBilling(ctx context.Context) {
 	for host, minutes := range actionsBilling.MinutesUsedBreakdown {
 		totalMinutesUsedByHostTypeActions.WithLabelValues(c.Opts.GitHubOrg, "", host).Set(float64(minutes))
 	}
-
-	// TODO: deprecate
-	totalMinutesUsedUbuntuActions.WithLabelValues(c.Opts.GitHubOrg, "").Set(float64(actionsBilling.MinutesUsedBreakdown["UBUNTU"]))
-	totalMinutesUsedMacOSActions.WithLabelValues(c.Opts.GitHubOrg, "").Set(float64(actionsBilling.MinutesUsedBreakdown["MACOS"]))
-	totalMinutesUsedWindowsActions.WithLabelValues(c.Opts.GitHubOrg, "").Set(float64(actionsBilling.MinutesUsedBreakdown["WINDOWS"]))
 }
 
 func (c *BillingMetricsExporter) collectUserBilling(ctx context.Context) {
@@ -117,9 +112,4 @@ func (c *BillingMetricsExporter) collectUserBilling(ctx context.Context) {
 	for host, minutes := range actionsBilling.MinutesUsedBreakdown {
 		totalMinutesUsedByHostTypeActions.WithLabelValues("", c.Opts.GitHubUser, host).Set(float64(minutes))
 	}
-
-	// TODO: deprecate
-	totalMinutesUsedUbuntuActions.WithLabelValues("", c.Opts.GitHubUser).Set(float64(actionsBilling.MinutesUsedBreakdown["UBUNTU"]))
-	totalMinutesUsedMacOSActions.WithLabelValues("", c.Opts.GitHubUser).Set(float64(actionsBilling.MinutesUsedBreakdown["MACOS"]))
-	totalMinutesUsedWindowsActions.WithLabelValues("", c.Opts.GitHubUser).Set(float64(actionsBilling.MinutesUsedBreakdown["WINDOWS"]))
 }

internal/server/metrics.go

@@ -61,27 +61,6 @@ var (
 		[]string{"org", "user"},
 	)
 
-	totalMinutesUsedUbuntuActions = prometheus.NewGaugeVec(prometheus.GaugeOpts{
-		Name: "actions_total_minutes_used_ubuntu_minutes",
-		Help: "Total minutes used for Ubuntu type for the GitHub Actions. To be deprecate, use actions_total_minutes_used_by_host_minutes",
-	},
-		[]string{"org", "user"},
-	)
-
-	totalMinutesUsedMacOSActions = prometheus.NewGaugeVec(prometheus.GaugeOpts{
-		Name: "actions_total_minutes_used_macos_minutes",
-		Help: "Total minutes used for MacOS type for the GitHub Actions. To be deprecate, use actions_total_minutes_used_by_host_minutes",
-	},
-		[]string{"org", "user"},
-	)
-
-	totalMinutesUsedWindowsActions = prometheus.NewGaugeVec(prometheus.GaugeOpts{
-		Name: "actions_total_minutes_used_windows_minutes",
-		Help: "Total minutes used for Windows type for the GitHub Actions. To be deprecate, use actions_total_minutes_used_by_host_minutes",
-	},
-		[]string{"org", "user"},
-	)
-
 	totalMinutesUsedByHostTypeActions = prometheus.NewGaugeVec(prometheus.GaugeOpts{
 		Name: "actions_total_minutes_used_by_host_minutes",
 		Help: "Total minutes used for a specific host type for the GitHub Actions.",
@@ -100,9 +79,6 @@ func init() {
 	prometheus.MustRegister(totalMinutesUsedActions)
 	prometheus.MustRegister(includedMinutesUsedActions)
 	prometheus.MustRegister(totalPaidMinutesActions)
-	prometheus.MustRegister(totalMinutesUsedUbuntuActions)
-	prometheus.MustRegister(totalMinutesUsedMacOSActions)
-	prometheus.MustRegister(totalMinutesUsedWindowsActions)
 	prometheus.MustRegister(totalMinutesUsedByHostTypeActions)
 }