Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

fix(opencost): backfill usage allocation schema v2 (#7143)

r33drichards2ed3629c9216
diff --git a/libs/fleet/backend/usage/datafusion.go b/libs/fleet/backend/usage/datafusion.go
index 43e33a2788..b97bebd080 100644
--- a/libs/fleet/backend/usage/datafusion.go
+++ b/libs/fleet/backend/usage/datafusion.go
@@ -59,14 +59,15 @@ type dataFusionAllocationClient struct {
}
type dataFusionWebhookPayload struct {
- Dataset string `json:"dataset"`
- Cluster string `json:"cluster"`
- Environment string `json:"environment"`
- Window dataFusionQueryWindow `json:"window"`
- Query string `json:"query"`
- OutputURL string `json:"output_url"`
- OutputFormat string `json:"output_format"`
- StatusURL string `json:"status_url"`
+ Dataset string `json:"dataset"`
+ Cluster string `json:"cluster"`
+ Environment string `json:"environment"`
+ SchemaVersion string `json:"schema_version"`
+ Window dataFusionQueryWindow `json:"window"`
+ Query string `json:"query"`
+ OutputURL string `json:"output_url"`
+ OutputFormat string `json:"output_format"`
+ StatusURL string `json:"status_url"`
}
type dataFusionQueryWindow struct {
@@ -171,14 +172,15 @@ func (client *dataFusionAllocationClient) Allocations(ctx context.Context, start
return nil, time.Time{}, false, newSanitizedError("prepare allocation query status", err)
}
payload, err := json.Marshal(dataFusionWebhookPayload{
- Dataset: "allocation",
- Cluster: client.cluster,
- Environment: client.environment,
- Window: dataFusionQueryWindow{Start: start, End: end},
- Query: query,
- OutputURL: resultURL,
- OutputFormat: "csv",
- StatusURL: statusURL,
+ Dataset: "allocation",
+ Cluster: client.cluster,
+ Environment: client.environment,
+ SchemaVersion: "v2",
+ Window: dataFusionQueryWindow{Start: start, End: end},
+ Query: query,
+ OutputURL: resultURL,
+ OutputFormat: "csv",
+ StatusURL: statusURL,
})
if err != nil {
return nil, time.Time{}, false, newSanitizedError("encode allocation query request", err)
diff --git a/libs/fleet/backend/usage/datafusion_test.go b/libs/fleet/backend/usage/datafusion_test.go
index d3e6cb5938..4dd1f7ddab 100644
--- a/libs/fleet/backend/usage/datafusion_test.go
+++ b/libs/fleet/backend/usage/datafusion_test.go
@@ -91,7 +91,7 @@ func TestDataFusionAllocationClientQueriesBoundedParquetAndMapsSemantics(t *test
if allocation.Minutes != 60 || allocation.CPUUsageAverage != 2 || allocation.CPURequestAverage != 4 || allocation.RAMUsageAverageBytes != 3*gibibyte || allocation.RAMRequestAverageBytes != 6*gibibyte {
t.Fatalf("allocation = %#v", allocation)
}
- if payload.Dataset != "allocation" || payload.Cluster != "kopf-k3s" || payload.Environment != "production" || payload.OutputFormat != "csv" {
+ if payload.Dataset != "allocation" || payload.Cluster != "kopf-k3s" || payload.Environment != "production" || payload.SchemaVersion != "v2" || payload.OutputFormat != "csv" {
t.Fatalf("payload = %#v", payload)
}
for _, fragment := range []string{"namespace IN ('ns-a','ns-b')", "LIMIT 100001", "cpu_usage_core_hours", "cpu_request_core_hours", "ram_usage_byte_hours", "ram_request_byte_hours"} {