Skip to content

Commit 2f7eba7

Browse files
committed
Coverage
1 parent b006ce3 commit 2f7eba7

File tree

2 files changed

+28
-37
lines changed

2 files changed

+28
-37
lines changed

examples/spectest/petstore.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ paths:
4949
name: "body"
5050
description: "Pet object that needs to be added to the store"
5151
required: true
52+
x-ext-test: "Extension Test"
5253
schema:
5354
$ref: "#/definitions/Pet"
5455
responses:

lib/swsCoreStats.js

Lines changed: 27 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,7 @@ function swsCoreStats() {
5353
{ hrtime: process.hrtime(), cpuUsage: process.cpuUsage() }
5454
];
5555

56-
// prom-client metrics
57-
this.promClientMetrics = null;
58-
59-
}
60-
61-
// Initialize
62-
swsCoreStats.prototype.initialize = function (swsOptions) {
63-
64-
// Create Prometheus Metrics in prom-client
56+
// Prometheus metrics
6557
this.promClientMetrics = {};
6658

6759
this.promClientMetrics.api_all_request_total = new promClient.Counter({
@@ -100,7 +92,11 @@ swsCoreStats.prototype.initialize = function (swsOptions) {
10092
name: swsUtil.swsMetrics.nodejs_process_cpu_usage_percentage.name,
10193
help: swsUtil.swsMetrics.nodejs_process_cpu_usage_percentage.help });
10294

95+
}
10396

97+
// Initialize
98+
swsCoreStats.prototype.initialize = function (swsOptions) {
99+
// NOOP //
104100
};
105101

106102
swsCoreStats.prototype.getStats = function () {
@@ -149,13 +145,11 @@ swsCoreStats.prototype.calculateSystemStats = function(ts,totalElapsedSec) {
149145
this.sys.cpu = cpuPercent;
150146

151147
// Update prom-client metrics
152-
if(this.promClientMetrics !== null) {
153-
this.promClientMetrics.nodejs_process_memory_rss_bytes.set(this.sys.rss);
154-
this.promClientMetrics.nodejs_process_memory_heap_total_bytes.set(this.sys.heapTotal);
155-
this.promClientMetrics.nodejs_process_memory_heap_used_bytes.set(this.sys.heapUsed);
156-
this.promClientMetrics.nodejs_process_memory_external_bytes.set(this.sys.external);
157-
this.promClientMetrics.nodejs_process_cpu_usage_percentage.set(this.sys.cpu);
158-
}
148+
this.promClientMetrics.nodejs_process_memory_rss_bytes.set(this.sys.rss);
149+
this.promClientMetrics.nodejs_process_memory_heap_total_bytes.set(this.sys.heapTotal);
150+
this.promClientMetrics.nodejs_process_memory_heap_used_bytes.set(this.sys.heapUsed);
151+
this.promClientMetrics.nodejs_process_memory_external_bytes.set(this.sys.external);
152+
this.promClientMetrics.nodejs_process_cpu_usage_percentage.set(this.sys.cpu);
159153
};
160154

161155
// Count request
@@ -172,10 +166,8 @@ swsCoreStats.prototype.countRequest = function (req, res) {
172166
this.method[method].countRequest(req.sws.req_clength);
173167

174168
// Update prom-client metrics
175-
if(this.promClientMetrics !== null){
176-
this.promClientMetrics.api_all_request_total.inc();
177-
this.promClientMetrics.api_all_request_in_processing_total.inc();
178-
}
169+
this.promClientMetrics.api_all_request_total.inc();
170+
this.promClientMetrics.api_all_request_in_processing_total.inc();
179171
};
180172

181173

@@ -226,24 +218,22 @@ swsCoreStats.prototype.countResponse = function (res) {
226218
mstat.countResponse(res.statusCode,codeclass,duration,resContentLength);
227219
}
228220

229-
// Update prom-client metrics
230-
if(this.promClientMetrics !== null){
231-
switch(codeclass){
232-
case "success":
233-
this.promClientMetrics.api_all_success_total.inc();
234-
break;
235-
case "redirect":
236-
this.promClientMetrics.api_all_errors_total.inc();
237-
break;
238-
case "client_error":
239-
this.promClientMetrics.api_all_client_error_total.inc();
240-
break;
241-
case "server_error":
242-
this.promClientMetrics.api_all_server_error_total.inc();
243-
break;
244-
}
245-
this.promClientMetrics.api_all_request_in_processing_total.dec();
221+
// Update Prometheus metrics
222+
switch(codeclass){
223+
case "success":
224+
this.promClientMetrics.api_all_success_total.inc();
225+
break;
226+
case "redirect":
227+
this.promClientMetrics.api_all_errors_total.inc();
228+
break;
229+
case "client_error":
230+
this.promClientMetrics.api_all_client_error_total.inc();
231+
break;
232+
case "server_error":
233+
this.promClientMetrics.api_all_server_error_total.inc();
234+
break;
246235
}
236+
this.promClientMetrics.api_all_request_in_processing_total.dec();
247237

248238
};
249239

0 commit comments

Comments
 (0)