[TMP] review(metrics) communicate failure via error code

Kong · Jun 11, 2024 · 84b192a · 84b192a
1 parent 7897be6
commit 84b192a
Showing 1 changed file with 5 additions and 12 deletions.
diff --git a/src/common/metrics/ngx_wa_metrics.c b/src/common/metrics/ngx_wa_metrics.c
@@ -344,9 +344,7 @@ ngx_wa_metrics_get(ngx_wa_metrics_t *metrics, uint32_t mid, ngx_uint_t *out)
 
     rc = ngx_wasm_shm_kv_get_locked(metrics->shm, NULL, &mid, &n, &cas);
     if (rc != NGX_OK) {
-        ngx_wasm_log_error(NGX_LOG_ERR, metrics->shm->log, 0,
-                           "metric \"%uD\" not found", mid);
-        return rc;
+        return NGX_DECLINED;
     }
 
     m = (ngx_wa_metric_t *) n->data;
@@ -392,19 +390,17 @@ ngx_wa_metrics_increment(ngx_wa_metrics_t *metrics, uint32_t mid, ngx_int_t n)
 
     rc = ngx_wasm_shm_kv_get_locked(metrics->shm, NULL, &mid, &val, &cas);
     if (rc != NGX_OK) {
-        ngx_wasm_log_error(NGX_LOG_ERR, metrics->shm->log, 0,
-                           "metric \"%uD\" not found", mid);
         goto error;
     }
 
     m = (ngx_wa_metric_t *) val->data;
 
     if (m->type != NGX_WA_METRIC_COUNTER) {
-        ngx_wasm_log_error(NGX_LOG_ERR, metrics->shm->log, 0,
+        ngx_wasm_log_error(NGX_LOG_WARN, metrics->shm->log, 0,
                            "attempt to call increment_metric on a %V; "
                            "operation not supported",
                            metric_type_name(m->type));
-        rc = NGX_ERROR;
+        rc = NGX_ABORT;
         goto error;
     }
 
@@ -445,9 +441,6 @@ ngx_wa_metrics_record(ngx_wa_metrics_t *metrics, uint32_t mid, ngx_int_t n)
 
     rc = ngx_wasm_shm_kv_get_locked(metrics->shm, NULL, &mid, &val, &cas);
     if (rc != NGX_OK) {
-        ngx_wasm_log_error(NGX_LOG_ERR, metrics->shm->log, 0,
-                           "metric \"%uD\" not found", mid);
-
         goto error;
     }
 
@@ -469,10 +462,10 @@ ngx_wa_metrics_record(ngx_wa_metrics_t *metrics, uint32_t mid, ngx_int_t n)
         break;
 
     default:
-        ngx_wasm_log_error(NGX_LOG_ERR, metrics->shm->log, 0,
+        ngx_wasm_log_error(NGX_LOG_WARN, metrics->shm->log, 0,
                            "attempt to call record_metric on a counter; "
                            "operation not supported");
-        rc = NGX_ERROR;
+        rc = NGX_ABORT;
         goto error;
 
         break;