From ba9ccde5a641adc07d4e257b98a5240f9c2a90d6 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Wed, 9 Jun 2021 09:27:06 +0300 Subject: [PATCH] Remove batch counter from the testbed DataProvider, not used (#3391) Signed-off-by: Bogdan Drutu --- testbed/testbed/data_providers.go | 24 ++++++++---------------- testbed/testbed/data_providers_test.go | 2 +- testbed/testbed/load_generator.go | 5 +---- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/testbed/testbed/data_providers.go b/testbed/testbed/data_providers.go index 2eb490acf43..62bf7b98a35 100644 --- a/testbed/testbed/data_providers.go +++ b/testbed/testbed/data_providers.go @@ -39,7 +39,7 @@ import ( type DataProvider interface { // SetLoadGeneratorCounters supplies pointers to LoadGenerator counters. // The data provider implementation should increment these as it generates data. - SetLoadGeneratorCounters(batchesGenerated *atomic.Uint64, dataItemsGenerated *atomic.Uint64) + SetLoadGeneratorCounters(dataItemsGenerated *atomic.Uint64) // GenerateTraces returns an internal Traces instance with an OTLP ResourceSpans slice populated with test data. GenerateTraces() (pdata.Traces, bool) // GenerateMetrics returns an internal MetricData instance with an OTLP ResourceMetrics slice of test data. @@ -52,7 +52,7 @@ type DataProvider interface { // Tracing IDs are based on the incremented batch and data items counters. type PerfTestDataProvider struct { options LoadOptions - batchesGenerated *atomic.Uint64 + traceIDSequence atomic.Uint64 dataItemsGenerated *atomic.Uint64 } @@ -64,8 +64,7 @@ func NewPerfTestDataProvider(options LoadOptions) *PerfTestDataProvider { } } -func (dp *PerfTestDataProvider) SetLoadGeneratorCounters(batchesGenerated *atomic.Uint64, dataItemsGenerated *atomic.Uint64) { - dp.batchesGenerated = batchesGenerated +func (dp *PerfTestDataProvider) SetLoadGeneratorCounters(dataItemsGenerated *atomic.Uint64) { dp.dataItemsGenerated = dataItemsGenerated } @@ -75,7 +74,7 @@ func (dp *PerfTestDataProvider) GenerateTraces() (pdata.Traces, bool) { spans := traceData.ResourceSpans().AppendEmpty().InstrumentationLibrarySpans().AppendEmpty().Spans() spans.Resize(dp.options.ItemsPerBatch) - traceID := dp.batchesGenerated.Inc() + traceID := dp.traceIDSequence.Inc() for i := 0; i < dp.options.ItemsPerBatch; i++ { startTime := time.Now() @@ -127,7 +126,7 @@ func (dp *PerfTestDataProvider) GenerateMetrics() (pdata.Metrics, bool) { metric.SetUnit("1") metric.SetDataType(pdata.MetricDataTypeIntGauge) - batchIndex := dp.batchesGenerated.Inc() + batchIndex := dp.traceIDSequence.Inc() dps := metric.IntGauge().DataPoints() // Generate data points for the metric. @@ -161,7 +160,7 @@ func (dp *PerfTestDataProvider) GenerateLogs() (pdata.Logs, bool) { now := pdata.TimestampFromTime(time.Now()) - batchIndex := dp.batchesGenerated.Inc() + batchIndex := dp.traceIDSequence.Inc() for i := 0; i < dp.options.ItemsPerBatch; i++ { itemIndex := dp.dataItemsGenerated.Inc() @@ -189,7 +188,6 @@ func (dp *PerfTestDataProvider) GenerateLogs() (pdata.Logs, bool) { type GoldenDataProvider struct { tracePairsFile string spanPairsFile string - batchesGenerated *atomic.Uint64 dataItemsGenerated *atomic.Uint64 tracesGenerated []pdata.Traces @@ -210,8 +208,7 @@ func NewGoldenDataProvider(tracePairsFile string, spanPairsFile string, metricPa } } -func (dp *GoldenDataProvider) SetLoadGeneratorCounters(batchesGenerated *atomic.Uint64, dataItemsGenerated *atomic.Uint64) { - dp.batchesGenerated = batchesGenerated +func (dp *GoldenDataProvider) SetLoadGeneratorCounters(dataItemsGenerated *atomic.Uint64) { dp.dataItemsGenerated = dataItemsGenerated } @@ -224,7 +221,6 @@ func (dp *GoldenDataProvider) GenerateTraces() (pdata.Traces, bool) { dp.tracesGenerated = nil } } - dp.batchesGenerated.Inc() if dp.tracesIndex >= len(dp.tracesGenerated) { return pdata.NewTraces(), true } @@ -242,7 +238,6 @@ func (dp *GoldenDataProvider) GenerateMetrics() (pdata.Metrics, bool) { log.Printf("cannot generate metrics: %s", err) } } - dp.batchesGenerated.Inc() if dp.metricsIndex == len(dp.metricsGenerated) { return pdata.Metrics{}, true } @@ -263,7 +258,6 @@ func (dp *GoldenDataProvider) GenerateLogs() (pdata.Logs, bool) { // exporter (note: "file" exporter writes one JSON message per line, FileDataProvider // expects just a single JSON message in the entire file). type FileDataProvider struct { - batchesGenerated *atomic.Uint64 dataItemsGenerated *atomic.Uint64 message proto.Message ItemsPerBatch int @@ -320,8 +314,7 @@ func NewFileDataProvider(filePath string, dataType config.DataType) (*FileDataPr }, nil } -func (dp *FileDataProvider) SetLoadGeneratorCounters(batchesGenerated *atomic.Uint64, dataItemsGenerated *atomic.Uint64) { - dp.batchesGenerated = batchesGenerated +func (dp *FileDataProvider) SetLoadGeneratorCounters(dataItemsGenerated *atomic.Uint64) { dp.dataItemsGenerated = dataItemsGenerated } @@ -335,7 +328,6 @@ func (dp *FileDataProvider) GenerateTraces() (pdata.Traces, bool) { func (dp *FileDataProvider) GenerateMetrics() (pdata.Metrics, bool) { md := pdata.MetricsFromInternalRep(internal.MetricsFromOtlp(dp.message.(*otlpmetricscol.ExportMetricsServiceRequest))) - dp.batchesGenerated.Inc() _, dataPointCount := md.MetricAndDataPointCount() dp.dataItemsGenerated.Add(uint64(dataPointCount)) return md, false diff --git a/testbed/testbed/data_providers_test.go b/testbed/testbed/data_providers_test.go index 7b001c1d73a..3a900d0f376 100644 --- a/testbed/testbed/data_providers_test.go +++ b/testbed/testbed/data_providers_test.go @@ -27,7 +27,7 @@ const metricsPictPairsFile = "../../internal/goldendataset/testdata/generated_pi func TestGoldenDataProvider(t *testing.T) { dp := NewGoldenDataProvider("", "", metricsPictPairsFile) - dp.SetLoadGeneratorCounters(atomic.NewUint64(0), atomic.NewUint64(0)) + dp.SetLoadGeneratorCounters(atomic.NewUint64(0)) var ms []pdata.Metrics for { m, done := dp.GenerateMetrics() diff --git a/testbed/testbed/load_generator.go b/testbed/testbed/load_generator.go index 0ce3175f731..dbd4b90c63e 100644 --- a/testbed/testbed/load_generator.go +++ b/testbed/testbed/load_generator.go @@ -33,9 +33,6 @@ type LoadGenerator struct { dataProvider DataProvider - // Number of batches of data items sent. - batchesSent atomic.Uint64 - // Number of data items (spans or metric data points) sent. dataItemsSent atomic.Uint64 @@ -141,7 +138,7 @@ func (lg *LoadGenerator) generate() { return } - lg.dataProvider.SetLoadGeneratorCounters(&lg.batchesSent, &lg.dataItemsSent) + lg.dataProvider.SetLoadGeneratorCounters(&lg.dataItemsSent) err := lg.sender.Start() if err != nil {