Correctly detect existing sensors in repository and use them instead.

tools.descartes.prisma.agent.wildfly/src/main/java/tools/descartes/prisma/agent/wildfly/service/ModelExtractionService.java

@@ -613,31 +613,31 @@ public class ModelExtractionService extends AgentController implements Service<M
 		ComponentSensor<RequestCount> inThroughputSensor = createSensor(StandardMetrics.DEPARTURES,
 				RequestCount.REQUESTS, Aggregation.CUMULATIVE_SUM, componentInstance,
 				innerCallerProvidingRole, incomingSignature, null);
-		ModelSkeletonUtil.insert(skeleton.getSensors().getSensors(), inThroughputSensor);
+		inThroughputSensor = ModelSkeletonUtil.insert(skeleton.getSensors().getSensors(), inThroughputSensor);
 		incomingRecord.setThroughputSensor(inThroughputSensor);
 
 		ComponentSensor<Time> inResponseTimeSensor = createSensor(StandardMetrics.RESPONSE_TIME,
 				Time.MILLISECONDS, Aggregation.CUMULATIVE_SUM, componentInstance,
 				innerCallerProvidingRole, incomingSignature, null);
-		ModelSkeletonUtil.insert(skeleton.getSensors().getSensors(), inResponseTimeSensor);
+		inResponseTimeSensor = ModelSkeletonUtil.insert(skeleton.getSensors().getSensors(), inResponseTimeSensor);
 		incomingRecord.setResponseTimeSensor(inResponseTimeSensor);
 
 		ComponentSensor<Time> inResidenceTimeSensor = createSensor(StandardMetrics.RESIDENCE_TIME, Time.MILLISECONDS,
 				Aggregation.CUMULATIVE_SUM, componentInstance, innerCallerProvidingRole, incomingSignature, null);
-		ModelSkeletonUtil.insert(skeleton.getSensors().getSensors(), inResidenceTimeSensor);
+		inResidenceTimeSensor = ModelSkeletonUtil.insert(skeleton.getSensors().getSensors(), inResidenceTimeSensor);
 		incomingRecord.setResidenceTimeSensor(inResidenceTimeSensor);
 
 		if (externalCall != null) {
 			ComponentSensor<RequestCount> outThroughputSensor = createSensor(StandardMetrics.DEPARTURES,
 					RequestCount.REQUESTS, Aggregation.CUMULATIVE_SUM, componentInstance,
 					innerCallerProvidingRole, incomingSignature, externalCall);
-			ModelSkeletonUtil.insert(skeleton.getSensors().getSensors(), outThroughputSensor);
+			outThroughputSensor = ModelSkeletonUtil.insert(skeleton.getSensors().getSensors(), outThroughputSensor);
 			outgoingRecord.setThroughputSensor(outThroughputSensor);
 
 			ComponentSensor<Time> outResponseTimeSensor = createSensor(StandardMetrics.RESPONSE_TIME, Time.MILLISECONDS,
 					Aggregation.CUMULATIVE_SUM, componentInstance, innerCallerProvidingRole, incomingSignature,
 					externalCall);
-			ModelSkeletonUtil.insert(skeleton.getSensors().getSensors(), outResponseTimeSensor);
+			outResponseTimeSensor = ModelSkeletonUtil.insert(skeleton.getSensors().getSensors(), outResponseTimeSensor);
 			outgoingRecord.setResponseTimeSensor(outResponseTimeSensor);
 		}
 	}