knative
/
pkg
mirror of https://github.com/knative/pkg.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unused recorder field (#2358)

This commit is contained in:
Julian Friedman 2021-11-23 13:51:50 +00:00 committed by GitHub
parent 0fae0afc10
commit 787aec59e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
metrics/config.go
View File

@ -84,10 +84,6 @@ type metricsConfig struct {
// If duration is less than or equal to zero, it enables the default behavior. // If duration is less than or equal to zero, it enables the default behavior.
reportingPeriod time.Duration reportingPeriod time.Duration
// recorder provides a hook for performing custom transformations before
// writing the metrics to the stats.RecordWithOptions interface.
recorder func(context.Context, []stats.Measurement, ...stats.Options) error
// secret contains credentials for an exporter to use for authentication. // secret contains credentials for an exporter to use for authentication.
secret *corev1.Secret secret *corev1.Secret
@ -117,16 +113,13 @@ func (mc *metricsConfig) record(ctx context.Context, mss []stats.Measurement, ro
return nil return nil
} }
if mc.recorder == nil { opt, err := optionForResource(metricskey.GetResource(ctx))
opt, err := optionForResource(metricskey.GetResource(ctx)) if err != nil {
if err != nil { return err
return err
}
ros = append(ros, opt)
return stats.RecordWithOptions(ctx, append(ros, stats.WithMeasurements(mss...))...)
} }
return mc.recorder(ctx, mss, ros...) ros = append(ros, opt)
return stats.RecordWithOptions(ctx, append(ros, stats.WithMeasurements(mss...))...)
} }
func createMetricsConfig(_ context.Context, ops ExporterOptions) (*metricsConfig, error) { func createMetricsConfig(_ context.Context, ops ExporterOptions) (*metricsConfig, error) {

9
metrics/config_test.go
View File

@ -25,7 +25,6 @@ import (
"time" "time"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
. "knative.dev/pkg/logging/testing" . "knative.dev/pkg/logging/testing"
@ -294,7 +293,7 @@ func TestGetMetricsConfig(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Wanted valid config %v, got error %v", test.expectedConfig, err) t.Errorf("Wanted valid config %v, got error %v", test.expectedConfig, err)
} }
if diff := cmp.Diff(test.expectedConfig, *mc, cmp.AllowUnexported(*mc), cmpopts.IgnoreTypes(mc.recorder)); diff != "" { if diff := cmp.Diff(test.expectedConfig, *mc, cmp.AllowUnexported(*mc)); diff != "" {
t.Errorf("Invalid config (-want +got):\n%s", diff) t.Errorf("Invalid config (-want +got):\n%s", diff)
} }
}) })
@ -388,7 +387,7 @@ func TestGetMetricsConfig_fromEnv(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("Wanted valid config %v, got error %v", test.expectedConfig, err) t.Errorf("Wanted valid config %v, got error %v", test.expectedConfig, err)
} }
if diff := cmp.Diff(test.expectedConfig, *mc, cmp.AllowUnexported(*mc), cmpopts.IgnoreTypes(mc.recorder)); diff != "" { if diff := cmp.Diff(test.expectedConfig, *mc, cmp.AllowUnexported(*mc)); diff != "" {
t.Errorf("Invalid config (-want +got):\n%s", diff) t.Errorf("Invalid config (-want +got):\n%s", diff)
} }
}) })
@ -486,7 +485,7 @@ func TestUpdateExporter(t *testing.T) {
if mConfig == oldConfig { if mConfig == oldConfig {
t.Error("Expected metrics config change") t.Error("Expected metrics config change")
} }
if diff := cmp.Diff(test.expectedConfig, *mConfig, cmp.AllowUnexported(*mConfig), cmpopts.IgnoreTypes(mConfig.recorder)); diff != "" { if diff := cmp.Diff(test.expectedConfig, *mConfig, cmp.AllowUnexported(*mConfig)); diff != "" {
t.Errorf("Invalid config (-want +got):\n%s", diff) t.Errorf("Invalid config (-want +got):\n%s", diff)
} }
oldConfig = mConfig oldConfig = mConfig
@ -526,7 +525,7 @@ func TestUpdateExporterFromConfigMapWithOpts(t *testing.T) {
if mConfig == oldConfig { if mConfig == oldConfig {
t.Error("Expected metrics config change") t.Error("Expected metrics config change")
} }
if diff := cmp.Diff(test.expectedConfig, *mConfig, cmp.AllowUnexported(*mConfig), cmpopts.IgnoreTypes(mConfig.recorder)); diff != "" { if diff := cmp.Diff(test.expectedConfig, *mConfig, cmp.AllowUnexported(*mConfig)); diff != "" {
t.Errorf("Invalid config (-want +got):\n%s", diff) t.Errorf("Invalid config (-want +got):\n%s", diff)
} }
oldConfig = mConfig oldConfig = mConfig