Skip to content

Commit 7f04628

Browse files
committed
fix: yace now returns an empty array instead of nil
Signed-off-by: x1unix <9203548+x1unix@users.noreply.github.com>
1 parent a3717a1 commit 7f04628

2 files changed

Lines changed: 13 additions & 0 deletions

File tree

internal/component/prometheus/exporter/cloudwatch/config_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ var expectedDiscoveryJobConfig = yaceModel.JobsConfig{
258258
DimensionsNames: []string{"QueueName"},
259259
},
260260
},
261+
EnhancedMetrics: []*yaceModel.EnhancedMetricConfig{},
261262
},
262263
{
263264
Regions: []string{"us-east-1"},
@@ -289,6 +290,7 @@ var expectedDiscoveryJobConfig = yaceModel.JobsConfig{
289290
DimensionsNames: []string{"ClusterName", "ServiceName"},
290291
},
291292
},
293+
EnhancedMetrics: []*yaceModel.EnhancedMetricConfig{},
292294
},
293295
{
294296
Regions: []string{"us-east-1"},
@@ -318,6 +320,7 @@ var expectedDiscoveryJobConfig = yaceModel.JobsConfig{
318320
DimensionsNames: []string{"BucketName"},
319321
},
320322
},
323+
EnhancedMetrics: []*yaceModel.EnhancedMetricConfig{},
321324
},
322325
},
323326
}
@@ -488,6 +491,7 @@ var expectedDiscoveryJobNilToZeroConfig = yaceModel.JobsConfig{
488491
DimensionsNames: []string{"QueueName"},
489492
},
490493
},
494+
EnhancedMetrics: []*yaceModel.EnhancedMetricConfig{},
491495
},
492496
},
493497
}
@@ -716,6 +720,7 @@ var expectedDiscoveryJobDefaultPeriodConfig = yaceModel.JobsConfig{
716720
DimensionsNames: []string{"QueueName"},
717721
},
718722
},
723+
EnhancedMetrics: []*yaceModel.EnhancedMetricConfig{},
719724
},
720725
},
721726
}
@@ -783,6 +788,7 @@ var expectedDiscoveryJobPeriodConfig = yaceModel.JobsConfig{
783788
DimensionsNames: []string{"QueueName"},
784789
},
785790
},
791+
EnhancedMetrics: []*yaceModel.EnhancedMetricConfig{},
786792
},
787793
},
788794
}
@@ -1017,6 +1023,7 @@ var expectedDiscoveryJobAddCloudwatchTimestampConfig = yaceModel.JobsConfig{
10171023
DimensionsNames: []string{"QueueName"},
10181024
},
10191025
},
1026+
EnhancedMetrics: []*yaceModel.EnhancedMetricConfig{},
10201027
},
10211028
},
10221029
}
@@ -1126,6 +1133,7 @@ var expectedDiscoveryJobDelayConfig = yaceModel.JobsConfig{
11261133
DimensionsNames: []string{"InstanceId"},
11271134
},
11281135
},
1136+
EnhancedMetrics: []*yaceModel.EnhancedMetricConfig{},
11291137
},
11301138
},
11311139
}

internal/static/integrations/cloudwatch_exporter/config_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ var expectedConfig = model.JobsConfig{
263263
Regexp: regexp.MustCompile("instance/(?P<InstanceId>[^/]+)"),
264264
DimensionsNames: []string{"InstanceId"},
265265
}},
266+
EnhancedMetrics: []*model.EnhancedMetricConfig{},
266267
}, {
267268
Regions: []string{"us-east-2"},
268269
Namespace: "AWS/S3",
@@ -289,6 +290,7 @@ var expectedConfig = model.JobsConfig{
289290
Regexp: regexp.MustCompile("(?P<BucketName>[^:]+)$"),
290291
DimensionsNames: []string{"BucketName"},
291292
}},
293+
EnhancedMetrics: []*model.EnhancedMetricConfig{},
292294
}},
293295
StaticJobs: []model.StaticJob{{
294296
Name: "custom_tesis_metrics",
@@ -342,6 +344,7 @@ var expectedConfig3 = model.JobsConfig{
342344
Regexp: regexp.MustCompile("instance/(?P<InstanceId>[^/]+)"),
343345
DimensionsNames: []string{"InstanceId"},
344346
}},
347+
EnhancedMetrics: []*model.EnhancedMetricConfig{},
345348
},
346349
{
347350
Regions: []string{"us-east-2"},
@@ -370,6 +373,7 @@ var expectedConfig3 = model.JobsConfig{
370373
Regexp: regexp.MustCompile("(?P<BucketName>[^:]+)$"),
371374
DimensionsNames: []string{"BucketName"},
372375
}},
376+
EnhancedMetrics: []*model.EnhancedMetricConfig{},
373377
},
374378
},
375379
StaticJobs: []model.StaticJob{{
@@ -425,6 +429,7 @@ var expectedConfig4 = model.JobsConfig{
425429
Regexp: regexp.MustCompile("instance/(?P<InstanceId>[^/]+)"),
426430
DimensionsNames: []string{"InstanceId"},
427431
}},
432+
EnhancedMetrics: []*model.EnhancedMetricConfig{},
428433
}},
429434
StaticJobs: []model.StaticJob{{
430435
Name: "custom_tesis_metrics",

0 commit comments

Comments
 (0)