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

renaming source_name and source_resource_group to name and resource_group, (#675) 

as they will be used in other resources
This commit is contained in:
Ignacio Cano 2019-09-13 14:03:35 -07:00 committed by Knative Prow Robot
parent 55634011c4
commit 1633d4dded
6 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
metrics/exporter_test.go
View File

@ -59,19 +59,20 @@ var (
routeKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelRouteName), Value: testRoute} routeKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelRouteName), Value: testRoute}
revisionKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelRevisionName), Value: testRevision} revisionKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelRevisionName), Value: testRevision}
brokerKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelBrokerName), Value: testBroker} brokerKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelName), Value: testBroker}
triggerKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelTriggerName), Value: testTrigger} triggerKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelName), Value: testTrigger}
triggerBrokerKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelBrokerName), Value: testBroker}
filterTypeKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelFilterType), Value: testFilterType} filterTypeKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelFilterType), Value: testFilterType}
filterSourceKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelFilterSource), Value: testFilterSource} filterSourceKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelFilterSource), Value: testFilterSource}
sourceKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelSourceName), Value: testSource} sourceKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelName), Value: testSource}
sourceResourceGroupKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelSourceResourceGroup), Value: testSourceResourceGroup} sourceResourceGroupKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelResourceGroup), Value: testSourceResourceGroup}
eventTypeKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelEventType), Value: testEventType} eventTypeKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelEventType), Value: testEventType}
eventSourceKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelEventSource), Value: testEventSource} eventSourceKey = tag.Tag{Key: mustNewTagKey(metricskey.LabelEventSource), Value: testEventSource}
revisionTestTags = []tag.Tag{nsKey, serviceKey, routeKey, revisionKey} revisionTestTags = []tag.Tag{nsKey, serviceKey, routeKey, revisionKey}
brokerTestTags = []tag.Tag{nsKey, brokerKey, eventTypeKey, eventSourceKey} brokerTestTags = []tag.Tag{nsKey, brokerKey, eventTypeKey, eventSourceKey}
triggerTestTags = []tag.Tag{nsKey, triggerKey, brokerKey, filterTypeKey, filterSourceKey} triggerTestTags = []tag.Tag{nsKey, triggerKey, triggerBrokerKey, filterTypeKey, filterSourceKey}
sourceTestTags = []tag.Tag{nsKey, sourceKey, sourceResourceGroupKey, eventTypeKey, eventSourceKey} sourceTestTags = []tag.Tag{nsKey, sourceKey, sourceResourceGroupKey, eventTypeKey, eventSourceKey}
) )

23
metrics/metricskey/constants_eventing.go
View File

@ -30,10 +30,13 @@ const (
// ResourceTypeKnativeSource is the Stackdriver resource type for Knative Sources. // ResourceTypeKnativeSource is the Stackdriver resource type for Knative Sources.
ResourceTypeKnativeSource = "knative_source" ResourceTypeKnativeSource = "knative_source"
// LabelTriggerName is the label for the name of the Trigger. // LabelName is the label for the name of the resource.
LabelTriggerName = "trigger_name" LabelName = "name"
// LabelBrokerName is the label for the name of the Broker. // LabelResourceGroup is the name of the resource CRD.
LabelResourceGroup = "resource_group"
// LabelBrokerName is the label for the name of the Trigger's broker.
LabelBrokerName = "broker_name" LabelBrokerName = "broker_name"
// LabelEventType is the label for the name of the event type. // LabelEventType is the label for the name of the event type.
@ -47,12 +50,6 @@ const (
// LabelFilterSource is the label for the Trigger filter attribute "source". // LabelFilterSource is the label for the Trigger filter attribute "source".
LabelFilterSource = "filter_source" LabelFilterSource = "filter_source"
// LabelSourceName is the label for the name of the Source.
LabelSourceName = "source_name"
// LabelSourceResourceGroup is the name of the Source CRD.
LabelSourceResourceGroup = "source_resource_group"
) )
var ( var (
@ -62,7 +59,7 @@ var (
LabelLocation, LabelLocation,
LabelClusterName, LabelClusterName,
LabelNamespaceName, LabelNamespaceName,
LabelTriggerName, LabelName,
LabelBrokerName, LabelBrokerName,
) )
@ -80,7 +77,7 @@ var (
LabelLocation, LabelLocation,
LabelClusterName, LabelClusterName,
LabelNamespaceName, LabelNamespaceName,
LabelBrokerName, LabelName,
) )
// KnativeBrokerMetrics stores a set of metric types which are supported // KnativeBrokerMetrics stores a set of metric types which are supported
@ -95,8 +92,8 @@ var (
LabelLocation, LabelLocation,
LabelClusterName, LabelClusterName,
LabelNamespaceName, LabelNamespaceName,
LabelSourceName, LabelName,
LabelSourceResourceGroup, LabelResourceGroup,
) )
// KnativeSourceMetrics stores a set of metric types which are supported // KnativeSourceMetrics stores a set of metric types which are supported

24
metrics/monitored_resources_eventing.go
View File

@ -59,7 +59,7 @@ func (kt *KnativeTrigger) MonitoredResource() (resType string, labels map[string
metricskey.LabelLocation: kt.Location, metricskey.LabelLocation: kt.Location,
metricskey.LabelClusterName: kt.ClusterName, metricskey.LabelClusterName: kt.ClusterName,
metricskey.LabelNamespaceName: kt.NamespaceName, metricskey.LabelNamespaceName: kt.NamespaceName,
metricskey.LabelTriggerName: kt.TriggerName, metricskey.LabelName: kt.TriggerName,
metricskey.LabelBrokerName: kt.BrokerName, metricskey.LabelBrokerName: kt.BrokerName,
} }
return metricskey.ResourceTypeKnativeTrigger, labels return metricskey.ResourceTypeKnativeTrigger, labels
@ -71,19 +71,19 @@ func (kb *KnativeBroker) MonitoredResource() (resType string, labels map[string]
metricskey.LabelLocation: kb.Location, metricskey.LabelLocation: kb.Location,
metricskey.LabelClusterName: kb.ClusterName, metricskey.LabelClusterName: kb.ClusterName,
metricskey.LabelNamespaceName: kb.NamespaceName, metricskey.LabelNamespaceName: kb.NamespaceName,
metricskey.LabelBrokerName: kb.BrokerName, metricskey.LabelName: kb.BrokerName,
} }
return metricskey.ResourceTypeKnativeBroker, labels return metricskey.ResourceTypeKnativeBroker, labels
} }
func (ki *KnativeSource) MonitoredResource() (resType string, labels map[string]string) { func (ki *KnativeSource) MonitoredResource() (resType string, labels map[string]string) {
labels = map[string]string{ labels = map[string]string{
metricskey.LabelProject: ki.Project, metricskey.LabelProject: ki.Project,
metricskey.LabelLocation: ki.Location, metricskey.LabelLocation: ki.Location,
metricskey.LabelClusterName: ki.ClusterName, metricskey.LabelClusterName: ki.ClusterName,
metricskey.LabelNamespaceName: ki.NamespaceName, metricskey.LabelNamespaceName: ki.NamespaceName,
metricskey.LabelSourceName: ki.SourceName, metricskey.LabelName: ki.SourceName,
metricskey.LabelSourceResourceGroup: ki.SourceResourceGroup, metricskey.LabelResourceGroup: ki.SourceResourceGroup,
} }
return metricskey.ResourceTypeKnativeSource, labels return metricskey.ResourceTypeKnativeSource, labels
} }
@ -98,7 +98,7 @@ func GetKnativeBrokerMonitoredResource(
ClusterName: gm.cluster, ClusterName: gm.cluster,
// The rest resource labels are from metrics labels. // The rest resource labels are from metrics labels.
NamespaceName: valueOrUnknown(metricskey.LabelNamespaceName, tagsMap), NamespaceName: valueOrUnknown(metricskey.LabelNamespaceName, tagsMap),
BrokerName: valueOrUnknown(metricskey.LabelBrokerName, tagsMap), BrokerName: valueOrUnknown(metricskey.LabelName, tagsMap),
} }
var newTags []tag.Tag var newTags []tag.Tag
@ -122,7 +122,7 @@ func GetKnativeTriggerMonitoredResource(
ClusterName: gm.cluster, ClusterName: gm.cluster,
// The rest resource labels are from metrics labels. // The rest resource labels are from metrics labels.
NamespaceName: valueOrUnknown(metricskey.LabelNamespaceName, tagsMap), NamespaceName: valueOrUnknown(metricskey.LabelNamespaceName, tagsMap),
TriggerName: valueOrUnknown(metricskey.LabelTriggerName, tagsMap), TriggerName: valueOrUnknown(metricskey.LabelName, tagsMap),
BrokerName: valueOrUnknown(metricskey.LabelBrokerName, tagsMap), BrokerName: valueOrUnknown(metricskey.LabelBrokerName, tagsMap),
} }
@ -147,8 +147,8 @@ func GetKnativeSourceMonitoredResource(
ClusterName: gm.cluster, ClusterName: gm.cluster,
// The rest resource labels are from metrics labels. // The rest resource labels are from metrics labels.
NamespaceName: valueOrUnknown(metricskey.LabelNamespaceName, tagsMap), NamespaceName: valueOrUnknown(metricskey.LabelNamespaceName, tagsMap),
SourceName: valueOrUnknown(metricskey.LabelSourceName, tagsMap), SourceName: valueOrUnknown(metricskey.LabelName, tagsMap),
SourceResourceGroup: valueOrUnknown(metricskey.LabelSourceResourceGroup, tagsMap), SourceResourceGroup: valueOrUnknown(metricskey.LabelResourceGroup, tagsMap),
} }
var newTags []tag.Tag var newTags []tag.Tag

10
metrics/stackdriver_exporter_test.go
View File

@ -206,7 +206,7 @@ func TestGetMonitoredResourceFunc_UseKnativeBroker(t *testing.T) {
if !ok || got != testNS { if !ok || got != testNS {
t.Errorf("expected label %v with value %v, got: %v", metricskey.LabelNamespaceName, testNS, got) t.Errorf("expected label %v with value %v, got: %v", metricskey.LabelNamespaceName, testNS, got)
} }
got, ok = labels[metricskey.LabelBrokerName] got, ok = labels[metricskey.LabelName]
if !ok || got != testBroker { if !ok || got != testBroker {
t.Errorf("expected label %v with value %v, got: %v", metricskey.LabelBrokerName, testBroker, got) t.Errorf("expected label %v with value %v, got: %v", metricskey.LabelBrokerName, testBroker, got)
} }
@ -276,13 +276,13 @@ func TestGetMonitoredResourceFunc_UseKnativeSource(t *testing.T) {
if !ok || got != testNS { if !ok || got != testNS {
t.Errorf("expected label %v with value %v, got: %v", metricskey.LabelNamespaceName, testNS, got) t.Errorf("expected label %v with value %v, got: %v", metricskey.LabelNamespaceName, testNS, got)
} }
got, ok = labels[metricskey.LabelSourceName] got, ok = labels[metricskey.LabelName]
if !ok || got != testSource { if !ok || got != testSource {
t.Errorf("expected label %v with value %v, got: %v", metricskey.LabelSourceName, testSource, got) t.Errorf("expected label %v with value %v, got: %v", metricskey.LabelName, testSource, got)
} }
got, ok = labels[metricskey.LabelSourceResourceGroup] got, ok = labels[metricskey.LabelResourceGroup]
if !ok || got != testSourceResourceGroup { if !ok || got != testSourceResourceGroup {
t.Errorf("expected label %v with value %v, got: %v", metricskey.LabelSourceResourceGroup, testSourceResourceGroup, got) t.Errorf("expected label %v with value %v, got: %v", metricskey.LabelResourceGroup, testSourceResourceGroup, got)
} }
} }
} }

4
source/source_stats_reporter.go
View File

@ -44,8 +44,8 @@ var (
namespaceKey = tag.MustNewKey(metricskey.LabelNamespaceName) namespaceKey = tag.MustNewKey(metricskey.LabelNamespaceName)
eventSourceKey = tag.MustNewKey(metricskey.LabelEventSource) eventSourceKey = tag.MustNewKey(metricskey.LabelEventSource)
eventTypeKey = tag.MustNewKey(metricskey.LabelEventType) eventTypeKey = tag.MustNewKey(metricskey.LabelEventType)
sourceNameKey = tag.MustNewKey(metricskey.LabelSourceName) sourceNameKey = tag.MustNewKey(metricskey.LabelName)
sourceResourceGroupKey = tag.MustNewKey(metricskey.LabelSourceResourceGroup) sourceResourceGroupKey = tag.MustNewKey(metricskey.LabelResourceGroup)
responseCodeKey = tag.MustNewKey(metricskey.LabelResponseCode) responseCodeKey = tag.MustNewKey(metricskey.LabelResponseCode)
responseCodeClassKey = tag.MustNewKey(metricskey.LabelResponseCodeClass) responseCodeClassKey = tag.MustNewKey(metricskey.LabelResponseCodeClass)
) )

14
source/source_stats_reporter_test.go
View File

@ -41,13 +41,13 @@ func TestStatsReporter(t *testing.T) {
} }
wantTags := map[string]string{ wantTags := map[string]string{
metricskey.LabelNamespaceName: "testns", metricskey.LabelNamespaceName: "testns",
metricskey.LabelEventType: "dev.knative.event", metricskey.LabelEventType: "dev.knative.event",
metricskey.LabelEventSource: "unit-test", metricskey.LabelEventSource: "unit-test",
metricskey.LabelSourceName: "testsource", metricskey.LabelName: "testsource",
metricskey.LabelSourceResourceGroup: "testresourcegroup", metricskey.LabelResourceGroup: "testresourcegroup",
metricskey.LabelResponseCode: "202", metricskey.LabelResponseCode: "202",
metricskey.LabelResponseCodeClass: "2xx", metricskey.LabelResponseCodeClass: "2xx",
} }
// test ReportEventCount // test ReportEventCount