From 88f6cdc35e2ac8ebb6bd88aade37e91b8febc25e Mon Sep 17 00:00:00 2001 From: Ivaylo Papratilov Date: Fri, 22 Mar 2024 07:59:12 +0200 Subject: [PATCH] Remove unused function argument --- internal/exporter/exporter.go | 2 +- internal/exporter/exporter_test.go | 2 +- internal/exporter/mapper.go | 6 ++---- internal/exporter/mapper_test.go | 10 +++------- mock/exporter/mock_MetricMapper.go | 23 ++++++++++------------- 5 files changed, 17 insertions(+), 26 deletions(-) diff --git a/internal/exporter/exporter.go b/internal/exporter/exporter.go index 68dacc2..c87946b 100644 --- a/internal/exporter/exporter.go +++ b/internal/exporter/exporter.go @@ -121,7 +121,7 @@ func (e *exporter) export(ctx context.Context) error { return nil } - batch := e.mapper.Map(metricFamilies, time.Now()) + batch := e.mapper.Map(metricFamilies) if err := e.client.UploadBatch(ctx, batch); err != nil { return fmt.Errorf("error whlie sending %d metrics to castai %w", len(batch.Metrics), err) } diff --git a/internal/exporter/exporter_test.go b/internal/exporter/exporter_test.go index 4e548e4..eea7461 100644 --- a/internal/exporter/exporter_test.go +++ b/internal/exporter/exporter_test.go @@ -81,7 +81,7 @@ func TestExporter_Running(t *testing.T) { batch := &pb.MetricsBatch{} scraper.EXPECT().Scrape(ctx, []string{"http://192.168.1.1:9400/metrics"}).Times(1).Return(metricFamilies, nil) - mapper.EXPECT().Map(metricFamilies, mock.Anything).Times(1).Return(batch, nil) + mapper.EXPECT().Map(metricFamilies).Times(1).Return(batch, nil) client.EXPECT().UploadBatch(mock.Anything, batch).Times(1).Return(nil, nil) go func() { diff --git a/internal/exporter/mapper.go b/internal/exporter/mapper.go index eeceef1..f946f15 100644 --- a/internal/exporter/mapper.go +++ b/internal/exporter/mapper.go @@ -1,13 +1,11 @@ package exporter import ( - "time" - "github.com/castai/gpu-metrics-exporter/pb" ) type MetricMapper interface { - Map(metrics []MetricFamilyMap, ts time.Time) *pb.MetricsBatch + Map(metrics []MetricFamilyMap) *pb.MetricsBatch } type metricMapper struct{} @@ -16,7 +14,7 @@ func NewMapper() MetricMapper { return &metricMapper{} } -func (p metricMapper) Map(metricFamilyMaps []MetricFamilyMap, ts time.Time) *pb.MetricsBatch { +func (p metricMapper) Map(metricFamilyMaps []MetricFamilyMap) *pb.MetricsBatch { metrics := &pb.MetricsBatch{} metricsMap := make(map[string]*pb.Metric) for _, familyMap := range metricFamilyMaps { diff --git a/internal/exporter/mapper_test.go b/internal/exporter/mapper_test.go index 85d14fd..e6cfae2 100644 --- a/internal/exporter/mapper_test.go +++ b/internal/exporter/mapper_test.go @@ -2,7 +2,6 @@ package exporter_test import ( "testing" - "time" dto "github.com/prometheus/client_model/go" "github.com/stretchr/testify/require" @@ -28,10 +27,9 @@ func TestMetricMapper_Map(t *testing.T) { mapper := exporter.NewMapper() t.Run("empty input yields empty MetricsBatch", func(t *testing.T) { - ts := time.Now() metricFamilyMaps := []exporter.MetricFamilyMap{} - got := mapper.Map(metricFamilyMaps, ts) + got := mapper.Map(metricFamilyMaps) expected := &pb.MetricsBatch{} r := require.New(t) @@ -39,7 +37,6 @@ func TestMetricMapper_Map(t *testing.T) { }) t.Run("metric familiy which is not enabled is skipped", func(t *testing.T) { - ts := time.Now() metricFamilyMaps := []exporter.MetricFamilyMap{ { "test_gauge": { @@ -56,7 +53,7 @@ func TestMetricMapper_Map(t *testing.T) { }, } - got := mapper.Map(metricFamilyMaps, ts) + got := mapper.Map(metricFamilyMaps) expected := &pb.MetricsBatch{} r := require.New(t) @@ -64,7 +61,6 @@ func TestMetricMapper_Map(t *testing.T) { }) t.Run("enabled metric family is included", func(t *testing.T) { - ts := time.Now() metricFamilyMaps := []exporter.MetricFamilyMap{ { "test_gauge": { @@ -92,7 +88,7 @@ func TestMetricMapper_Map(t *testing.T) { }, } - got := mapper.Map(metricFamilyMaps, ts) + got := mapper.Map(metricFamilyMaps) expected := &pb.MetricsBatch{ Metrics: []*pb.Metric{ { diff --git a/mock/exporter/mock_MetricMapper.go b/mock/exporter/mock_MetricMapper.go index 6dc6527..13370df 100644 --- a/mock/exporter/mock_MetricMapper.go +++ b/mock/exporter/mock_MetricMapper.go @@ -7,8 +7,6 @@ import ( mock "github.com/stretchr/testify/mock" pb "github.com/castai/gpu-metrics-exporter/pb" - - time "time" ) // MockMetricMapper is an autogenerated mock type for the MetricMapper type @@ -24,17 +22,17 @@ func (_m *MockMetricMapper) EXPECT() *MockMetricMapper_Expecter { return &MockMetricMapper_Expecter{mock: &_m.Mock} } -// Map provides a mock function with given fields: metrics, ts -func (_m *MockMetricMapper) Map(metrics []exporter.MetricFamilyMap, ts time.Time) *pb.MetricsBatch { - ret := _m.Called(metrics, ts) +// Map provides a mock function with given fields: metrics +func (_m *MockMetricMapper) Map(metrics []exporter.MetricFamilyMap) *pb.MetricsBatch { + ret := _m.Called(metrics) if len(ret) == 0 { panic("no return value specified for Map") } var r0 *pb.MetricsBatch - if rf, ok := ret.Get(0).(func([]exporter.MetricFamilyMap, time.Time) *pb.MetricsBatch); ok { - r0 = rf(metrics, ts) + if rf, ok := ret.Get(0).(func([]exporter.MetricFamilyMap) *pb.MetricsBatch); ok { + r0 = rf(metrics) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(*pb.MetricsBatch) @@ -51,14 +49,13 @@ type MockMetricMapper_Map_Call struct { // Map is a helper method to define mock.On call // - metrics []exporter.MetricFamilyMap -// - ts time.Time -func (_e *MockMetricMapper_Expecter) Map(metrics interface{}, ts interface{}) *MockMetricMapper_Map_Call { - return &MockMetricMapper_Map_Call{Call: _e.mock.On("Map", metrics, ts)} +func (_e *MockMetricMapper_Expecter) Map(metrics interface{}) *MockMetricMapper_Map_Call { + return &MockMetricMapper_Map_Call{Call: _e.mock.On("Map", metrics)} } -func (_c *MockMetricMapper_Map_Call) Run(run func(metrics []exporter.MetricFamilyMap, ts time.Time)) *MockMetricMapper_Map_Call { +func (_c *MockMetricMapper_Map_Call) Run(run func(metrics []exporter.MetricFamilyMap)) *MockMetricMapper_Map_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].([]exporter.MetricFamilyMap), args[1].(time.Time)) + run(args[0].([]exporter.MetricFamilyMap)) }) return _c } @@ -68,7 +65,7 @@ func (_c *MockMetricMapper_Map_Call) Return(_a0 *pb.MetricsBatch) *MockMetricMap return _c } -func (_c *MockMetricMapper_Map_Call) RunAndReturn(run func([]exporter.MetricFamilyMap, time.Time) *pb.MetricsBatch) *MockMetricMapper_Map_Call { +func (_c *MockMetricMapper_Map_Call) RunAndReturn(run func([]exporter.MetricFamilyMap) *pb.MetricsBatch) *MockMetricMapper_Map_Call { _c.Call.Return(run) return _c }