Skip to content
Snippets Groups Projects
Commit bc98f16b authored by Simon Eismann's avatar Simon Eismann
Browse files

updated for new DQL version

parent 393448a4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 240 additions and 249 deletions
tools.descartes.dql.connector.kieker.releng.platform/tools.descartes.dql.connector.kieker.releng.platform.target
+ 123
− 121
View file @ bc98f16b
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="dql-kieker" sequenceNumber="1472119107"> <?pde?>
<locations> <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit"> <target name="dql-kieker" sequenceNumber="1474237762">
<unit id="org.eclipse.m2m.qvt.oml" version="3.6.0.v20160606-1156"/> <locations>
<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160606-1156"/> <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.m2m.qvt.oml.runtime.feature.group" version="3.6.0.v20160606-1156"/> <unit id="org.eclipse.m2m.qvt.oml" version="3.6.0.v20160606-1156"/>
<unit id="org.eclipse.emf.common" version="2.12.0.v20160420-0247"/> <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.6.0.v20160606-1156"/>
<unit id="org.eclipse.core.resources" version="3.11.0.v20160503-1608"/> <unit id="org.eclipse.m2m.qvt.oml.runtime.feature.group" version="3.6.0.v20160606-1156"/>
<unit id="org.eclipse.core.filesystem" version="1.6.0.v20160503-1608"/> <unit id="org.eclipse.emf.common" version="2.12.0.v20160420-0247"/>
<unit id="org.eclipse.emf.feature.group" version="2.12.0.v20160526-0356"/> <unit id="org.eclipse.core.resources" version="3.11.0.v20160503-1608"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201605250459"/> <unit id="org.eclipse.core.filesystem" version="1.6.0.v20160503-1608"/>
<unit id="org.antlr.runtime" version="4.3.0.v201502022030"/> <unit id="org.eclipse.emf.feature.group" version="2.12.0.v20160526-0356"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/> <unit id="org.eclipse.xtext.sdk.feature.group" version="2.10.0.v201605250459"/>
<unit id="com.google.guava" version="15.0.0.v201403281430"/> <unit id="org.antlr.runtime" version="4.3.0.v201502022030"/>
<unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160606-1342"/> <unit id="com.google.inject" version="3.0.0.v201605172100"/>
<unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="2.9.0.v201605261103"/> <unit id="com.google.guava" version="15.0.0.v201403281430"/>
<unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/> <unit id="org.eclipse.sdk.feature.group" version="4.6.0.v20160606-1342"/>
<unit id="org.eclipse.xtend.lib" version="2.10.0.v201605250459"/> <unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="2.9.0.v201605261103"/>
<unit id="org.eclipse.xtend.lib.macro" version="2.10.0.v201605250459"/> <unit id="org.eclipse.xtend.feature.group" version="2.2.0.v201605260315"/>
<unit id="org.eclipse.ocl.examples.xtext.oclinecore" version="3.5.0.v20160105-2030"/> <unit id="org.eclipse.xtend.lib" version="2.10.0.v201605250459"/>
<unit id="org.eclipse.ecf" version="3.8.0.v20160405-1820"/> <unit id="org.eclipse.xtend.lib.macro" version="2.10.0.v201605250459"/>
<unit id="org.eclipse.ecf.identity" version="3.7.0.v20160405-1820"/> <unit id="org.eclipse.ocl.examples.xtext.oclinecore" version="3.5.0.v20160105-2030"/>
<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.13.1.v20160405-1820"/> <unit id="org.eclipse.ecf" version="3.8.0.v20160405-1820"/>
<unit id="org.eclipse.emf.mwe.utils" version="1.3.20.v201605261103"/> <unit id="org.eclipse.ecf.identity" version="3.7.0.v20160405-1820"/>
<unit id="org.eclipse.emf.mwe.core" version="1.3.20.v201605261103"/> <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.13.1.v20160405-1820"/>
<unit id="org.eclipse.xtend.shared.ui" version="2.2.0.v201605260315"/> <unit id="org.eclipse.emf.mwe.utils" version="1.3.20.v201605261103"/>
<unit id="org.eclipse.xpand" version="2.2.0.v201605260315"/> <unit id="org.eclipse.emf.mwe.core" version="1.3.20.v201605261103"/>
<unit id="org.eclipse.ocl.examples.pivot" version="3.5.0.v20160105-2030"/> <unit id="org.eclipse.xtend.shared.ui" version="2.2.0.v201605260315"/>
<unit id="org.eclipse.emf.mwe.ui" version="1.3.20.v201605261103"/> <unit id="org.eclipse.xpand" version="2.2.0.v201605260315"/>
<unit id="org.eclipse.equinox.concurrent" version="1.1.0.v20130327-1442"/> <unit id="org.eclipse.ocl.examples.pivot" version="3.5.0.v20160105-2030"/>
<unit id="org.eclipse.ant.core" version="3.4.100.v20160505-0642"/> <unit id="org.eclipse.emf.mwe.ui" version="1.3.20.v201605261103"/>
<unit id="org.eclipse.ant.ui.source" version="3.6.200.v20160525-1820"/> <unit id="org.eclipse.equinox.concurrent" version="1.1.0.v20130327-1442"/>
<unit id="org.eclipse.jdt.feature.group" version="3.12.0.v20160606-1100"/> <unit id="org.eclipse.ant.core" version="3.4.100.v20160505-0642"/>
<unit id="org.eclipse.debug.core" version="3.10.100.v20160419-1720"/> <unit id="org.eclipse.ant.ui.source" version="3.6.200.v20160525-1820"/>
<unit id="org.eclipse.core.externaltools" version="1.0.400.v20160509-1057"/> <unit id="org.eclipse.jdt.feature.group" version="3.12.0.v20160606-1100"/>
<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/> <unit id="org.eclipse.debug.core" version="3.10.100.v20160419-1720"/>
<unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="1.4.0.v20160526-0606"/> <unit id="org.eclipse.core.externaltools" version="1.0.400.v20160509-1057"/>
<unit id="org.eclipse.gef.sdk.feature.group" version="3.11.0.201606061308"/> <unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
<unit id="org.eclipse.osgi.util" version="3.3.100.v20150423-1351"/> <unit id="org.eclipse.emf.ecore.xcore.sdk.feature.group" version="1.4.0.v20160526-0606"/>
<unit id="org.eclipse.m2m.qvt.oml.feature.group" version="3.6.0.v20160606-1156"/> <unit id="org.eclipse.gef.sdk.feature.group" version="3.11.0.201606061308"/>
<unit id="org.eclipse.xtext.util" version="2.10.0.v201605250459"/> <unit id="org.eclipse.osgi.util" version="3.3.100.v20150423-1351"/>
<unit id="org.eclipse.xtext.common.types" version="2.10.0.v201605250459"/> <unit id="org.eclipse.m2m.qvt.oml.feature.group" version="3.6.0.v20160606-1156"/>
<unit id="org.eclipse.xtext.xbase.lib" version="2.10.0.v201605250459"/> <unit id="org.eclipse.xtext.util" version="2.10.0.v201605250459"/>
<unit id="org.eclipse.graphiti" version="0.13.0.v20160608-1043"/> <unit id="org.eclipse.xtext.common.types" version="2.10.0.v201605250459"/>
<unit id="org.eclipse.xtext" version="2.10.0.v201605250459"/> <unit id="org.eclipse.xtext.xbase.lib" version="2.10.0.v201605250459"/>
<unit id="org.eclipse.jface.source" version="3.12.0.v20160518-1929"/> <unit id="org.eclipse.graphiti" version="0.13.0.v20160608-1043"/>
<unit id="org.eclipse.ocl.feature.group" version="3.6.0.v20160523-1914"/> <unit id="org.eclipse.xtext" version="2.10.0.v201605250459"/>
<unit id="org.eclipse.emf.cdo.feature.group" version="4.5.0.v20160607-1254"/> <unit id="org.eclipse.jface.source" version="3.12.0.v20160518-1929"/>
<unit id="org.eclipse.net4j.util.feature.group" version="4.5.0.v20160607-1254"/> <unit id="org.eclipse.ocl.feature.group" version="3.6.0.v20160523-1914"/>
<unit id="org.eclipse.emf.transaction.feature.jar" version="1.10.0.201606071900"/> <unit id="org.eclipse.emf.cdo.feature.group" version="4.5.0.v20160607-1254"/>
<unit id="org.eclipse.emf.validation.feature.group" version="1.10.0.201606071713"/> <unit id="org.eclipse.net4j.util.feature.group" version="4.5.0.v20160607-1254"/>
<unit id="org.h2.source" version="1.3.168.v201212121212"/> <unit id="org.eclipse.emf.transaction.feature.jar" version="1.10.0.201606071900"/>
<unit id="org.eclipse.uml2.common.edit.feature.group" version="2.1.0.v20160516-0939"/> <unit id="org.eclipse.emf.validation.feature.group" version="1.10.0.201606071713"/>
<unit id="org.eclipse.uml2.codegen.ecore.ui.feature.group" version="2.2.0.v20160516-0939"/> <unit id="org.h2.source" version="1.3.168.v201212121212"/>
<unit id="org.eclipse.uml2.common.feature.group" version="2.1.0.v20160516-0939"/> <unit id="org.eclipse.uml2.common.edit.feature.group" version="2.1.0.v20160516-0939"/>
<unit id="org.eclipse.uml2.uml.feature.group" version="5.2.0.v20160516-0939"/> <unit id="org.eclipse.uml2.codegen.ecore.ui.feature.group" version="2.2.0.v20160516-0939"/>
<unit id="org.eclipse.uml2.uml.resources.source" version="5.2.0.v20160516-0939"/> <unit id="org.eclipse.uml2.common.feature.group" version="2.1.0.v20160516-0939"/>
<unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/> <unit id="org.eclipse.uml2.uml.feature.group" version="5.2.0.v20160516-0939"/>
<unit id="org.eclipse.emf.query.feature.group" version="1.10.0.201606071631"/> <unit id="org.eclipse.uml2.uml.resources.source" version="5.2.0.v20160516-0939"/>
<unit id="org.eclipse.emf.query.ocl.feature.group" version="1.10.0.201606071631"/> <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/>
<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="4.5.0.v20160607-1511"/> <unit id="org.eclipse.emf.query.feature.group" version="1.10.0.201606071631"/>
<unit id="org.eclipse.net4j.feature.group" version="4.5.0.v20160607-1254"/> <unit id="org.eclipse.emf.query.ocl.feature.group" version="1.10.0.201606071631"/>
<unit id="org.eclipse.net4j.db.feature.group" version="4.5.0.v20160607-1254"/> <unit id="org.eclipse.emf.cdo.sdk.feature.group" version="4.5.0.v20160607-1511"/>
<unit id="org.eclipse.emf.compare.feature.group" version="3.2.0.201605311222"/> <unit id="org.eclipse.net4j.feature.group" version="4.5.0.v20160607-1254"/>
<unit id="org.eclipse.net4j.defs.feature.group" version="4.5.0.v20160607-1254"/> <unit id="org.eclipse.net4j.db.feature.group" version="4.5.0.v20160607-1254"/>
<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.2.0.201605311222"/> <unit id="org.eclipse.emf.compare.feature.group" version="3.2.0.201605311222"/>
<unit id="org.eclipse.emf.transaction.feature.group" version="1.10.0.201606071900"/> <unit id="org.eclipse.net4j.defs.feature.group" version="4.5.0.v20160607-1254"/>
<unit id="org.eclipse.emf.compare.rcp" version="2.4.0.201605311222"/> <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="3.2.0.201605311222"/>
<unit id="org.eclipse.emf.compare.rcp.ui" version="4.2.0.201605311222"/> <unit id="org.eclipse.emf.transaction.feature.group" version="1.10.0.201606071900"/>
<unit id="org.eclipse.ocl.all.feature.group" version="5.2.0.v20160523-1914"/> <unit id="org.eclipse.emf.compare.rcp" version="2.4.0.201605311222"/>
<unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160526-1513"/> <unit id="org.eclipse.emf.compare.rcp.ui" version="4.2.0.201605311222"/>
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160523-1914"/> <unit id="org.eclipse.ocl.all.feature.group" version="5.2.0.v20160523-1914"/>
<unit id="org.eclipse.ocl.examples.unified.feature.group" version="4.1.0.v20160526-1513"/> <unit id="org.eclipse.ocl.examples.feature.group" version="6.1.0.v20160526-1513"/>
<unit id="org.eclipse.ocl.examples" version="3.4.200.v20150611-1921"/> <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.2.0.v20160523-1914"/>
<unit id="org.eclipse.ocl.common" version="1.4.0.v20160521-2033"/> <unit id="org.eclipse.ocl.examples.unified.feature.group" version="4.1.0.v20160526-1513"/>
<unit id="org.eclipse.emf.validation" version="1.8.0.201606071713"/> <unit id="org.eclipse.ocl.examples" version="3.4.200.v20150611-1921"/>
<unit id="org.eclipse.ocl.pivot.uml" version="1.1.0.v20160523-1914"/> <unit id="org.eclipse.ocl.common" version="1.4.0.v20160521-2033"/>
<unit id="org.eclipse.ocl.all.sdk.feature.group" version="5.2.0.v20160523-1914"/> <unit id="org.eclipse.emf.validation" version="1.8.0.201606071713"/>
<unit id="org.eclipse.ocl.core.sdk.feature.group" version="5.2.0.v20160523-1914"/> <unit id="org.eclipse.ocl.pivot.uml" version="1.1.0.v20160523-1914"/>
<unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160516-0939"/> <unit id="org.eclipse.ocl.all.sdk.feature.group" version="5.2.0.v20160523-1914"/>
<unit id="org.eclipse.graphiti.sdk.feature.feature.group" version="0.13.0.v20160608-1043"/> <unit id="org.eclipse.ocl.core.sdk.feature.group" version="5.2.0.v20160523-1914"/>
<unit id="org.eclipse.zest.layouts" version="1.1.300.201606061308"/> <unit id="org.eclipse.uml2.sdk.feature.group" version="5.2.0.v20160516-0939"/>
<unit id="org.eclipse.emf.mwe2.launch" version="2.9.0.v201605261103"/> <unit id="org.eclipse.graphiti.sdk.feature.feature.group" version="0.13.0.v20160608-1043"/>
<unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201605261103"/> <unit id="org.eclipse.zest.layouts" version="1.1.300.201606061308"/>
<unit id="org.eclipse.emf.workspace.feature.group" version="1.10.0.201606071900"/> <unit id="org.eclipse.emf.mwe2.launch" version="2.9.0.v201605261103"/>
<repository location="http://download.eclipse.org/releases/neon"/> <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.9.0.v201605261103"/>
</location> <unit id="org.eclipse.emf.workspace.feature.group" version="1.10.0.201606071900"/>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit"> <repository location="http://download.eclipse.org/releases/neon"/>
<unit id="edu.kit.ipd.descartes.mm.applicationlevel" version="0.0.0"/> </location>
<unit id="edu.kit.ipd.descartes.mm.deployment" version="0.0.0"/> <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="edu.kit.ipd.descartes.mm.resourcelandscape" version="0.0.0"/> <unit id="tools.descartes.dql.runtime.feature.feature.group" version="1.0.0.201609151306"/>
<unit id="edu.kit.ipd.descartes.mm.usageprofile" version="0.0.0"/> <unit id="tools.descartes.dql.lang.tests.feature.feature.group" version="1.0.0.201609151306"/>
<unit id="edu.kit.ipd.descartes.solving.feature.feature.group" version="0.0.0"/> <unit id="tools.descartes.dql.ui.feature.feature.group" version="1.0.0.201609151306"/>
<unit id="edu.kit.ipd.descartes.core" version="0.0.0"/> <repository location="https://se4.informatik.uni-wuerzburg.de/dql/downloads/snapshot/"/>
<unit id="edu.kit.ipd.descartes.identifier" version="0.0.0"/> </location>
<repository location="https://se4.informatik.uni-wuerzburg.de/dml/downloads/snapshot/"/> <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
</location> <unit id="edu.kit.ipd.descartes.mm.applicationlevel" version="0.0.0"/>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit"> <unit id="edu.kit.ipd.descartes.mm.deployment" version="0.0.0"/>
<unit id="org.junit" version="4.11.0.v201303080030"/> <unit id="edu.kit.ipd.descartes.mm.resourcelandscape" version="0.0.0"/>
<unit id="org.apache.ant" version="1.9.2.v201404171502"/> <unit id="edu.kit.ipd.descartes.mm.usageprofile" version="0.0.0"/>
<unit id="org.apache.commons.math" version="2.1.0.v201105210652"/> <unit id="edu.kit.ipd.descartes.solving.feature.feature.group" version="0.0.0"/>
<unit id="org.apache.commons.cli" version="1.2.0.v201404270220"/> <unit id="edu.kit.ipd.descartes.core" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/> <unit id="edu.kit.ipd.descartes.identifier" version="0.0.0"/>
</location> <repository location="https://se4.informatik.uni-wuerzburg.de/dml/downloads/snapshot/"/>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit"> </location>
<unit id="kieker" version="0.0.0"/> <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.jfreechart.core" version="1.0.19.v00"/> <unit id="org.junit" version="4.11.0.v201303080030"/>
<unit id="org.jfreechart.experimental" version="1.0.12.v02"/> <unit id="org.apache.ant" version="1.9.2.v201404171502"/>
<unit id="org.jfreechart.jcommon" version="1.0.19.v00"/> <unit id="org.apache.commons.math" version="2.1.0.v201105210652"/>
<unit id="org.jfreechart.swt" version="1.0.12.v02"/> <unit id="org.apache.commons.cli" version="1.2.0.v201404270220"/>
<repository location="https://se4.informatik.uni-wuerzburg.de/thirdparty/repository/"/> <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140525021250/repository/"/>
</location> </location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit"> <location includeMode="slicer" includeAllPlatforms="false" includeSource="false" includeConfigurePhase="false" type="InstallableUnit">
<unit id="tools.descartes.dql.ui.feature.feature.group" version="1.0.0.201608261145"/> <unit id="kieker" version="0.0.0"/>
<unit id="tools.descartes.dql.lang.tests.feature.feature.group" version="1.0.0.201608261145"/> <unit id="org.jfreechart.core" version="1.0.19.v00"/>
<unit id="tools.descartes.dql.runtime.feature.feature.group" version="1.0.0.201608261145"/> <unit id="org.jfreechart.experimental" version="1.0.12.v02"/>
<repository location="https://se4.informatik.uni-wuerzburg.de/dql/downloads/snapshot/"/> <unit id="org.jfreechart.jcommon" version="1.0.19.v00"/>
</location> <unit id="org.jfreechart.swt" version="1.0.12.v02"/>
</locations> <repository location="https://se4.informatik.uni-wuerzburg.de/thirdparty/repository/"/>
</target> </location>
</locations>
</target>
tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/KiekerHelper.java
+ 20
− 16
View file @ bc98f16b
...@@ -23,9 +23,9 @@ import edu.kit.ipd.descartes.solving.ValidationError; ...@@ -23,9 +23,9 @@ import edu.kit.ipd.descartes.solving.ValidationError;
import kieker.common.configuration.Configuration; import kieker.common.configuration.Configuration;
import tools.descartes.dql.core.engine.util.DQLLogger; import tools.descartes.dql.core.engine.util.DQLLogger;
import tools.descartes.dql.models.mapping.domain.DomainFactory; import tools.descartes.dql.models.mapping.domain.DomainFactory;
import tools.descartes.dql.models.mapping.domain.Entity;
import tools.descartes.dql.models.mapping.domain.Probe; import tools.descartes.dql.models.mapping.domain.Probe;
import tools.descartes.dql.models.mapping.domain.SeriesResultElement; import tools.descartes.dql.models.mapping.domain.SeriesResultElement;
import tools.descartes.dql.models.mapping.domain.Service;
import tools.descartes.dql.models.mapping.mapping.EntityMapping; import tools.descartes.dql.models.mapping.mapping.EntityMapping;
/* /*
...@@ -113,8 +113,9 @@ public class KiekerHelper { ...@@ -113,8 +113,9 @@ public class KiekerHelper {
public static ArrayList<String> getServiceIdentifiers(EntityMapping request) { public static ArrayList<String> getServiceIdentifiers(EntityMapping request) {
ArrayList<String> services = new ArrayList<>(); ArrayList<String> services = new ArrayList<>();
for (Service service : request.getServices()) { for (Entity service : request.getEntities()) {
services.add(service.getIdentifier()); if (service.getEntityType().equals("SERVICE"))
services.add(service.getIdentifier());
} }
return services; return services;
} }
...@@ -128,9 +129,10 @@ public class KiekerHelper { ...@@ -128,9 +129,10 @@ public class KiekerHelper {
readerConfig.setProperty("TRACE_"+i, outputPath+File.separator+traceFolders[i]); readerConfig.setProperty("TRACE_"+i, outputPath+File.separator+traceFolders[i]);
} }
for (tools.descartes.dql.models.mapping.domain.Resource r : request.getResources()) { for (Entity e : request.getEntities()) {
for (Probe prob : r.getProbes()) { if (e.getEntityType().equals("RESOURCE"))
String r_id = r.getIdentifier(); for (Probe prob : e.getProbes()) {
String r_id = e.getIdentifier();
String r_type = KiekerHelper.getKiekerMetric(prob.getMetricName()); String r_type = KiekerHelper.getKiekerMetric(prob.getMetricName());
String r_value = KiekerHelper.getHostName()+" & SYSTEM 0.0 USER 0.0 "+r_type+" 0"; String r_value = KiekerHelper.getHostName()+" & SYSTEM 0.0 USER 0.0 "+r_type+" 0";
//String r_value = KiekerHelper.getHostName(); //String r_value = KiekerHelper.getHostName();
...@@ -141,16 +143,18 @@ public class KiekerHelper { ...@@ -141,16 +143,18 @@ public class KiekerHelper {
int i = 0; int i = 0;
// This should be services, but not working with PAVO for tests // This should be services, but not working with PAVO for tests
for (tools.descartes.dql.models.mapping.domain.Service s : request.getServices()) { for (Entity e : request.getEntities()) {
int j = 0; if (e.getEntityType().equals("SERVICE")) {
for (Probe prob : s.getProbes()) { int j = 0;
String s_id = s.getIdentifier(); for (Probe prob : e.getProbes()) {
String s_value = KiekerHelper.getHostName()+" & "+s_id; String s_id = e.getIdentifier();
//String r_value = KiekerHelper.getHostName(); String s_value = KiekerHelper.getHostName() + " & " + s_id;
readerConfig.setProperty("COMPONENT_c"+i+"."+j, s_value); // String r_value = KiekerHelper.getHostName();
i++; readerConfig.setProperty("COMPONENT_c" + i + "." + j, s_value);
} i++;
j++; }
j++;
}
} }
return readerConfig; return readerConfig;
} }
......
tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/ModelStructureQueryConnectorImpl.java
+ 96
− 103
View file @ bc98f16b
...@@ -7,29 +7,17 @@ import org.eclipse.emf.common.util.EList; ...@@ -7,29 +7,17 @@ import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.EcoreUtil;
import edu.kit.ipd.descartes.core.NamedElement;
import edu.kit.ipd.descartes.identifier.Identifier;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCallAction;
import edu.kit.ipd.descartes.mm.applicationlevel.servicebehavior.ExternalCallFrequency;
import edu.kit.ipd.descartes.mm.containerrepository.ContainerTemplate;
import edu.kit.ipd.descartes.mm.resourceconfiguration.ProcessingResourceSpecification;
import edu.kit.ipd.descartes.mm.resourcelandscape.Container;
import edu.kit.ipd.descartes.mm.usageprofile.SystemCallUserAction;
import edu.kit.ipd.descartes.mm.usageprofile.UsageScenario;
import tools.descartes.dql.connector.AbstractOSGiQueryConnector; import tools.descartes.dql.connector.AbstractOSGiQueryConnector;
import tools.descartes.dql.connector.ModelStructureQueryConnector; import tools.descartes.dql.connector.ModelStructureQueryConnector;
import tools.descartes.dql.connector.QueryProgressListener; import tools.descartes.dql.connector.QueryProgressListener;
import tools.descartes.dql.core.engine.util.DQLLogger; import tools.descartes.dql.core.engine.util.DQLLogger;
import tools.descartes.dql.models.mapping.domain.DomainFactory; import tools.descartes.dql.models.mapping.domain.DomainFactory;
import tools.descartes.dql.models.mapping.domain.Entity;
import tools.descartes.dql.models.mapping.domain.Probe; import tools.descartes.dql.models.mapping.domain.Probe;
import tools.descartes.dql.models.mapping.domain.Resource;
import tools.descartes.dql.models.mapping.domain.Service;
import tools.descartes.dql.models.mapping.domain.impl.DomainFactoryImpl; import tools.descartes.dql.models.mapping.domain.impl.DomainFactoryImpl;
import tools.descartes.dql.models.mapping.mapping.EntityMapping; import tools.descartes.dql.models.mapping.mapping.EntityMapping;
public class ModelStructureQueryConnectorImpl extends public class ModelStructureQueryConnectorImpl extends AbstractOSGiQueryConnector
AbstractOSGiQueryConnector implements ModelStructureQueryConnector { implements ModelStructureQueryConnector {
private final Logger log = DQLLogger.getLogger(this.getClass().getName()); private final Logger log = DQLLogger.getLogger(this.getClass().getName());
private final DomainFactory domainFactory = DomainFactoryImpl.init(); private final DomainFactory domainFactory = DomainFactoryImpl.init();
...@@ -62,41 +50,43 @@ public class ModelStructureQueryConnectorImpl extends ...@@ -62,41 +50,43 @@ public class ModelStructureQueryConnectorImpl extends
} }
/** /**
* Processes a found DML model identifier and performs individual * Processes a found DML model identifier and performs individual processing
* processing depending on the type of entity found. The model entity found * depending on the type of entity found. The model entity found is stored
* is stored in a suitable container (resources or services). * in a suitable container (resources or services).
* *
* @param resources * @param resources
* The destination for a resource found * The destination for a resource found
* @param services * @param services
* The destination for a service found * The destination for a service found
* @param result * @param result
* The model entity to be analyzed * The model entity to be analyzed
*/ */
private void processIdentifier( // private void processIdentifier(final
final EList<tools.descartes.dql.models.mapping.domain.Resource> resources, // EList<tools.descartes.dql.models.mapping.domain.Resource> resources,
final EList<Service> services, final EObject result) { // final EList<Service> services, final EObject result) {
final Identifier identifier = (Identifier) result; // final Identifier identifier = (Identifier) result;
final NamedElement namedElement = (NamedElement) result; // final NamedElement namedElement = (NamedElement) result;
//
if (result instanceof SystemCallUserAction // if (result instanceof SystemCallUserAction || result instanceof
|| result instanceof ExternalCallAction // ExternalCallAction
|| result instanceof ExternalCallFrequency // || result instanceof ExternalCallFrequency || result instanceof
|| result instanceof UsageScenario) { // UsageScenario) {
// Found a Service // // Found a Service
Entity entity = domainFactory.createService(); // Entity entity = domainFactory.createService();
entity.setIdentifier(identifier.getId()); // entity.setIdentifier(identifier.getId());
entity.setAlias(namedElement.getName()); // entity.setAlias(namedElement.getName());
services.add((Service) entity); // services.add((Service) entity);
} else if (result instanceof ProcessingResourceSpecification) { // } else if (result instanceof ProcessingResourceSpecification) {
// Found a Resource, apply workaround // // Found a Resource, apply workaround
processProcessingResourceSpec(resources, (ProcessingResourceSpecification) result); // processProcessingResourceSpec(resources,
} else { // (ProcessingResourceSpecification) result);
log.error("Well, this is a bug... An explicitly requested entity is not processed. Skipping."); // } else {
return; // log.error("Well, this is a bug... An explicitly requested entity is not
} // processed. Skipping.");
// return;
} // }
//
// }
/** /**
* Attaches available probes to resources * Attaches available probes to resources
...@@ -104,14 +94,15 @@ public class ModelStructureQueryConnectorImpl extends ...@@ -104,14 +94,15 @@ public class ModelStructureQueryConnectorImpl extends
* @param domainFactory * @param domainFactory
* @param resources * @param resources
*/ */
private void processProbesForResources(final EList<Resource> resources) { // private void processProbesForResources(final EList<Resource> resources) {
// TODO support DMLHelper.METRIC_THROUGHPUT also for resources // // TODO support DMLHelper.METRIC_THROUGHPUT also for resources
final String[] metrics = new String[] { KiekerHelper.METRIC_UTILIZATION }; // final String[] metrics = new String[] { KiekerHelper.METRIC_UTILIZATION
// };
for (final Resource r : resources) { //
attachProbes(metrics, r.getProbes()); // for (final Resource r : resources) {
} // attachProbes(metrics, r.getProbes());
} // }
// }
/** /**
* Attaches available probes to services * Attaches available probes to services
...@@ -119,18 +110,19 @@ public class ModelStructureQueryConnectorImpl extends ...@@ -119,18 +110,19 @@ public class ModelStructureQueryConnectorImpl extends
* @param domainFactory * @param domainFactory
* @param resources * @param resources
*/ */
private void processProbesForServices(final EList<Service> services) { // private void processProbesForServices(final EList<Service> services) {
final String[] metrics = new String[] { KiekerHelper.METRIC_RESPONSE_TIME_AVG, KiekerHelper.METRIC_THROUGHPUT }; // final String[] metrics = new String[] {
// KiekerHelper.METRIC_RESPONSE_TIME_AVG, KiekerHelper.METRIC_THROUGHPUT };
for (final Service s : services) { //
attachProbes(metrics, s.getProbes()); // for (final Service s : services) {
} // attachProbes(metrics, s.getProbes());
} // }
// }
/** /**
* Process a ProcessingResourceSpecification and add it to the EntityMapping list of * Process a ProcessingResourceSpecification and add it to the EntityMapping
* resources, the alias is enriched by a specific prefix in order to understand where the * list of resources, the alias is enriched by a specific prefix in order to
* ProcessingResource comes from. * understand where the ProcessingResource comes from.
* *
* @param resources * @param resources
* The EntityMapping list of resources * The EntityMapping list of resources
...@@ -138,32 +130,33 @@ public class ModelStructureQueryConnectorImpl extends ...@@ -138,32 +130,33 @@ public class ModelStructureQueryConnectorImpl extends
* The DML Identifier of the resource to be modified * The DML Identifier of the resource to be modified
* @param namedElement * @param namedElement
* The DML NamedElement of the resource to be modified * The DML NamedElement of the resource to be modified
* @return The created EntityMapping representation * @return The created EntityMapping representation
*/ */
private void processProcessingResourceSpec( // private void processProcessingResourceSpec(
final EList<tools.descartes.dql.models.mapping.domain.Resource> resources, // final EList<tools.descartes.dql.models.mapping.domain.Resource>
final ProcessingResourceSpecification prs) { // resources,
// compute understandable alias as concatenation of Strings of names of // final ProcessingResourceSpecification prs) {
// Container -> ProcessingResourceSpecification // // compute understandable alias as concatenation of Strings of names of
String alias = null; // // Container -> ProcessingResourceSpecification
EObject parent = prs.eContainer(); // String alias = null;
if (parent instanceof Container) { // EObject parent = prs.eContainer();
alias = ((Container) parent).getName() + "." + prs.getName(); // if (parent instanceof Container) {
} else if (parent instanceof ContainerTemplate) { // alias = ((Container) parent).getName() + "." + prs.getName();
log.error("ProcessingResourceSpecification " + prs.getId() // } else if (parent instanceof ContainerTemplate) {
+ " is not supported because ContainerTemplates are not yet supported."); // log.error("ProcessingResourceSpecification " + prs.getId()
} else { // + " is not supported because ContainerTemplates are not yet supported.");
log.error("ProcessingResourceSpecification " + prs.getId() // } else {
+ " is not supported because its parent types cannot be resolved."); // log.error("ProcessingResourceSpecification " + prs.getId()
} // + " is not supported because its parent types cannot be resolved.");
// }
if (null != alias) { //
Entity entity = domainFactory.createResource(); // if (null != alias) {
entity.setIdentifier(prs.getId()); // Entity entity = domainFactory.createResource();
entity.setAlias(alias); // entity.setIdentifier(prs.getId());
resources.add((Resource) entity); // entity.setAlias(alias);
} // resources.add((Resource) entity);
} // }
// }
@Override @Override
public EntityMapping requestDoF(final EntityMapping request) { public EntityMapping requestDoF(final EntityMapping request) {
...@@ -177,31 +170,31 @@ public class ModelStructureQueryConnectorImpl extends ...@@ -177,31 +170,31 @@ public class ModelStructureQueryConnectorImpl extends
@Override @Override
public EntityMapping requestEntities(final EntityMapping request) { public EntityMapping requestEntities(final EntityMapping request) {
final EntityMapping response = EcoreUtil.copy(request); final EntityMapping response = EcoreUtil.copy(request);
final String modelLocation = request.getModelLocation(); // final String modelLocation = request.getModelLocation();
final ArrayList<EObject> queryResults = new ArrayList<EObject>(); // final ArrayList<EObject> queryResults = new ArrayList<EObject>();
//
// final EList<tools.descartes.dql.models.mapping.domain.Resource>
final EList<tools.descartes.dql.models.mapping.domain.Resource> resources = response.getResources(); // resources = response.getResources();
final EList<Service> services = response.getServices(); // final EList<Service> services = response.getServices();
//
for (final EObject result : queryResults) { // for (final EObject result : queryResults) {
if (result instanceof Identifier) { // if (result instanceof Identifier) {
processIdentifier(resources, services, result); // processIdentifier(resources, services, result);
} else { // } else {
log.warn("Query returned unknown result type: " + result); // log.warn("Query returned unknown result type: " + result);
} // }
} // }
return response; return response;
} }
@Override @Override
public EntityMapping requestProbes(final EntityMapping request) { public EntityMapping requestProbes(final EntityMapping request) {
//Load and validate Model // Load and validate Model
final EntityMapping response = EcoreUtil.copy(request); final EntityMapping response = EcoreUtil.copy(request);
processProbesForServices(response.getServices()); // processProbesForServices(response.getServices());
processProbesForResources(response.getResources()); // processProbesForResources(response.getResources());
return response; return response;
} }
...@@ -223,7 +216,7 @@ public class ModelStructureQueryConnectorImpl extends ...@@ -223,7 +216,7 @@ public class ModelStructureQueryConnectorImpl extends
@Override @Override
public void addQueryProgressListener(QueryProgressListener arg0) { public void addQueryProgressListener(QueryProgressListener arg0) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
} }
} }
tools.descartes.dql.connector.kieker/src/tools/descartes/dql/connector/kieker/PerformanceMetricsQueryConnectorImpl.java
+ 1
− 9
View file @ bc98f16b
...@@ -7,7 +7,6 @@ import java.io.FileNotFoundException; ...@@ -7,7 +7,6 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -16,12 +15,10 @@ import java.util.Properties; ...@@ -16,12 +15,10 @@ import java.util.Properties;
import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.EcoreUtil;
import kieker.common.configuration.Configuration;
import tools.descartes.dql.connector.AbstractOSGiQueryConnector; import tools.descartes.dql.connector.AbstractOSGiQueryConnector;
import tools.descartes.dql.connector.PerformanceMetricsQueryConnector; import tools.descartes.dql.connector.PerformanceMetricsQueryConnector;
import tools.descartes.dql.connector.QueryProgressListener; import tools.descartes.dql.connector.QueryProgressListener;
import tools.descartes.dql.connector.kieker.configgenerator.XMLGenerationManager; import tools.descartes.dql.connector.kieker.configgenerator.XMLGenerationManager;
import tools.descartes.dql.connector.kieker.filter.KiekerController;
import tools.descartes.dql.connector.kieker.structures.Component; import tools.descartes.dql.connector.kieker.structures.Component;
import tools.descartes.dql.connector.kieker.structures.Trace; import tools.descartes.dql.connector.kieker.structures.Trace;
import tools.descartes.dql.connector.kieker.structures.records.EventRecord; import tools.descartes.dql.connector.kieker.structures.records.EventRecord;
...@@ -197,14 +194,9 @@ public class PerformanceMetricsQueryConnectorImpl extends ...@@ -197,14 +194,9 @@ public class PerformanceMetricsQueryConnectorImpl extends
} }
lastTs = (long) 1472632149934481275.0; lastTs = (long) 1472632149934481275.0;
final ArrayList<Entity> entities = new ArrayList<Entity>();
entities.addAll(response.getResources());
entities.addAll(response.getServices());
// browse through each entity and its probes // browse through each entity and its probes
// and try to replace the probe with a result // and try to replace the probe with a result
for (Entity ent : entities) { for (Entity ent : response.getEntities()) {
for (Probe dqlProbe : ent.getProbes()) { for (Probe dqlProbe : ent.getProbes()) {
for (StatType st : dqlProbe.getStatTypes()) { for (StatType st : dqlProbe.getStatTypes()) {
if (KiekerHelper.METRIC_UTILIZATION.equalsIgnoreCase(dqlProbe.getMetricName())) { if (KiekerHelper.METRIC_UTILIZATION.equalsIgnoreCase(dqlProbe.getMetricName())) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment