Remove unwanted custom dimension

agent/exporter/src/main/java/com/microsoft/applicationinsights/agent/Exporter.java

@@ -557,11 +557,6 @@ private void exportRequest(SpanData span) {
 
         requestData.setSuccess(span.getStatus().getStatusCode() != StatusCode.ERROR);
 
-        String description = span.getStatus().getDescription();
-        if (description != null) {
-            requestData.getProperties().put("statusDescription", description);
-        }
-
         setExtraAttributes(requestData, attributes);
 
         Double samplingPercentage = attributes.get(AI_SAMPLING_PERCENTAGE_KEY);

test/fakeIngestion/standalone/src/main/java/com/microsoft/applicationinsights/test/fakeingestion/MockedAppInsightsIngestionServer.java

@@ -84,7 +84,7 @@ public <T extends Domain> List<T> getMessageDataInRequest() {
         List<Envelope> items = getItemsEnvelopeDataType("MessageData");
         List<T> dataItems = new ArrayList<>();
         for (Envelope e : items) {
-            String message = ((MessageData) ((Data) e.getData()).getBaseData()).getMessage();
+            String message = ((MessageData) ((Data<?>) e.getData()).getBaseData()).getMessage();
             if (e.getTags().containsKey("ai.operation.id") && !ignoreMessageData(message)) {
                 Data<T> dt = (Data<T>) e.getData();
                 dataItems.add(dt.getBaseData());
@@ -141,7 +141,7 @@ public List<Envelope> waitForMessageItemsInRequest(final int numItems) throws Ex
                         || !input.getTags().containsKey("ai.operation.id")) {
                     return false;
                 }
-                String message = ((MessageData) ((Data) input.getData()).getBaseData()).getMessage();
+                String message = ((MessageData) ((Data<?>) input.getData()).getBaseData()).getMessage();
                 return !ignoreMessageData(message);
             }
         }, numItems, 10, TimeUnit.SECONDS);

test/smoke/framework/testCore/src/main/java/com/microsoft/applicationinsights/smoketest/AiSmokeTest.java

@@ -389,7 +389,7 @@ public boolean apply(Envelope input) {
                     if (!"RequestData".equals(input.getData().getBaseType())) {
                         return false;
                     }
-                    RequestData data = (RequestData) ((Data) input.getData()).getBaseData();
+                    RequestData data = (RequestData) ((Data<?>) input.getData()).getBaseData();
                     return contextRootUrl.equals(data.getUrl()) && "200".equals(data.getResponseCode());
                 }
             }, requestTelemetryFromHealthCheckTimeout, TimeUnit.SECONDS);

test/smoke/testApps/ActuatorMetrics/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/MicrometerTest.java

@@ -27,7 +27,7 @@ public boolean apply(Envelope input) {
                 if (!input.getData().getBaseType().equals("MetricData")) {
                     return false;
                 }
-                MetricData data = (MetricData) ((Data) input.getData()).getBaseData();
+                MetricData data = (MetricData) ((Data<?>) input.getData()).getBaseData();
                 if (!"/test".equals(data.getProperties().get("uri"))) {
                     return false;
                 }
@@ -40,7 +40,7 @@ public boolean apply(Envelope input) {
             }
         }, 1, 10, TimeUnit.SECONDS);
 
-        MetricData data = (MetricData) ((Data) metricItems.get(0).getData()).getBaseData();
+        MetricData data = (MetricData) ((Data<?>) metricItems.get(0).getData()).getBaseData();
         List<DataPoint> points = data.getMetrics();
         assertEquals(1, points.size());
 

test/smoke/testApps/CachingCalculator/src/main/java/com/microsoft/ajl/simplecalc/CalculatorParameterException.java

@@ -1,7 +1,6 @@
 package com.microsoft.ajl.simplecalc;
 
 public class CalculatorParameterException extends Exception {
-    private static final long serialVersionUID = -8200839910936319857L;
 
     public CalculatorParameterException(String message, Throwable cause) {
         super(message, cause);

test/smoke/testApps/CachingCalculator/src/main/java/com/microsoft/ajl/simplecalc/SimpleCalculatorServlet.java

@@ -3,7 +3,6 @@
 import com.microsoft.ajl.simplecalc.model.BinaryCalculation;
 import com.microsoft.ajl.simplecalc.model.BinaryOperator;
 import com.microsoft.applicationinsights.TelemetryClient;
-import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -17,12 +16,8 @@
 
 import static com.microsoft.ajl.simplecalc.ParameterConstants.*;
 
-/**
- * Servlet implementation class SimpleCalculatorServlet
- */
 @WebServlet(description = "Performs given calculation", urlPatterns = { "/doCalc" })
 public class SimpleCalculatorServlet extends HttpServlet {
-    private static final long serialVersionUID = -633683109556605395L;
 
     private Jedis redis;
 
@@ -36,9 +31,6 @@ public SimpleCalculatorServlet() {
         }
     }
 
-    /**
-     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
-     */
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
         BinaryCalculation bc;
         try {

test/smoke/testApps/CachingCalculator/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisDisabledTest.java

@@ -20,9 +20,10 @@ public void doCalcSendsRequestDataAndMetricData() throws Exception {
         Envelope rdEnvelope = rdList.get(0);
         RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
 
-        assertTrue(rd.getSuccess());
         assertEquals("/CachingCalculator/index.jsp", rd.getName());
         assertEquals("200", rd.getResponseCode());
+        assertTrue(rd.getProperties().isEmpty());
+        assertTrue(rd.getSuccess());
 
         // sleep a bit and make sure no jedis dependencies are reported
         Thread.sleep(5000);

test/smoke/testApps/CachingCalculator/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/JedisTest.java

@@ -26,13 +26,14 @@ public void doCalcSendsRequestDataAndMetricData() throws Exception {
 
         Envelope rddEnvelope = rddList.get(0);
 
-        RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
-        RemoteDependencyData rdd = (RemoteDependencyData) ((Data) rddEnvelope.getData()).getBaseData();
+        RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
+        RemoteDependencyData rdd = (RemoteDependencyData) ((Data<?>) rddEnvelope.getData()).getBaseData();
 
-        assertTrue(rdd.getSuccess());
+        assertEquals("EXISTS", rdd.getName());
         assertEquals("redis", rdd.getType());
         assertTrue(rdd.getTarget().matches("dependency[0-9]+"));
-        assertEquals("EXISTS", rdd.getName());
+        assertTrue(rdd.getProperties().isEmpty());
+        assertTrue(rdd.getSuccess());
 
         assertParentChild(rd, rdEnvelope, rddEnvelope, "/CachingCalculator/index.jsp");
     }

test/smoke/testApps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/CassandraDisabledTest.java

@@ -30,9 +30,10 @@ public void cassandra() throws Exception {
         Envelope rdEnvelope = rdList.get(0);
         RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
 
-        assertTrue(rd.getSuccess());
         assertEquals("/Cassandra/*", rd.getName());
         assertEquals("200", rd.getResponseCode());
+        assertTrue(rd.getProperties().isEmpty());
+        assertTrue(rd.getSuccess());
 
         // sleep a bit and make sure no cassandra dependencies are reported
         Thread.sleep(5000);

test/smoke/testApps/Cassandra/src/smokeTest/java/com/microsoft/applicationinsights/smoketestapp/CassandraTest.java

@@ -36,13 +36,18 @@ public void cassandra() throws Exception {
 
         Envelope rddEnvelope = rddList.get(0);
 
-        RequestData rd = (RequestData) ((Data) rdEnvelope.getData()).getBaseData();
-        RemoteDependencyData rdd = (RemoteDependencyData) ((Data) rddEnvelope.getData()).getBaseData();
+        RequestData rd = (RequestData) ((Data<?>) rdEnvelope.getData()).getBaseData();
+        RemoteDependencyData rdd = (RemoteDependencyData) ((Data<?>) rddEnvelope.getData()).getBaseData();
 
+        assertEquals("/Cassandra/*", rd.getName());
+        assertEquals("200", rd.getResponseCode());
+        assertTrue(rd.getProperties().isEmpty());
         assertTrue(rd.getSuccess());
+
+        assertEquals("SELECT test", rdd.getName());
         assertEquals("cassandra", rdd.getType());
         assertTrue(rdd.getTarget().matches("dependency[0-9]+"));
-        assertEquals("SELECT test", rdd.getName());
+        assertTrue(rdd.getProperties().isEmpty());
         assertTrue(rdd.getSuccess());
 
         assertParentChild(rd, rdEnvelope, rddEnvelope, "/Cassandra/*");

test/smoke/testApps/CoreAndFilter/src/main/java/com/microsoft/ajl/simplecalc/SimpleTestRequestSlowWithResponseTime.java

@@ -11,17 +11,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-/**
- * Servlet implementation class SimpleTestRequestSlowWithResponseTime
- */
 @WebServlet(description = "calls request slow", urlPatterns = "/requestSlow")
 public class SimpleTestRequestSlowWithResponseTime extends HttpServlet {
 
-    private static final long serialVersionUID = 3007663491446163538L;
-
-    /**
-     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
-     */
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         ServletFuncs.geRrenderHtml(request, response);

test/smoke/testApps/CoreAndFilter/src/main/java/com/microsoft/ajl/simplecalc/SimpleThrowExceptionServlet.java

@@ -8,19 +8,13 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-/**
- * Servlet Servlet implementation class SimpleThrowExceptionServlet
- */
 @WebServlet(description = "throw an servlet execption", urlPatterns = { "/autoExceptionWithFailedRequest" })
 public class SimpleThrowExceptionServlet extends HttpServlet {
 
-    private static final long serialVersionUID = 5079705745146112889L;
-
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         ServletFuncs.geRrenderHtml(request, response);
 
         throw new ServletException("This is a auto thrown exception !");
     }
-
 }

test/smoke/testApps/CoreAndFilter/src/main/java/com/microsoft/ajl/simplecalc/SimpleTrackDependencyServlet.java

@@ -11,12 +11,9 @@
 import com.microsoft.applicationinsights.TelemetryClient;
 import com.microsoft.applicationinsights.telemetry.Duration;
 
-/**
- * Servlet implementation class SimpleTrackDependencyServlet
- */
 @WebServlet(description = "Performs given calculation", urlPatterns = { "/trackDependency" })
 public class SimpleTrackDependencyServlet extends HttpServlet {
-    private static final long serialVersionUID = -5145497408200255321L;
+
     private final TelemetryClient client = new TelemetryClient();
 
     protected void doGet(HttpServletRequest request, HttpServletResponse response)

test/smoke/testApps/CoreAndFilter/src/main/java/com/microsoft/ajl/simplecalc/SimpleTrackEventServlet.java

@@ -12,17 +12,11 @@
 
 import com.microsoft.applicationinsights.TelemetryClient;
 
-/**
- * Servlet implementation class SimpleCalculatorServlet
- */
 @WebServlet(description = "Performs given calculation", urlPatterns = { "/trackEvent" })
 public class SimpleTrackEventServlet extends HttpServlet {
-    private static final long serialVersionUID = -633683109556605395L;
+
     private final TelemetryClient client = new TelemetryClient();
 
-    /**
-     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
-     */
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         ServletFuncs.geRrenderHtml(request, response);

test/smoke/testApps/CoreAndFilter/src/main/java/com/microsoft/ajl/simplecalc/SimpleTrackExceptionServlet.java

@@ -14,12 +14,9 @@
 import com.microsoft.applicationinsights.telemetry.ExceptionTelemetry;
 import com.microsoft.applicationinsights.telemetry.SeverityLevel;
 
-/**
- * Servlet Servlet implementation class SimpleTrackExceptionServlet
- */
 @WebServlet(description = "Performs given calculation", urlPatterns = { "/trackException" })
 public class SimpleTrackExceptionServlet extends HttpServlet {
-    private static final long serialVersionUID = 9009843523432371365L;
+
     private final TelemetryClient client = new TelemetryClient();
 
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
@@ -46,5 +43,4 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         et.setSeverityLevel(SeverityLevel.Error);
         client.track(et);
     }
-
 }

test/smoke/testApps/CoreAndFilter/src/main/java/com/microsoft/ajl/simplecalc/SimpleTrackHttpRequestServlet.java

@@ -12,13 +12,9 @@
 import com.microsoft.applicationinsights.TelemetryClient;
 import com.microsoft.applicationinsights.telemetry.RequestTelemetry;
 
-/**
- * Servlet implementation class SimpleTrackHttpRequestServlet
- */
 @WebServlet(description = "Performs given calculation", urlPatterns = { "/trackHttpRequest" })
 public class SimpleTrackHttpRequestServlet extends HttpServlet {
 
-    private static final long serialVersionUID = -1484210841610659769L;
     private final TelemetryClient client = new TelemetryClient();
 
     protected void doGet(HttpServletRequest request, HttpServletResponse response)

test/smoke/testApps/CoreAndFilter/src/main/java/com/microsoft/ajl/simplecalc/SimpleTrackMetricServlet.java

@@ -8,18 +8,11 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-/**
- * Servlet implementation class SimpleTrackMetricServlet
- */
 @WebServlet(description = "Performs given calculation", urlPatterns = { "/trackMetric" })
 public class SimpleTrackMetricServlet extends HttpServlet {
 
-    private static final long serialVersionUID = -7579571044049925445L;
     private final TelemetryClient client = new TelemetryClient();
 
-    /**
-     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
-     */
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         ServletFuncs.geRrenderHtml(request, response);

test/smoke/testApps/CoreAndFilter/src/main/java/com/microsoft/ajl/simplecalc/SimpleTrackPageViewServlet.java

@@ -10,17 +10,11 @@
 import com.microsoft.applicationinsights.TelemetryClient;
 import com.microsoft.applicationinsights.telemetry.PageViewTelemetry;
 
-/**
- * Servlet implementation class SimpleTrackTraceServlet
- */
 @WebServlet(description = "calls trackPageView twice; once vanilla, once with properties", urlPatterns = {"/trackPageView"})
 public class SimpleTrackPageViewServlet extends HttpServlet {
-    private static final long serialVersionUID = -633683109556605395L;
+
     private final TelemetryClient client = new TelemetryClient();
 
-    /**
-     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
-     */
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         client.trackPageView("test-page");
 

test/smoke/testApps/CoreAndFilter/src/main/java/com/microsoft/ajl/simplecalc/SimpleTrackTraceServlet.java

@@ -13,17 +13,11 @@
 import com.microsoft.applicationinsights.TelemetryClient;
 import com.microsoft.applicationinsights.telemetry.SeverityLevel;
 
-/**
- * Servlet implementation class SimpleTrackTraceServlet
- */
 @WebServlet(description = "Performs given calculation", urlPatterns = { "/trackTrace" })
 public class SimpleTrackTraceServlet extends HttpServlet {
-    private static final long serialVersionUID = -633683109556605395L;
+
     private final TelemetryClient client = new TelemetryClient();
 
-    /**
-     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
-     */
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         ServletFuncs.geRrenderHtml(request, response);

test/smoke/testApps/CoreAndFilter/src/main/java/com/microsoft/ajl/simplecalc/SlowRequestCpuBoundServlet.java

@@ -11,20 +11,12 @@
 import java.math.BigDecimal;
 import java.util.concurrent.ThreadLocalRandom;
 
-/**
- * Servlet implementation class SimpleTestRequestSlowWithResponseTime
- */
 @WebServlet(description = "calls request slow w/o Thread.sleep", urlPatterns = "/slowLoop")
 public class SlowRequestCpuBoundServlet extends HttpServlet {
 
-    private static final long serialVersionUID = 3007663491446163538L;
     private static final BigDecimal MAX_VALUE = BigDecimal.valueOf(1_000);
     private static final ThreadLocalRandom rand = ThreadLocalRandom.current();
 
-
-    /**
-     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
-     */
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         final long startTime = System.currentTimeMillis();