diff --git a/carbonj.service/src/test/java/com/demandware/carbonj/service/accumulator/_MetricAggregationRule.java b/carbonj.service/src/test/java/com/demandware/carbonj/service/accumulator/_MetricAggregationRule.java index 5854dd30..0fd5841f 100644 --- a/carbonj.service/src/test/java/com/demandware/carbonj/service/accumulator/_MetricAggregationRule.java +++ b/carbonj.service/src/test/java/com/demandware/carbonj/service/accumulator/_MetricAggregationRule.java @@ -33,13 +33,13 @@ public void setUp() ecom_agLatencyRule = MetricAggregationRule.parseDefinition( ".ecom_ag_latency.infrastructure.metrics.blade.reachability (60) = latency .infrastructure.metrics.blade.*.*.reachability" ); ecom_agRequestRule = MetricAggregationRule.parseDefinition( ".ecom_ag...requests.active-requests.count (60) c = sum .ecom...*.*.requests.*.active-requests.count" ); - ecom_agRequest_new_Rule = MetricAggregationRule.parseDefinition( ".ecom_ag...requests.active-requests.count (60) c = sum .ecom...*.*.requests.((?!on-request)(*)).active-requests.count" ); + ecom_agRequest_new_Rule = MetricAggregationRule.parseDefinition( ".ecom_ag...requests.active-requests.count (60) c = sum .ecom...*.*.requests.((?!onrequest)(*)).active-requests.count" ); } @Test public void shouldApply_ecom_ag_request_rule() { - String name1 = "pod1.ecom.aaba.aaba_prd.blade5-4.aaba_prd.requests.on-request.active-requests.count"; + String name1 = "pod1.ecom.aaba.aaba_prd.blade5-4.aaba_prd.requests.onrequest.active-requests.count"; String name2 = "pod1.ecom.aaba.aaba_prd.blade5-4.aaba_prd.requests.pipeline.active-requests.count"; Result expected1 = new Result("pod1.ecom_ag.aaba.aaba_prd.requests.active-requests.count", SUM, false ); Result expected2 = new Result("pod1.ecom_ag.aaba.aaba_prd.requests.active-requests.count", SUM, false ); @@ -50,9 +50,9 @@ public void shouldApply_ecom_ag_request_rule() @Test public void shouldApply_ecom_ag_request_new_rule() { - String name1 = "pod1.ecom.aaba.aaba_prd.blade5-4.aaba_prd.requests.on-request.active-requests.count"; + String name1 = "pod1.ecom.aaba.aaba_prd.blade5-4.aaba_prd.requests.onrequest.active-requests.count"; String name2 = "pod1.ecom.aaba.aaba_prd.blade5-4.aaba_prd.requests.pipeline.active-requests.count"; - Result expected1 = new Result(null, null, false ); // Should drop on-request + Result expected1 = new Result(null, null, false ); // Should drop onrequest Result expected2 = new Result("pod1.ecom_ag.aaba.aaba_prd.requests.active-requests.count", SUM, false ); assertThat( ecom_agRequest_new_Rule.apply( name1 ), equalTo( expected1 ) ); assertThat( ecom_agRequest_new_Rule.apply( name2 ), equalTo( expected2 ) );