Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix bug in parent custom metrics #329

Merged
merged 1 commit into from
Dec 5, 2018
Merged

Fix bug in parent custom metrics #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion engine/src/main/java/io/seldon/engine/predictors/PredictiveUnitBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,11 @@ private void addMetrics(SeldonMessage msg,PredictiveUnitState state,Map<String,L
if (msg.hasMeta())
{
addCustomMetrics(msg.getMeta().getMetricsList(),state);
metrics.put(state.name,msg.getMeta().getMetricsList());
if (!metrics.containsKey(state.name))
metrics.putIfAbsent(state.name,new ArrayList<>());
List<Metric> current = metrics.get(state.name);
current.addAll(msg.getMeta().getMetricsList());
metrics.put(state.name,current);
}
}

Expand Down
41 changes: 33 additions & 8 deletions engine/src/test/java/io/seldon/engine/api/rest/TestRestClientControllerExternalGraphs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,8 @@ public void testTransformOutputMetrics() throws Exception
public void testRouterMetrics() throws Exception
{
String jsonStr = readFile("src/test/resources/router_simple.json",StandardCharsets.UTF_8);
String responseStr = readFile("src/test/resources/router_response.json",StandardCharsets.UTF_8);
String responseStrRouter = readFile("src/test/resources/router_response.json",StandardCharsets.UTF_8);
String responseStrModel = readFile("src/test/resources/router_model_response.json",StandardCharsets.UTF_8);
PredictorSpec.Builder PredictorSpecBuilder = PredictorSpec.newBuilder();
updateMessageBuilderFromJson(PredictorSpecBuilder, jsonStr);
PredictorSpec predictorSpec = PredictorSpecBuilder.build();
Expand All @@ -337,9 +338,19 @@ public void testRouterMetrics() throws Exception
enginePredictor.setPredictorSpec(predictorSpec);


ResponseEntity<String> httpResponse = new ResponseEntity<String>(responseStr, null, HttpStatus.OK);
ResponseEntity<String> httpResponse1 = new ResponseEntity<String>(responseStrRouter, null, HttpStatus.OK);
ResponseEntity<String> httpResponse2 = new ResponseEntity<String>(responseStrModel, null, HttpStatus.OK);
Mockito.when(restTemplate.postForEntity(Matchers.<URI>any(), Matchers.<HttpEntity<MultiValueMap<String, String>>>any(), Matchers.<Class<String>>any()))
.thenReturn(httpResponse);
.thenAnswer(new Answer<ResponseEntity<String>>() {
private int count = 0;

public ResponseEntity<String> answer(InvocationOnMock invocation) {
count++;
if (count == 1)
return httpResponse1;

return httpResponse2;
}});
internalPredictionService.setRestTemplate(restTemplate);

MvcResult res = mvc.perform(MockMvcRequestBuilders.post("/api/v0.1/predictions")
Expand All @@ -357,23 +368,37 @@ public void testRouterMetrics() throws Exception
// Check for returned metrics
Assert.assertEquals("COUNTER",seldonMessage.getMeta().getMetrics(0).getType().toString());
Assert.assertEquals(1.0F,seldonMessage.getMeta().getMetrics(0).getValue(),0.0);
Assert.assertEquals("mycounter",seldonMessage.getMeta().getMetrics(0).getKey());
Assert.assertEquals("myroutercounter",seldonMessage.getMeta().getMetrics(0).getKey());

Assert.assertEquals("GAUGE",seldonMessage.getMeta().getMetrics(1).getType().toString());
Assert.assertEquals(22.0F,seldonMessage.getMeta().getMetrics(1).getValue(),0.0);
Assert.assertEquals("mygauge",seldonMessage.getMeta().getMetrics(1).getKey());
Assert.assertEquals("myroutergauge",seldonMessage.getMeta().getMetrics(1).getKey());

Assert.assertEquals("TIMER",seldonMessage.getMeta().getMetrics(2).getType().toString());
Assert.assertEquals(1.0F,seldonMessage.getMeta().getMetrics(2).getValue(),0.0);
Assert.assertEquals("mytimer",seldonMessage.getMeta().getMetrics(2).getKey());
Assert.assertEquals("myroutertimer",seldonMessage.getMeta().getMetrics(2).getKey());

Assert.assertEquals("COUNTER",seldonMessage.getMeta().getMetrics(3).getType().toString());
Assert.assertEquals(1.0F,seldonMessage.getMeta().getMetrics(3).getValue(),0.0);
Assert.assertEquals("myroutermodelcounter",seldonMessage.getMeta().getMetrics(3).getKey());

Assert.assertEquals("GAUGE",seldonMessage.getMeta().getMetrics(4).getType().toString());
Assert.assertEquals(22.0F,seldonMessage.getMeta().getMetrics(4).getValue(),0.0);
Assert.assertEquals("myroutermodelgauge",seldonMessage.getMeta().getMetrics(4).getKey());

Assert.assertEquals("TIMER",seldonMessage.getMeta().getMetrics(5).getType().toString());
Assert.assertEquals(1.0F,seldonMessage.getMeta().getMetrics(5).getValue(),0.0);
Assert.assertEquals("myroutermodeltimer",seldonMessage.getMeta().getMetrics(5).getKey());

// Check prometheus endpoint for metric
MvcResult res2 = mvc.perform(MockMvcRequestBuilders.get("/prometheus")).andReturn();
Assert.assertEquals(200, res2.getResponse().getStatus());
response = res2.getResponse().getContentAsString();
System.out.println(response);
Assert.assertTrue(response.indexOf("mycounter_total{deployment_name=\"None\",model_image=\"seldonio/router\",model_name=\"router\",model_version=\"0.6\",mytag1=\"mytagval1\",predictor_name=\"fx-market-predictor\",predictor_version=\"unknown\",} 1.0")>-1);
Assert.assertTrue(response.indexOf("mytimer_seconds_count{deployment_name=\"None\",model_image=\"seldonio/router\",model_name=\"router\",model_version=\"0.6\",predictor_name=\"fx-market-predictor\",predictor_version=\"unknown\",} 1.0")>-1);
Assert.assertTrue(response.indexOf("myroutercounter_total{deployment_name=\"None\",model_image=\"seldonio/router\",model_name=\"router\",model_version=\"0.6\",mytag1=\"mytagval1\",predictor_name=\"fx-market-predictor\",predictor_version=\"unknown\",} 1.0")>-1);
Assert.assertTrue(response.indexOf("myroutertimer_seconds_count{deployment_name=\"None\",model_image=\"seldonio/router\",model_name=\"router\",model_version=\"0.6\",predictor_name=\"fx-market-predictor\",predictor_version=\"unknown\",} 1.0")>-1);
Assert.assertTrue(response.indexOf("myroutermodelcounter_total{deployment_name=\"None\",model_image=\"seldonio/model\",model_name=\"model\",model_version=\"0.6\",mytag1=\"mytagval1\",predictor_name=\"fx-market-predictor\",predictor_version=\"unknown\",} 1.0")>-1);
Assert.assertTrue(response.indexOf("myroutermodeltimer_seconds_count{deployment_name=\"None\",model_image=\"seldonio/model\",model_name=\"model\",model_version=\"0.6\",predictor_name=\"fx-market-predictor\",predictor_version=\"unknown\",} 1.0")>-1);

}

Expand Down
30 changes: 30 additions & 0 deletions engine/src/test/resources/router_model_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"meta": {
"metrics": [
{
"type": "COUNTER",
"key": "myroutermodelcounter",
"value": 1.0,
"tags": {"mytag1":"mytagval1"}
},
{
"type": "GAUGE",
"key": "myroutermodelgauge",
"value": 22.0
},
{
"type": "TIMER",
"key": "myroutermodeltimer",
"value": 1.0
}
]
},
"data": {
"ndarray": [
[
1,
2
]
]
}
}
6 changes: 3 additions & 3 deletions engine/src/test/resources/router_response.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,18 @@
"metrics": [
{
"type": "COUNTER",
"key": "mycounter",
"key": "myroutercounter",
"value": 1.0,
"tags": {"mytag1":"mytagval1"}
},
{
"type": "GAUGE",
"key": "mygauge",
"key": "myroutergauge",
"value": 22.0
},
{
"type": "TIMER",
"key": "mytimer",
"key": "myroutertimer",
"value": 1.0
}
]
Expand Down