AI feedback 10 - address feedback

Signed-off-by: Lukasz Gryglicki <lgryglicki@cncf.io>

Assisted by [OpenAI](https://platform.openai.com/)

Assisted by [GitHub Copilot](https://github.com/features/copilot)

Author: lukaszgryglicki

cla-backend-go/go.mod

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 module github.com/linuxfoundation/easycla/cla-backend-go
 
-go 1.24.0
+go 1.24
 
 replace github.com/awslabs/aws-lambda-go-api-proxy => github.com/LF-Engineering/aws-lambda-go-api-proxy v0.3.2
 

cla-backend-go/serverless.yml

@@ -301,6 +301,8 @@ provider:
     DD_API_KEY_SECRET_ARN: ${file(./env.json):dd-api-key-secret-arn-${opt:stage}, ssm:/cla-dd-api-key-secret-arn-${opt:stage}}
     DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_HTTP_ENDPOINT: localhost:4318
     OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: http://localhost:4318/v1/traces
+    OTEL_DATADOG_API_LOGGING: ${file(./env.json):otel-datadog-api-logging-${opt:stage}, ssm:/cla-otel-datadog-api-logging-${opt:stage}}
+    DDB_API_LOGGING: ${file(./env.json):dynamodb-api-logging-${opt:stage}, ssm:/cla-dynamodb-api-logging-${opt:stage}}
 
   stackTags:
     Name: ${self:service}

cla-backend-go/telemetry/datadog_otlp.go

@@ -114,10 +114,10 @@ func WrapHTTPHandler(next http.Handler) http.Handler {
 	reAssetExt := regexp.MustCompile(`\.(png|svg|css|js|json|xml|htm|html)$`)
 	reSwaggerAsset := regexp.MustCompile(`^(/v[0-9]+)/swagger\.\{asset\}$`)
 	reUUID := regexp.MustCompile(`[0-9a-fA-F-]{36}`)
-	reNumericID := regexp.MustCompile(`/[0-9]+(?=/|$)`)
-	reSFID := regexp.MustCompile(`/(?:00|a0)[A-Za-z0-9]{13,16}(?=/|$)`)
-	reLFXID := regexp.MustCompile(`/lf[A-Za-z0-9]{16,22}(?=/|$)`)
-	reNull := regexp.MustCompile(`/null(?=/|$)`)
+	reNumericID := regexp.MustCompile(`/[0-9]+(/|$)`)
+	reSFID := regexp.MustCompile(`/(?:00|a0)[A-Za-z0-9]{13,16}(/|$)`)
+	reLFXID := regexp.MustCompile(`/lf[A-Za-z0-9]{16,22}(/|$)`)
+	reNull := regexp.MustCompile(`/null(/|$)`)
 
 	sanitize := func(path string) string {
 		p := strings.TrimSpace(path)
@@ -143,10 +143,10 @@ func WrapHTTPHandler(next http.Handler) http.Handler {
 
 		// Dynamic segment masking (use template placeholders, not "*")
 		p = reUUID.ReplaceAllString(p, "{uuid}")
-		p = reNumericID.ReplaceAllString(p, "/{id}")
-		p = reSFID.ReplaceAllString(p, "/{sfid}")
-		p = reLFXID.ReplaceAllString(p, "/{lfxid}")
-		p = reNull.ReplaceAllString(p, "/{null}")
+		p = reNumericID.ReplaceAllString(p, "/{id}$1")
+		p = reSFID.ReplaceAllString(p, "/{sfid}$1")
+		p = reLFXID.ReplaceAllString(p, "/{lfxid}$1")
+		p = reNull.ReplaceAllString(p, "/{null}$1")
 
 		if p == "" {
 			return "/"

cla-backend/cla/routes.py

@@ -58,10 +58,10 @@
 _RE_ASSET_EXT = re.compile(r"\.(png|svg|css|js|json|xml|htm|html)$")
 _RE_SWAGGER_ASSET = re.compile(r"^(/v[0-9]+)/swagger\.\{asset\}$")
 _RE_UUID = re.compile(r"[0-9a-fA-F-]{36}")
-_RE_NUMERIC_ID = re.compile(r"/[0-9]+(?=/|$)")
-_RE_SFID = re.compile(r"/(?:00|a0)[A-Za-z0-9]{13,16}(?=/|$)")
-_RE_LFXID = re.compile(r"/lf[A-Za-z0-9]{16,22}(?=/|$)")
-_RE_NULL = re.compile(r"/null(?=/|$)")
+_RE_NUMERIC_ID = re.compile(r"/[0-9]+(/|$)")
+_RE_SFID = re.compile(r"/(?:00|a0)[A-Za-z0-9]{13,16}(/|$)")
+_RE_LFXID = re.compile(r"/lf[A-Za-z0-9]{16,22}(/|$)")
+_RE_NULL = re.compile(r"/null(/|$)")
 
 def _sanitize_api_path(path: str) -> str:
     """
@@ -86,16 +86,20 @@ def _sanitize_api_path(path: str) -> str:
 
     # Dynamic IDs -> placeholders
     p = _RE_UUID.sub("{uuid}", p)
-    p = _RE_NUMERIC_ID.sub("/{id}", p)
-    p = _RE_SFID.sub("/{sfid}", p)
-    p = _RE_LFXID.sub("/{lfxid}", p)
-    p = _RE_NULL.sub("/{null}", p)
+    p = _RE_NUMERIC_ID.sub(r"/{id}\1", p)
+    p = _RE_SFID.sub(r"/{sfid}\1", p)
+    p = _RE_LFXID.sub(r"/{lfxid}\1", p)
+    p = _RE_NULL.sub(r"/{null}\1", p)
 
     return p or "/"
 
 def _stage_to_dd_env(stage: str) -> str:
     st = (stage or "dev").strip().lower()
-    return "prod" if st == "prod" else "dev"
+    if st == "prod":
+        return "prod"
+    if st == "staging":
+        return "staging"
+    return "dev"
 
 def _build_otlp_traces_endpoint() -> str:
     """
@@ -319,7 +323,7 @@ def process_data_api_logs(request, response):
 
     # OTel/Datadog API logging (stub only for Python for now)
     if _enabled_by_env_or_stage("OTEL_DATADOG_API_LOGGING", default_by_stage=(True, True)):
-         _log_api_request_otel_datadog_async(getattr(request, "method", "GET"), request.path)
+        _log_api_request_otel_datadog_async(getattr(request, "method", "GET"), request.path)
 
     if "/github/activity" in request.path:
         body = request.bounded_stream.read()

cla-backend/serverless.yml

@@ -387,6 +387,8 @@ provider:
     DD_API_KEY_SECRET_ARN: ${file(./env.json):dd-api-key-secret-arn-${sls:stage}, ssm:/cla-dd-api-key-secret-arn-${sls:stage}}
     DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_HTTP_ENDPOINT: localhost:4318
     OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: http://localhost:4318/v1/traces
+    OTEL_DATADOG_API_LOGGING: ${file(./env.json):otel-datadog-api-logging-${sls:stage}, ssm:/cla-otel-datadog-api-logging-${sls:stage}}
+    DDB_API_LOGGING: ${file(./env.json):dynamodb-api-logging-${sls:stage}, ssm:/cla-dynamodb-api-logging-${sls:stage}}
 
   stackTags:
     Name: ${self:service}