diff --git a/src/main/java/org/gcube/dataharvest/harvester/sobigdata/TagMeMethodInvocationHarvester.java b/src/main/java/org/gcube/dataharvest/harvester/sobigdata/TagMeMethodInvocationHarvester.java index 4ed52b9..c0acd12 100644 --- a/src/main/java/org/gcube/dataharvest/harvester/sobigdata/TagMeMethodInvocationHarvester.java +++ b/src/main/java/org/gcube/dataharvest/harvester/sobigdata/TagMeMethodInvocationHarvester.java @@ -61,11 +61,31 @@ public class TagMeMethodInvocationHarvester extends BasicHarvester { long numberOfInvocation = 0; - for(String serviceName : SERVICE_NAMES) { - List filters = new ArrayList<>(); - filters.add(new Filter(ServiceUsageRecord.SERVICE_NAME, serviceName)); - + List tagMe1Filters = new ArrayList<>(); + tagMe1Filters.add(new Filter(ServiceUsageRecord.SERVICE_NAME, TAGME)); + tagMe1Filters.add(new Filter(ServiceUsageRecord.CALLED_METHOD, "tag")); + + + List tagMe2Filters = new ArrayList<>(); + tagMe2Filters.add(new Filter(ServiceUsageRecord.SERVICE_NAME, TAGME)); + tagMe2Filters.add(new Filter(ServiceUsageRecord.CALLED_METHOD, "/tag")); + + List watFilters = new ArrayList<>(); + watFilters.add(new Filter(ServiceUsageRecord.SERVICE_NAME, WAT)); + + + List swatFilters = new ArrayList<>(); + swatFilters.add(new Filter(ServiceUsageRecord.SERVICE_NAME, SWAT)); + + List> allfilters = new ArrayList<>(); + allfilters.add(tagMe1Filters); + allfilters.add(tagMe2Filters); + allfilters.add(watFilters); + allfilters.add(swatFilters); + + for(List filters : allfilters) { + SortedMap> result = accountingPersistenceQuery.getContextTimeSeries( AggregatedServiceUsageRecord.class, temporalConstraint, filters, contexts, true); @@ -76,14 +96,15 @@ public class TagMeMethodInvocationHarvester extends BasicHarvester { Calendar calendar = DateUtils.dateToCalendar(start); Info info = infoMap.get(calendar); - logger.debug("Service {} - {} : {}", serviceName, DateUtils.format(calendar), info); + logger.debug("{} : {} : {}", filters, DateUtils.format(calendar), info); JSONObject jsonObject = info.getValue(); - numberOfInvocation += jsonObject.getLong(AggregatedUsageRecord.OPERATION_COUNT); + long got = jsonObject.getLong(AggregatedUsageRecord.OPERATION_COUNT); + numberOfInvocation += got; } } else { - logger.error("No data found in {} for service {}.", context, serviceName); + logger.error("No data found in {} for filters {}.", context, filters); } }