changefeedccl: Move metrics scope library under changefeedccl package.

Move metrics scope library out of cdcutil directly under changefeedccl.
Metrics scope is not much of a library since it's specific to changefeedccl.

Note: this is a move only refactoring, but it is structured as 2 changes
(one to add new files, and one to remove cdcutils files) so that it can
be easily backported.

Release Notes: None

pkg/ccl/changefeedccl/BUILD.bazel

@@ -11,6 +11,7 @@ go_library(
         "doc.go",
         "encoder.go",
         "metrics.go",
+        "metrics_scope.go",
         "name.go",
         "rowfetcher_cache.go",
         "schema_registry.go",
@@ -122,6 +123,7 @@ go_test(
         "helpers_tenant_shim_test.go",
         "helpers_test.go",
         "main_test.go",
+        "metrics_scope_test.go",
         "name_test.go",
         "nemeses_test.go",
         "schema_registry_test.go",
@@ -200,6 +202,7 @@ go_test(
         "//pkg/util/json",
         "//pkg/util/leaktest",
         "//pkg/util/log",
+        "//pkg/util/metric",
         "//pkg/util/mon",
         "//pkg/util/protoutil",
         "//pkg/util/randutil",

pkg/ccl/changefeedccl/metrics_scope.go

@@ -0,0 +1,77 @@
+// Copyright 2021 The Cockroach Authors.
+//
+// Licensed as a CockroachDB Enterprise file under the Cockroach Community
+// License (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+//     https://github.com/cockroachdb/cockroach/blob/master/licenses/CCL.txt
+
+package changefeedccl
+
+import (
+	"fmt"
+
+	"github.com/cockroachdb/cockroach/pkg/util/metric"
+)
+
+// maxSLIScopes is a static limit on the number of SLI scopes -- that is the number
+// of SLI metrics we will keep track of.
+// The limit is static due to metric.Registry limitations.
+const maxSLIScopes = 8
+
+// SLIMetrics is the list of SLI related metrics for changefeeds.
+type SLIMetrics struct {
+	ErrorRetries *metric.Counter
+	// TODO(yevgeniy): Add more SLI related metrics.
+}
+
+// MetricStruct implements metric.Struct interface
+func (*SLIMetrics) MetricStruct() {}
+
+func makeSLIMetrics(prefix string) *SLIMetrics {
+	withPrefix := func(meta metric.Metadata) metric.Metadata {
+		meta.Name = fmt.Sprintf("%s.%s", prefix, meta.Name)
+		return meta
+	}
+
+	return &SLIMetrics{
+		ErrorRetries: metric.NewCounter(withPrefix(metric.Metadata{
+			Name:        "error_retries",
+			Help:        "Total retryable errors encountered this SLI",
+			Measurement: "Errors",
+			Unit:        metric.Unit_COUNT,
+		})),
+	}
+}
+
+// SLIScopes represents a set of SLI related metrics for a particular "scope".
+type SLIScopes struct {
+	Scopes [maxSLIScopes]*SLIMetrics // Exported so that we can register w/ metrics registry.
+	names  map[string]*SLIMetrics
+}
+
+// MetricStruct implements metric.Struct interface
+func (*SLIScopes) MetricStruct() {}
+
+// CreateSLIScopes creates changefeed specific SLI scope: a metric.Struct containing
+// SLI specific metrics for each scope.
+// The scopes are statically named "tier<number>", and each metric name
+// contained in SLIMetrics will be prefixed by "changefeed.tier<number" prefix.
+func CreateSLIScopes() *SLIScopes {
+	scope := &SLIScopes{
+		names: make(map[string]*SLIMetrics, maxSLIScopes),
+	}
+
+	for i := 0; i < maxSLIScopes; i++ {
+		scopeName := fmt.Sprintf("tier%d", i)
+		scope.Scopes[i] = makeSLIMetrics(fmt.Sprintf("changefeed.%s", scopeName))
+		scope.names[scopeName] = scope.Scopes[i]
+	}
+	return scope
+}
+
+// GetSLIMetrics returns a metric.Struct associated with the specified scope, or nil
+// of no such scope exists.
+func (s *SLIScopes) GetSLIMetrics(scopeName string) *SLIMetrics {
+	return s.names[scopeName]
+}

pkg/ccl/changefeedccl/metrics_scope_test.go

@@ -0,0 +1,57 @@
+// Copyright 2021 The Cockroach Authors.
+//
+// Licensed as a CockroachDB Enterprise file under the Cockroach Community
+// License (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+//     https://github.com/cockroachdb/cockroach/blob/master/licenses/CCL.txt
+
+package changefeedccl
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
+	"github.com/cockroachdb/cockroach/pkg/util/log"
+	"github.com/cockroachdb/cockroach/pkg/util/metric"
+	"github.com/stretchr/testify/require"
+)
+
+func TestMetricScope(t *testing.T) {
+	defer leaktest.AfterTest(t)()
+	defer log.Scope(t).Close(t)
+
+	scope := CreateSLIScopes()
+	require.NotNil(t, scope)
+
+	sliMetricNames := []string{
+		"error_retries",
+	}
+
+	expectedMetrics := make(map[string]struct{})
+	expectScopedMetrics := func(scope string) {
+		for _, n := range sliMetricNames {
+			expectedMetrics[fmt.Sprintf("changefeed.%s.%s", scope, n)] = struct{}{}
+		}
+	}
+
+	for i := 0; i < maxSLIScopes; i++ {
+		scopeName := fmt.Sprintf("tier%d", i)
+		require.NotNil(t, scope.GetSLIMetrics(scopeName))
+		expectScopedMetrics(scopeName)
+	}
+
+	require.Nil(t, scope.GetSLIMetrics("does not exist"))
+	require.Nil(t, scope.GetSLIMetrics(fmt.Sprintf("tier%d", maxSLIScopes+1)))
+
+	registry := metric.NewRegistry()
+	registry.AddMetricStruct(scope)
+	registry.Each(func(name string, _ interface{}) {
+		_, exists := expectedMetrics[name]
+		require.True(t, exists)
+		delete(expectedMetrics, name)
+	})
+	require.Equal(t, 0, len(expectedMetrics),
+		"remaining metrics: %s", expectedMetrics)
+}