Skip to content

drop use of knative.dev/pkg metricskey in tests #11679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow-robot merged 1 commit into from
Jul 14, 2021
Merged

drop use of knative.dev/pkg metricskey in tests #11679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/metrics/key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ const (

// LabelResponseTimeout is the label timeout.
LabelResponseTimeout = metricskey.LabelResponseTimeout

// ValueUnknown is the default value if the field is unknown, e.g. project will be unknown if Knative
// is not running on GKE.
ValueUnknown = metricskey.ValueUnknown
)

// Create the tag keys that will be used to add tags to our measurements.
Expand Down
85 changes: 42 additions & 43 deletions pkg/metrics/tags_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"testing"

pkgmetrics "knative.dev/pkg/metrics"
"knative.dev/pkg/metrics/metricskey"
"knative.dev/pkg/metrics/metricstest"
_ "knative.dev/pkg/metrics/testing"

Expand Down Expand Up @@ -84,8 +83,8 @@ func TestContexts(t *testing.T) {
return PodContext("testpod", "testcontainer")
}),
wantTags: map[string]string{
metricskey.PodName: "testpod",
metricskey.ContainerName: "testcontainer",
LabelPodName: "testpod",
LabelContainerName: "testcontainer",
},
}, {
name: "revision context",
Expand All @@ -96,10 +95,10 @@ func TestContexts(t *testing.T) {
wantResource: &resource.Resource{
Type: "knative_revision",
Labels: map[string]string{
metricskey.LabelNamespaceName: "testns",
metricskey.LabelServiceName: "testsvc",
metricskey.LabelConfigurationName: "testcfg",
metricskey.LabelRevisionName: "testrev",
LabelNamespaceName: "testns",
LabelServiceName: "testsvc",
LabelConfigurationName: "testcfg",
LabelRevisionName: "testrev",
},
},
}, {
Expand All @@ -111,10 +110,10 @@ func TestContexts(t *testing.T) {
wantResource: &resource.Resource{
Type: "knative_revision",
Labels: map[string]string{
metricskey.LabelNamespaceName: "testns",
metricskey.LabelServiceName: metricskey.ValueUnknown,
metricskey.LabelConfigurationName: "testcfg",
metricskey.LabelRevisionName: "testrev",
LabelNamespaceName: "testns",
LabelServiceName: ValueUnknown,
LabelConfigurationName: "testcfg",
LabelRevisionName: "testrev",
},
},
}, {
Expand All @@ -123,16 +122,16 @@ func TestContexts(t *testing.T) {
return PodRevisionContext("testpod", "testcontainer", "testns", "testsvc", "testcfg", "testrev")
}),
wantTags: map[string]string{
metricskey.PodName: "testpod",
metricskey.ContainerName: "testcontainer",
LabelPodName: "testpod",
LabelContainerName: "testcontainer",
},
wantResource: &resource.Resource{
Type: "knative_revision",
Labels: map[string]string{
metricskey.LabelNamespaceName: "testns",
metricskey.LabelServiceName: "testsvc",
metricskey.LabelConfigurationName: "testcfg",
metricskey.LabelRevisionName: "testrev",
LabelNamespaceName: "testns",
LabelServiceName: "testsvc",
LabelConfigurationName: "testcfg",
LabelRevisionName: "testrev",
},
},
}, {
Expand All @@ -141,16 +140,16 @@ func TestContexts(t *testing.T) {
return PodRevisionContext("testpod", "testcontainer", "testns", "", "testcfg", "testrev")
}),
wantTags: map[string]string{
metricskey.PodName: "testpod",
metricskey.ContainerName: "testcontainer",
LabelPodName: "testpod",
LabelContainerName: "testcontainer",
},
wantResource: &resource.Resource{
Type: "knative_revision",
Labels: map[string]string{
metricskey.LabelNamespaceName: "testns",
metricskey.LabelServiceName: metricskey.ValueUnknown,
metricskey.LabelConfigurationName: "testcfg",
metricskey.LabelRevisionName: "testrev",
LabelNamespaceName: "testns",
LabelServiceName: ValueUnknown,
LabelConfigurationName: "testcfg",
LabelRevisionName: "testrev",
},
},
}, {
Expand All @@ -159,16 +158,16 @@ func TestContexts(t *testing.T) {
return PodRevisionContext("testpod", "testcontainer", "testns", "", "testcfg", "testrev")
}),
wantTags: map[string]string{
metricskey.PodName: "testpod",
metricskey.ContainerName: "testcontainer",
LabelPodName: "testpod",
LabelContainerName: "testcontainer",
},
wantResource: &resource.Resource{
Type: "knative_revision",
Labels: map[string]string{
metricskey.LabelNamespaceName: "testns",
metricskey.LabelServiceName: metricskey.ValueUnknown,
metricskey.LabelConfigurationName: "testcfg",
metricskey.LabelRevisionName: "testrev",
LabelNamespaceName: "testns",
LabelServiceName: ValueUnknown,
LabelConfigurationName: "testcfg",
LabelRevisionName: "testrev",
},
},
}, {
Expand All @@ -181,16 +180,16 @@ func TestContexts(t *testing.T) {
return AugmentWithRevision(ctx, "testns", "testsvc", "testcfg", "testrev"), nil
}),
wantTags: map[string]string{
metricskey.PodName: "testpod",
metricskey.ContainerName: "testcontainer",
LabelPodName: "testpod",
LabelContainerName: "testcontainer",
},
wantResource: &resource.Resource{
Type: "knative_revision",
Labels: map[string]string{
metricskey.LabelNamespaceName: "testns",
metricskey.LabelServiceName: "testsvc",
metricskey.LabelConfigurationName: "testcfg",
metricskey.LabelRevisionName: "testrev",
LabelNamespaceName: "testns",
LabelServiceName: "testsvc",
LabelConfigurationName: "testcfg",
LabelRevisionName: "testrev",
},
},
}, {
Expand All @@ -200,18 +199,18 @@ func TestContexts(t *testing.T) {
return AugmentWithResponse(ctx, 200), err
}),
wantTags: map[string]string{
metricskey.PodName: "testpod",
metricskey.ContainerName: "testcontainer",
metricskey.LabelResponseCode: "200",
metricskey.LabelResponseCodeClass: "2xx",
LabelPodName: "testpod",
LabelContainerName: "testcontainer",
LabelResponseCode: "200",
LabelResponseCodeClass: "2xx",
},
wantResource: &resource.Resource{
Type: "knative_revision",
Labels: map[string]string{
metricskey.LabelNamespaceName: "testns",
metricskey.LabelServiceName: "testsvc",
metricskey.LabelConfigurationName: "testcfg",
metricskey.LabelRevisionName: "testrev",
LabelNamespaceName: "testns",
LabelServiceName: "testsvc",
LabelConfigurationName: "testcfg",
LabelRevisionName: "testrev",
},
},
}}
Expand Down