feat(otelx): add API key attribute key (#810)

ory · Sep 16, 2024 · f03cb99 · f03cb99
1 parent a2d35e9
commit f03cb99
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/otelx/attribute.go b/otelx/attribute.go
@@ -13,7 +13,7 @@ import (
 const nullString = "<null>"
 
 func StringAttrs(attrs map[string]string) []attribute.KeyValue {
-	s := []attribute.KeyValue{}
+	s := make([]attribute.KeyValue, 0, len(attrs))
 	for k, v := range attrs {
 		s = append(s, attribute.String(k, v))
 	}

diff --git a/otelx/semconv/events.go b/otelx/semconv/events.go
@@ -33,10 +33,11 @@ const (
 	AttributeKeyWorkspace          AttributeKey = "WorkspaceID"
 	AttributeKeySubscriptionID     AttributeKey = "SubscriptionID"
 	AttributeKeyProjectEnvironment AttributeKey = "ProjectEnvironment"
+	AttributeKeyAPIKeyID           AttributeKey = "APIKeyID"
 )
 
-func AttrIdentityID(val uuid.UUID) otelattr.KeyValue {
-	return otelattr.String(AttributeKeyIdentityID.String(), val.String())
+func AttrIdentityID[V string | uuid.UUID](val V) otelattr.KeyValue {
+	return otelattr.String(AttributeKeyIdentityID.String(), uuidOrString(val))
 }
 
 func AttrNID(val uuid.UUID) otelattr.KeyValue {
@@ -74,3 +75,17 @@ func AttrGeoLocation(val httpx.GeoLocation) []otelattr.KeyValue {
 
 	return geoLocationAttributes
 }
+
+func AttrAPIKeyID[V string | uuid.UUID](val V) otelattr.KeyValue {
+	return otelattr.String(AttributeKeyAPIKeyID.String(), uuidOrString(val))
+}
+
+func uuidOrString[V string | uuid.UUID](val V) string {
+	switch val := any(val).(type) {
+	case string:
+		return val
+	case uuid.UUID:
+		return val.String()
+	}
+	panic("unreachable")
+}