diff --git a/go.mod b/go.mod index 118cdb28..cae4f8b6 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,8 @@ require ( k8s.io/client-go v11.0.1-0.20190805182717-6502b5e7b1b5+incompatible k8s.io/code-generator v0.18.0 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a - knative.dev/pkg v0.0.0-20200512191130-b10849aacf82 - knative.dev/test-infra v0.0.0-20200513011557-d03429a76034 + knative.dev/pkg v0.0.0-20200514052058-c75d324f8b8b + knative.dev/test-infra v0.0.0-20200513224158-2b7ecf0da961 ) replace ( diff --git a/go.sum b/go.sum index 928a9080..7733faf6 100644 --- a/go.sum +++ b/go.sum @@ -1371,15 +1371,15 @@ knative.dev/pkg v0.0.0-20191111150521-6d806b998379/go.mod h1:pgODObA1dTyhNoFxPZT knative.dev/pkg v0.0.0-20200428194351-90fc61bae7f7/go.mod h1:o+e8OVEJKIuvXPsGVPIautjXgs05xbos7G+QMRjuUps= knative.dev/pkg v0.0.0-20200505191044-3da93ebb24c2 h1:Qu2NlOHb9p3g+CSL/ok9+FySowN60URFEKRSXfWtDv4= knative.dev/pkg v0.0.0-20200505191044-3da93ebb24c2/go.mod h1:Q6sL35DdGs8hIQZKdaCXJGgY8f90BmNBKSb8z6d/BTM= -knative.dev/pkg v0.0.0-20200512191130-b10849aacf82 h1:fNi8SJwQ5ADR0vj5EEpAcgdqlMKG1Ukym6BROixBLcc= -knative.dev/pkg v0.0.0-20200512191130-b10849aacf82/go.mod h1:gv+6TBl/yLc/x2dpVfmjF+MWLbxWRm9ie5dJRASsPmw= +knative.dev/pkg v0.0.0-20200514052058-c75d324f8b8b h1:lM0uwBgNcS9S4cWLqIS6Fvjt3kR/6oAPXgbXfEzBJwU= +knative.dev/pkg v0.0.0-20200514052058-c75d324f8b8b/go.mod h1:tMOHGbxtRz8zYFGEGpV/bpoTEM1o89MwYFC4YJXl3GY= knative.dev/test-infra v0.0.0-20200407185800-1b88cb3b45a5/go.mod h1:xcdUkMJrLlBswIZqL5zCuBFOC22WIPMQoVX1L35i0vQ= knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55 h1:Ajn44+eHHjPQL/BQicj8LMy8VTD2ypMCfHJuZVGEtew= knative.dev/test-infra v0.0.0-20200505052144-5ea2f705bb55/go.mod h1:WqF1Azka+FxPZ20keR2zCNtiQA1MP9ZB4BH4HuI+SIU= -knative.dev/test-infra v0.0.0-20200509000045-c7114387eed5 h1:4lQU2AMChE3Hb2WgHDFfhRbYlITCMUgQ2Y6eeIIEgxM= -knative.dev/test-infra v0.0.0-20200509000045-c7114387eed5/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE= knative.dev/test-infra v0.0.0-20200513011557-d03429a76034 h1:JxqONCZVS7or+Fv3ebVQoipuIBH7Ig3Qbx170hgIF+A= knative.dev/test-infra v0.0.0-20200513011557-d03429a76034/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE= +knative.dev/test-infra v0.0.0-20200513224158-2b7ecf0da961 h1:idvJyBTh6J2owRgJgwuC0Y8BBEiCJf02IfK6+Vk0U7c= +knative.dev/test-infra v0.0.0-20200513224158-2b7ecf0da961/go.mod h1:aMif0KXL4g19YCYwsy4Ocjjz5xgPlseYV+B95Oo4JGE= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= diff --git a/vendor/knative.dev/pkg/metrics/metricskey/constants.go b/vendor/knative.dev/pkg/metrics/metricskey/constants.go index d9e2a1ac..56906768 100644 --- a/vendor/knative.dev/pkg/metrics/metricskey/constants.go +++ b/vendor/knative.dev/pkg/metrics/metricskey/constants.go @@ -41,6 +41,12 @@ const ( // LabelResponseCodeClass is the label for the HTTP response status code class. For example, "2xx", "3xx", etc. LabelResponseCodeClass = "response_code_class" + // LabelResponseError is the label for client error. For HTTP, A non-2xx status code doesn't cause an error. + LabelResponseError = "response_error" + + // LabelResponseTimeout is the label timeout. + LabelResponseTimeout = "response_timeout" + // ValueUnknown is the default value if the field is unknown, e.g. project will be unknown if Knative // is not running on GKE. ValueUnknown = "unknown" diff --git a/vendor/knative.dev/pkg/metrics/utils.go b/vendor/knative.dev/pkg/metrics/utils.go index 7345cec9..e2e56a41 100644 --- a/vendor/knative.dev/pkg/metrics/utils.go +++ b/vendor/knative.dev/pkg/metrics/utils.go @@ -16,7 +16,11 @@ limitations under the License. package metrics -import "strconv" +import ( + "strconv" + + "go.opencensus.io/tag" +) // ResponseCodeClass converts an HTTP response code to a string representing its response code class. // E.g., The response code class is "5xx" for response code 503. @@ -24,3 +28,27 @@ func ResponseCodeClass(responseCode int) string { // Get the hundred digit of the response code and concatenate "xx". return strconv.Itoa(responseCode/100) + "xx" } + +// MaybeInsertIntTag conditionally insert the tag when cond is true. +func MaybeInsertIntTag(key tag.Key, value int, cond bool) tag.Mutator { + if cond { + return tag.Insert(key, strconv.Itoa(value)) + } + return tag.Insert(key, "") +} + +// MaybeInsertBoolTag conditionally insert the tag when cond is true. +func MaybeInsertBoolTag(key tag.Key, value bool, cond bool) tag.Mutator { + if cond { + return tag.Insert(key, strconv.FormatBool(value)) + } + return tag.Insert(key, "") +} + +// MaybeInsertStringTag conditionally insert the tag when cond is true. +func MaybeInsertStringTag(key tag.Key, value string, cond bool) tag.Mutator { + if cond { + return tag.Insert(key, value) + } + return tag.Insert(key, "") +} diff --git a/vendor/modules.txt b/vendor/modules.txt index fc38e449..c6573d19 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -656,7 +656,7 @@ k8s.io/kube-openapi/pkg/util/sets k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/trace -# knative.dev/pkg v0.0.0-20200512191130-b10849aacf82 +# knative.dev/pkg v0.0.0-20200514052058-c75d324f8b8b knative.dev/pkg/apis knative.dev/pkg/apis/duck knative.dev/pkg/apis/duck/v1 @@ -676,7 +676,7 @@ knative.dev/pkg/metrics knative.dev/pkg/metrics/metricskey knative.dev/pkg/reconciler knative.dev/pkg/tracker -# knative.dev/test-infra v0.0.0-20200513011557-d03429a76034 +# knative.dev/test-infra v0.0.0-20200513224158-2b7ecf0da961 knative.dev/test-infra/scripts knative.dev/test-infra/tools/dep-collector # sigs.k8s.io/yaml v1.1.0