Address context review

Signed-off-by: Rendre Greyling <rendre.greyling@nokia.com>

Author: rendre-greyling

internal/telemetry/metrics.go

@@ -21,10 +21,10 @@ import (
 	"github.com/kptdev/porch/api/porch/v1alpha1"
 	"github.com/kptdev/porch/api/porch/v1alpha2"
 	"github.com/kptdev/porch/pkg/repository"
+	porchcontext "github.com/kptdev/porch/pkg/util/context"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
-	"k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/klog/v2"
 )
 
@@ -121,7 +121,7 @@ func RecordRequestCount(ctx context.Context, resource, op, apiVersion string) {
 		klog.Warning("requestsTotal is nil - was InitMetrics() called?")
 		return
 	}
-	recordRequestCount(resource, op, apiVersion, getK8sUserName(ctx))
+	recordRequestCount(resource, op, apiVersion, porchcontext.GetK8sUserName(ctx))
 }
 
 func RecordControllerRequestCount(resource, op, apiVersion string) {
@@ -177,7 +177,7 @@ func RecordExternalRepoRequestCount(ctx context.Context, op string) {
 		metric.WithAttributes(
 			attribute.String("resource", ResourceExternalRepo),
 			attribute.String("op", op),
-			attribute.String("user", getK8sUserName(ctx)),
+			attribute.String("user", porchcontext.GetK8sUserName(ctx)),
 		),
 	)
 }
@@ -233,10 +233,3 @@ func packageSizeBucketBoundaries() []float64 {
 	copy(buckets[1:], doubled)
 	return buckets
 }
-
-func getK8sUserName(ctx context.Context) string {
-	if user, ok := request.UserFrom(ctx); ok {
-		return user.GetName()
-	}
-	return "<UNKNOWN>"
-}

internal/telemetry/metrics_test.go

@@ -320,10 +320,3 @@ func TestRecordPackageRevisionResourcesSize_VerboseLogging(t *testing.T) {
 	rm := collectMetricData(t, reader)
 	assert.True(t, hasMetric(rm, "porch_package_size_bytes"))
 }
-
-func TestGetK8sUserName(t *testing.T) {
-	assert.Equal(t, "<UNKNOWN>", getK8sUserName(context.Background()))
-
-	ctx := request.WithUser(context.Background(), &user.DefaultInfo{Name: "alice"})
-	assert.Equal(t, "alice", getK8sUserName(ctx))
-}

pkg/util/context/context.go

@@ -19,6 +19,7 @@ import (
 	"context"
 
 	"github.com/google/uuid"
+	"k8s.io/apiserver/pkg/endpoints/request"
 )
 
 type porchContextKey string
@@ -90,3 +91,10 @@ func LogMetadataFromWithExtras(ctx context.Context, extras ...any) []any {
 
 	return append(LogMetadataFrom(ctx), extras...)
 }
+
+func GetK8sUserName(ctx context.Context) string {
+	if user, ok := request.UserFrom(ctx); ok {
+		return user.GetName()
+	}
+	return "<UNKNOWN>"
+}