Merge 10ecd76 into 9aa9ede

grafana · May 15, 2023 · f90d741 · f90d741
2 parents 9aa9ede + 10ecd76
commit f90d741
Show file tree

Hide file tree

Showing 9 changed files with 1,297 additions and 1,170 deletions.
diff --git a/output/cloud/output.go b/output/cloud/output.go
diff --git a/output/cloud/output_test.go b/output/cloud/output_test.go
diff --git a/output/cloud/bench_test.go → output/cloud/v1/bench_test.go b/output/cloud/bench_test.go → output/cloud/v1/bench_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 func BenchmarkAggregateHTTP(b *testing.B) {
-	out, err := newOutput(output.Params{
+	out, err := newTestOutput(output.Params{
 		Logger:     testutils.NewLogger(b),
 		JSONConfig: json.RawMessage(`{"noCompress": true, "aggregationCalcInterval": "200ms","aggregationPeriod": "200ms"}`),
 		ScriptOptions: lib.Options{
@@ -292,7 +292,7 @@ func BenchmarkHTTPPush(b *testing.B) {
 		},
 	)
 
-	out, err := newOutput(output.Params{
+	out, err := newTestOutput(output.Params{
 		Logger: testutils.NewLogger(b),
 		JSONConfig: json.RawMessage(fmt.Sprintf(`{
 "host": "%s",

diff --git a/output/cloud/cloud_easyjson.go → output/cloud/v1/cloud_easyjson.go b/output/cloud/cloud_easyjson.go → output/cloud/v1/cloud_easyjson.go
diff --git a/output/cloud/data.go → output/cloud/v1/data.go b/output/cloud/data.go → output/cloud/v1/data.go
diff --git a/output/cloud/data_test.go → output/cloud/v1/data_test.go b/output/cloud/data_test.go → output/cloud/v1/data_test.go
diff --git a/output/cloud/metrics_client.go → output/cloud/v1/metrics_client.go b/output/cloud/metrics_client.go → output/cloud/v1/metrics_client.go