fix(metrics): Fix matching logic for authorize session endpoint (#5121)

The target authorize session endpoint allows for alternative target
identifiers besides the public id. For this to function correctly, the
grpc gateway path definition for the endpoint deviates from the common
pattern used for other endpoints that include ids. When this change was
done, it was not accounted for in the logic used to capture the
prometheus metrics for api requests to this particular endpoint,
resulting in the metrics never incrementing for the authorize session
endpoint.

This fix updates the matching logic used for the metrics to ensure that
the metrics are incremented for this endpoint.

See: c149bc4

internal/daemon/controller/internal/metric/api.go

@@ -101,12 +101,12 @@ func apiPathsAndMethods() map[string][]string {
 func buildRegexFromPath(p string) *regexp.Regexp {
 	// We only care about how grpc-gateway will route to specific handlers.
 	// As long as there is at least 1 character that is part of a path segment
-	// (not a '/', '?', or ':' we have identified an id for the sake of routing.
-	const idRegexp = "[^\\/\\?\\:]+"
+	// (not a '?', or ':' we have identified an id for the sake of routing.
+	const idRegexp = "[^\\?\\:]+"
 
-	// Replace any tag in the form of {id} or {auth_method_id} with the above
+	// Replace any tag in the form of {id}, {id**}, or {auth_method_id} with the above
 	// regex so we can match paths to that when measuring requests.
-	pWithId := string(regexp.MustCompile("\\{[^\\}]*id\\}").ReplaceAll([]byte(p), []byte(idRegexp)))
+	pWithId := string(regexp.MustCompile("\\{[^\\}]*id(\\=\\*\\*)?\\}").ReplaceAll([]byte(p), []byte(idRegexp)))
 
 	// Escape everything except for our id regexp.
 	var seg []string

internal/daemon/controller/internal/metric/api_test.go

@@ -41,12 +41,12 @@ func TestBuildRegexFromPath(t *testing.T) {
 				"/v1/pathsomething/am_1234567890:authenticate",
 				"/v1/pathsomething/{id}:authenticate",
 				"/v1/pathsomething/{auth_method}:authenticate",
+				"/v1/pathsomething/am_1234567890/:authenticate",
 			},
 			dont: []string{
 				"/v1/pathsomething:authenticate",
 				"/v1/pathsomething:authenticate:authenticate",
 				"/v1/pathsomething/:authenticate:authenticate",
-				"/v1/pathsomething/am_1234567890/:authenticate",
 				"/v1/pathsomething/?whatabout=:authenticate",
 			},
 		},
@@ -130,6 +130,31 @@ func TestPathLabel(t *testing.T) {
 			in:   "v1/accounts/a_1234567890:set-password",
 			want: "/v1/accounts/{id}:set-password",
 		},
+		{
+			// using target id
+			in:   "/v1/targets/tssh_12345789:authorize-session",
+			want: "/v1/targets/{id=**}:authorize-session",
+		},
+		{
+			// using target name
+			in:   "/v1/targets/foo-target:authorize-session",
+			want: "/v1/targets/{id=**}:authorize-session",
+		},
+		{
+			// using target name with a space
+			in:   "/v1/targets/foo target:authorize-session",
+			want: "/v1/targets/{id=**}:authorize-session",
+		},
+		{
+			// using target name with a slash
+			in:   "/v1/targets/foo/target:authorize-session",
+			want: "/v1/targets/{id=**}:authorize-session",
+		},
+		{
+			// using alias
+			in:   "/v1/targets/foo.test:authorize-session",
+			want: "/v1/targets/{id=**}:authorize-session",
+		},
 		{
 			// mistype the custom action
 			in:   "/v1/accounts/a_1234567890:set-passwords",