SRE-35204: remove reporting module

agent/apiharness/pom.xml

@@ -15,6 +15,11 @@
 
 
   <dependencies>
+    <dependency>
+      <groupId>software.amazon.awssdk</groupId>
+      <artifactId>cloudwatch</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>script-engine</artifactId>

agent/apiharness/src/main/java/com/intuit/tank/harness/APIMonitor.java

@@ -32,7 +32,7 @@
 import com.intuit.tank.vm.vmManager.models.VMStatus;
 import com.intuit.tank.vm.vmManager.models.ValidationStatus;
 import com.intuit.tank.harness.logging.LogUtil;
-import com.intuit.tank.reporting.api.TPSInfoContainer;
+import com.intuit.tank.reporting.models.TPSInfoContainer;
 import com.intuit.tank.vm.agent.messages.WatsAgentStatusResponse;
 import com.intuit.tank.vm.api.enumerated.JobStatus;
 import com.intuit.tank.vm.api.enumerated.AgentCommand;

agent/apiharness/src/main/java/com/intuit/tank/harness/APITestHarness.java

@@ -56,10 +56,10 @@
 import com.intuit.tank.harness.logging.LogUtil;
 import com.intuit.tank.logging.LogEventType;
 import com.intuit.tank.logging.LoggingProfile;
-import com.intuit.tank.reporting.api.DummyResultsReporter;
-import com.intuit.tank.reporting.api.ResultsReporter;
-import com.intuit.tank.reporting.factory.ReportingFactory;
-import com.intuit.tank.results.TankResult;
+import com.intuit.tank.reporting.DummyResultsReporter;
+import com.intuit.tank.reporting.ReportingFactory;
+import com.intuit.tank.reporting.ResultsReporter;
+import com.intuit.tank.reporting.models.TankResult;
 import com.intuit.tank.vm.agent.messages.AgentData;
 import com.intuit.tank.vm.agent.messages.AgentTestStartData;
 import com.intuit.tank.vm.agent.messages.DataFileRequest;

agent/apiharness/src/main/java/com/intuit/tank/harness/TPSMonitor.java

@@ -26,8 +26,8 @@
 import org.apache.logging.log4j.Logger;
 
 import com.intuit.tank.http.BaseRequest;
-import com.intuit.tank.reporting.api.TPSInfo;
-import com.intuit.tank.reporting.api.TPSInfoContainer;
+import com.intuit.tank.reporting.models.TPSInfo;
+import com.intuit.tank.reporting.models.TPSInfoContainer;
 import com.intuit.tank.vm.settings.TimeUtil;
 
 public class TPSMonitor {

agent/apiharness/src/main/java/com/intuit/tank/harness/TestPlanStarter.java

@@ -14,7 +14,6 @@
  */
 
 import com.intuit.tank.harness.data.*;
-import com.intuit.tank.reporting.api.TPSInfoContainer;
 import com.intuit.tank.runner.TestPlanRunner;
 import com.intuit.tank.vm.api.enumerated.IncrementStrategy;
 import org.apache.commons.lang3.time.DateUtils;
@@ -23,6 +22,7 @@
 
 import com.intuit.tank.harness.logging.LogUtil;
 import com.intuit.tank.logging.LogEventType;
+import com.intuit.tank.reporting.models.TPSInfoContainer;
 import com.intuit.tank.vm.api.enumerated.AgentCommand;
 import software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient;
 import software.amazon.awssdk.services.cloudwatch.model.Dimension;

agent/apiharness/src/main/java/com/intuit/tank/runner/method/RequestRunner.java

@@ -41,7 +41,7 @@
 import com.intuit.tank.http.xml.XMLRequest;
 import com.intuit.tank.logging.LogEventType;
 import com.intuit.tank.logging.LoggingProfile;
-import com.intuit.tank.results.TankResultBuilder;
+import com.intuit.tank.reporting.TankResultBuilder;
 import com.intuit.tank.runner.ErrorContainer;
 import com.intuit.tank.runner.TestStepContext;
 import com.intuit.tank.script.RequestDataPhase;

agent/apiharness/src/main/java/com/intuit/tank/runner/method/TimerMap.java

@@ -17,8 +17,8 @@
 import java.util.Map;
 
 import com.intuit.tank.harness.APITestHarness;
-import com.intuit.tank.results.TankResult;
-import com.intuit.tank.results.TankResultBuilder;
+import com.intuit.tank.reporting.TankResultBuilder;
+import com.intuit.tank.reporting.models.TankResult;
 
 public class TimerMap {
     private Map<String, TankResult> resultsMap = new HashMap<String, TankResult>();

agent/apiharness/src/main/java/com/intuit/tank/runner/method/TimerRunner.java

@@ -17,7 +17,7 @@
 
 import com.intuit.tank.harness.APITestHarness;
 import com.intuit.tank.harness.data.TimerStep;
-import com.intuit.tank.results.TankResult;
+import com.intuit.tank.reporting.models.TankResult;
 import com.intuit.tank.runner.TestStepContext;
 import com.intuit.tank.vm.common.TankConstants;
 

agent/apiharness/src/test/java/com/intuit/tank/common/TPSTest.java

@@ -24,10 +24,10 @@
 
 import com.intuit.tank.persistence.databases.AmazonDynamoDatabaseDocApi;
 import com.intuit.tank.persistence.databases.DatabaseKeys;
-import com.intuit.tank.reporting.api.TPSInfo;
-import com.intuit.tank.reporting.api.TPSInfoContainer;
 import com.intuit.tank.reporting.databases.Attribute;
 import com.intuit.tank.reporting.databases.IDatabase;
+import com.intuit.tank.reporting.models.TPSInfo;
+import com.intuit.tank.reporting.models.TPSInfoContainer;
 import com.intuit.tank.test.TestGroups;
 import com.intuit.tank.vm.common.util.ReportUtil;
 import org.junit.jupiter.api.BeforeAll;

agent/apiharness/src/test/java/com/intuit/tank/harness/APIMonitorTest.java

@@ -2,8 +2,8 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
-import com.intuit.tank.reporting.api.ResultsReporter;
-import com.intuit.tank.reporting.api.TPSInfoContainer;
+import com.intuit.tank.reporting.ResultsReporter;
+import com.intuit.tank.reporting.models.TPSInfoContainer;
 import com.intuit.tank.vm.api.enumerated.VMImageType;
 import com.intuit.tank.vm.api.enumerated.VMRegion;
 import com.intuit.tank.vm.settings.*;

agent/apiharness/src/test/java/com/intuit/tank/harness/TPSMonitorTest.java

@@ -19,9 +19,8 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.intuit.tank.http.BaseRequest;
-import com.intuit.tank.reporting.api.TPSInfoContainer;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
+import com.intuit.tank.reporting.models.TPSInfoContainer;
+
 import org.junit.jupiter.api.Test;
 
 /**

agent/apiharness/src/test/java/com/intuit/tank/runner/method/TimerMapTest.java

@@ -17,7 +17,7 @@
  */
 import org.junit.jupiter.api.Test;
 
-import com.intuit.tank.results.TankResult;
+import com.intuit.tank.reporting.models.TankResult;
 
 /**
  * The class <code>TimerMapTest</code> contains tests for the class <code>{@link TimerMap}</code>.

reporting/api/src/main/java/com/intuit/tank/reporting/api/DummyResultsReader.java → api/src/main/java/com/intuit/tank/reporting/DummyResultsReader.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2011 Intuit Inc. All Rights Reserved
  */
-package com.intuit.tank.reporting.api;
+package com.intuit.tank.reporting;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -11,7 +11,10 @@
 
 import org.apache.commons.configuration.HierarchicalConfiguration;
 
-import com.intuit.tank.results.TankResult;
+import com.intuit.tank.reporting.PagedTimingResults;
+import com.intuit.tank.reporting.ResultsReader;
+import com.intuit.tank.reporting.models.TPSInfo;
+import com.intuit.tank.reporting.models.TankResult;
 
 /**
  * DummyResultsReader

reporting/api/src/main/java/com/intuit/tank/reporting/api/DummyResultsReporter.java → api/src/main/java/com/intuit/tank/reporting/DummyResultsReporter.java

@@ -1,13 +1,14 @@
 /**
  * Copyright 2011 Intuit Inc. All Rights Reserved
  */
-package com.intuit.tank.reporting.api;
+package com.intuit.tank.reporting;
 
 import java.util.List;
 
 import org.apache.commons.configuration.HierarchicalConfiguration;
 
-import com.intuit.tank.results.TankResult;
+import com.intuit.tank.reporting.models.TPSInfoContainer;
+import com.intuit.tank.reporting.models.TankResult;
 
 /**
  * DummyResultsReporter

reporting/api/src/main/java/com/intuit/tank/reporting/api/PagedTimingResults.java → api/src/main/java/com/intuit/tank/reporting/PagedTimingResults.java

@@ -1,9 +1,9 @@
-package com.intuit.tank.reporting.api;
+package com.intuit.tank.reporting;
 
 import java.io.Serializable;
 import java.util.List;
 
-import com.intuit.tank.results.TankResult;
+import com.intuit.tank.reporting.models.TankResult;
 
 public class PagedTimingResults implements Serializable {
 

reporting/api/src/main/java/com/intuit/tank/reporting/factory/ReportingFactory.java → api/src/main/java/com/intuit/tank/reporting/ReportingFactory.java

@@ -1,12 +1,9 @@
-package com.intuit.tank.reporting.factory;
+package com.intuit.tank.reporting;
 
 import org.apache.commons.configuration.HierarchicalConfiguration;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import com.intuit.tank.reporting.api.DummyResultsReporter;
-import com.intuit.tank.reporting.api.ResultsReader;
-import com.intuit.tank.reporting.api.ResultsReporter;
 import com.intuit.tank.vm.settings.ReportingConfig;
 import com.intuit.tank.vm.settings.TankConfig;
 
@@ -27,7 +24,7 @@ public static final ResultsReporter getResultsReporter() {
         try {
             ReportingConfig config = new TankConfig().getReportingConfig();
             String providerClass = config.getReporterClass();
-            ret = (ResultsReporter) Class.forName(providerClass).newInstance();
+            ret = (ResultsReporter) Class.forName(providerClass).getDeclaredConstructor().newInstance();
             HierarchicalConfiguration providerConfig = config.getProviderConfig();
             ret.config(providerConfig);
         } catch (Exception e) {
@@ -45,7 +42,7 @@ public static final ResultsReader getResultsReader() {
         try {
             ReportingConfig config = new TankConfig().getReportingConfig();
             String providerClass = config.getReaderClass();
-            ret = (ResultsReader) Class.forName(providerClass).newInstance();
+            ret = (ResultsReader) Class.forName(providerClass).getDeclaredConstructor().newInstance();
             HierarchicalConfiguration providerConfig = config.getProviderConfig();
             ret.config(providerConfig);
         } catch (Exception e) {

reporting/api/src/main/java/com/intuit/tank/reporting/api/ResultsReader.java → api/src/main/java/com/intuit/tank/reporting/ResultsReader.java

@@ -1,4 +1,4 @@
-package com.intuit.tank.reporting.api;
+package com.intuit.tank.reporting;
 
 import java.util.Date;
 import java.util.List;
@@ -8,7 +8,8 @@
 
 import org.apache.commons.configuration.HierarchicalConfiguration;
 
-import com.intuit.tank.results.TankResult;
+import com.intuit.tank.reporting.models.TPSInfo;
+import com.intuit.tank.reporting.models.TankResult;
 
 public interface ResultsReader {
 

reporting/api/src/main/java/com/intuit/tank/reporting/api/ResultsReporter.java → api/src/main/java/com/intuit/tank/reporting/ResultsReporter.java

@@ -1,10 +1,11 @@
-package com.intuit.tank.reporting.api;
+package com.intuit.tank.reporting;
 
 import java.util.List;
 
 import org.apache.commons.configuration.HierarchicalConfiguration;
 
-import com.intuit.tank.results.TankResult;
+import com.intuit.tank.reporting.models.TPSInfoContainer;
+import com.intuit.tank.reporting.models.TankResult;
 
 /**
  * 

reporting/api/src/main/java/com/intuit/tank/results/TankResultBuilder.java → api/src/main/java/com/intuit/tank/reporting/TankResultBuilder.java

@@ -5,10 +5,12 @@
  * See generator home page at: http://code.google.com/p/fluent-builders-generator-eclipse-plugin/
  */
 
-package com.intuit.tank.results;
+package com.intuit.tank.reporting;
 
 import java.util.Date;
 
+import com.intuit.tank.reporting.models.TankResult;
+
 /*
  * #%L
  * Reporting API

reporting/api/src/main/java/com/intuit/tank/reporting/api/Namespace.java → api/src/main/java/com/intuit/tank/reporting/models/Namespace.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2011 Intuit Inc. All Rights Reserved
  */
-package com.intuit.tank.reporting.api;
+package com.intuit.tank.reporting.models;
 
 /*
  * #%L

reporting/api/src/main/java/com/intuit/tank/reporting/api/TPSInfo.java → api/src/main/java/com/intuit/tank/reporting/models/TPSInfo.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2013 Intuit Inc. All Rights Reserved
  */
-package com.intuit.tank.reporting.api;
+package com.intuit.tank.reporting.models;
 
 /*
  * #%L

reporting/api/src/main/java/com/intuit/tank/reporting/api/TPSInfoContainer.java → api/src/main/java/com/intuit/tank/reporting/models/TPSInfoContainer.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2011 Intuit Inc. All Rights Reserved
  */
-package com.intuit.tank.reporting.api;
+package com.intuit.tank.reporting.models;
 
 /*
  * #%L

reporting/api/src/main/java/com/intuit/tank/reporting/api/TPSReportingPackage.java → api/src/main/java/com/intuit/tank/reporting/models/TPSReportingPackage.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2011 Intuit Inc. All Rights Reserved
  */
-package com.intuit.tank.reporting.api;
+package com.intuit.tank.reporting.models;
 
 /*
  * #%L

reporting/api/src/main/java/com/intuit/tank/results/TankAgentStatusResponse.java → api/src/main/java/com/intuit/tank/reporting/models/TankAgentStatusResponse.java

@@ -1,4 +1,4 @@
-package com.intuit.tank.results;
+package com.intuit.tank.reporting.models;
 
 /*
  * #%L

reporting/api/src/main/java/com/intuit/tank/results/TankResult.java → api/src/main/java/com/intuit/tank/reporting/models/TankResult.java

@@ -1,4 +1,4 @@
-package com.intuit.tank.results;
+package com.intuit.tank.reporting.models;
 
 /*
  * #%L
@@ -24,8 +24,6 @@
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import com.intuit.tank.reporting.api.Namespace;
-
 /**
  * WatsResult represents a result to log or store to database.
  * 

reporting/api/src/main/java/com/intuit/tank/results/TankResultPackage.java → api/src/main/java/com/intuit/tank/reporting/models/TankResultPackage.java

@@ -1,7 +1,7 @@
 /**
  * Copyright 2011 Intuit Inc. All Rights Reserved
  */
-package com.intuit.tank.results;
+package com.intuit.tank.reporting.models;
 
 /*
  * #%L
@@ -27,8 +27,6 @@
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 
-import com.intuit.tank.reporting.api.Namespace;
-
 /**
  * TankResultPackage
  * 

reporting/api/src/test/java/com/intuit/tank/results/TankResultBuilderBaseTest.java → api/src/test/java/com/intuit/tank/reporting/TankResultBuilderBaseTest.java

@@ -1,4 +1,4 @@
-package com.intuit.tank.results;
+package com.intuit.tank.reporting;
 
 /*
  * #%L
@@ -15,8 +15,7 @@
 
 import org.junit.jupiter.api.*;
 
-import com.intuit.tank.results.TankResult;
-import com.intuit.tank.results.TankResultBuilderBase;
+import com.intuit.tank.reporting.models.TankResult;
 
 import static org.junit.jupiter.api.Assertions.*;
 

reporting/api/src/test/java/com/intuit/tank/results/TankResultBuilderTest.java → api/src/test/java/com/intuit/tank/reporting/TankResultBuilderTest.java

@@ -1,4 +1,4 @@
-package com.intuit.tank.results;
+package com.intuit.tank.reporting;
 
 /*
  * #%L
@@ -15,8 +15,7 @@
 
 import org.junit.jupiter.api.*;
 
-import com.intuit.tank.results.TankResult;
-import com.intuit.tank.results.TankResultBuilder;
+import com.intuit.tank.reporting.models.TankResult;
 
 import static org.junit.jupiter.api.Assertions.*;
 

reporting/api/src/test/java/com/intuit/tank/reporting/api/TPSInfoContainerTest.java → api/src/test/java/com/intuit/tank/reporting/module/TPSInfoContainerTest.java

@@ -1,4 +1,4 @@
-package com.intuit.tank.reporting.api;
+package com.intuit.tank.reporting.module;
 
 /*
  * #%L
@@ -22,6 +22,9 @@
 
 import org.junit.jupiter.api.Test;
 
+import com.intuit.tank.reporting.models.TPSInfo;
+import com.intuit.tank.reporting.models.TPSInfoContainer;
+
 /**
  * The class <code>TPSInfoContainerTest</code> contains tests for the class <code>{@link TPSInfoContainer}</code>.
  *