feat: support estimated billable usage metrics

s2/metrics_test.go

@@ -0,0 +1,79 @@
+package s2
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"net/url"
+	"testing"
+)
+
+func TestAccountMetricsEstimatedBillableUsage(t *testing.T) {
+	hour, day := TimeseriesIntervalHour, TimeseriesIntervalDay
+	for _, tc := range []struct {
+		name     string
+		interval *TimeseriesInterval
+	}{
+		{name: "default"},
+		{name: "hour", interval: &hour},
+		{name: "day", interval: &day},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			start, end := int64(1_700_000_000), int64(1_700_003_600)
+			wantInterval := TimeseriesIntervalHour
+			wantQuery := url.Values{
+				"set":   {"estimated-billable-usage"},
+				"start": {"1700000000"},
+				"end":   {"1700003600"},
+			}
+			if tc.interval != nil {
+				wantInterval = *tc.interval
+				wantQuery.Set("interval", string(*tc.interval))
+			}
+			rt := roundTripFunc(func(req *http.Request) (*http.Response, error) {
+				if req.Method != http.MethodGet {
+					t.Fatalf("expected GET, got %s", req.Method)
+				}
+				if req.URL.Scheme != "http" || req.URL.Host != "account.test" || req.URL.Path != "/v1/metrics" {
+					t.Fatalf("unexpected URL: %s", req.URL)
+				}
+				if req.URL.RawQuery != wantQuery.Encode() {
+					t.Fatalf("unexpected query: %s", req.URL.RawQuery)
+				}
+				body := fmt.Sprintf(`{"values":[
+					{"accumulation":{"name":"transfer.writes_standard","unit":"usd","interval":%q,"values":[[1700000000,0.012345]]}},
+					{"accumulation":{"name":"total","unit":"usd","interval":%q,"values":[[1700000000,0.012345]]}}
+				]}`, wantInterval, wantInterval)
+				return jsonResponse(http.StatusOK, "", body), nil
+			})
+			client := New("token", &ClientOptions{
+				BaseURL:    "http://account.test",
+				HTTPClient: &http.Client{Transport: rt},
+			})
+			response, err := client.Metrics.Account(context.Background(), &AccountMetricsArgs{
+				Set:      AccountMetricSetEstimatedBillableUsage,
+				Start:    &start,
+				End:      &end,
+				Interval: tc.interval,
+			})
+			if err != nil {
+				t.Fatalf("account metrics: %v", err)
+			}
+			if len(response.Values) != 2 {
+				t.Fatalf("expected 2 metrics, got %#v", response.Values)
+			}
+			for i, name := range []string{"transfer.writes_standard", "total"} {
+				metric := response.Values[i].Accumulation
+				if metric == nil {
+					t.Fatalf("expected accumulation metric, got %#v", response.Values[i])
+				}
+				if metric.Name != name || metric.Unit != MetricUnitUSD || metric.Interval != wantInterval {
+					t.Fatalf("unexpected metric: %#v", metric)
+				}
+				if len(metric.Values) != 1 || metric.Values[0] != (MetricSample{float64(start), 0.012345}) {
+					t.Fatalf("unexpected samples: %#v", metric.Values)
+				}
+			}
+		})
+	}
+}

s2/types.go

@@ -29,6 +29,10 @@ type LocationName string
 type EncryptionAlgorithm string
 type MetricUnit string
 type TimeseriesInterval string
+
+// Account-level metric sets.
+// `estimated-billable-usage` returns estimated USD by billing dimension and as a `total` series.
+// Supports hour (default) and day intervals, aggregating finalized hours. Daily points may be partial.
 type AccountMetricSet string
 type BasinMetricSet string
 type StreamMetricSet string
@@ -48,6 +52,7 @@ const (
 const (
 	MetricUnitBytes      MetricUnit = "bytes"
 	MetricUnitOperations MetricUnit = "operations"
+	MetricUnitUSD        MetricUnit = "usd"
 )
 
 const (
@@ -57,8 +62,9 @@ const (
 )
 
 const (
-	AccountMetricSetActiveBasins AccountMetricSet = "active-basins"
-	AccountMetricSetAccountOps   AccountMetricSet = "account-ops"
+	AccountMetricSetActiveBasins           AccountMetricSet = "active-basins"
+	AccountMetricSetAccountOps             AccountMetricSet = "account-ops"
+	AccountMetricSetEstimatedBillableUsage AccountMetricSet = "estimated-billable-usage"
 )
 
 const (