Merge pull request #985 from microsoft/buildme/normalize-white-space

Normalize white space

Author: trask

CHANGELOG.md

@@ -243,11 +243,11 @@ Livemetrics UX.
 
 ## Version 1.0.1
 - The [Java agent](app-insights-java-agent.md) collects dependency information about the following:
-	- HTTP calls made via HttpClient, OkHttp and RestTemplate (Spring).
-	- Calls to Redis made via the Jedis client. When a configurable threshold is passed, the SDK will also fetch the call arguments.
-	- JDBC calls made with Oracle DB and Apache Derby DB clients.
-	- Support the 'executeBatch' query type for prepared statements – The SDK will show the statement with the number of batches.
-	- Provide the query plan for JDBC clients that has support for that (MySql, PostgreSql) – The query plan is fetched only when a configurable threshold is crossed
+    - HTTP calls made via HttpClient, OkHttp and RestTemplate (Spring).
+    - Calls to Redis made via the Jedis client. When a configurable threshold is passed, the SDK will also fetch the call arguments.
+    - JDBC calls made with Oracle DB and Apache Derby DB clients.
+    - Support the 'executeBatch' query type for prepared statements – The SDK will show the statement with the number of batches.
+    - Provide the query plan for JDBC clients that has support for that (MySql, PostgreSql) – The query plan is fetched only when a configurable threshold is crossed
 
 ## Version 1.0.0
 - Adding support for the Application Insights writer plugin for CollectD.

NOTICE

@@ -21,17 +21,17 @@ Notices, if any, for the third party programs are included for your information
 
 Microsoft Application Insights Java Software Development Kit consists of material from the project(s) listed below (collectively, "Distributed Code"). Microsoft Corporation ("Microsoft") is not the original author of some of the Distributed Code. The original copyright notices and licenses, under which Microsoft received such Distributed Code, are set out below.  This Distributed Code are licensed to you under their original license terms set forth below.  Microsoft reserves all other rights not expressly granted under these terms, whether by implication, estoppel or otherwise. 
 
-1.	Apache Commons-codec version 1.9 (http://commons.apache.org/proper/commons-codec/download_codec.cgi)
-2.	Apache Commons Lang3 version 3.3.7 (http://commons.apache.org/proper/commons-lang/)
-3.	Apache Commons Logging  version 1.2 (http://commons.apache.org/proper/commons-logging/)
-4.	Apache Commons-io version 2.6 (http://commons.apache.org/proper/commons-io/)
-5.	Apache HttpComponents Client version 4.5.3 (http://hc.apache.org/downloads.cgi)
-6.	Apache HttpComponents Core  version 4.4.6 (http://hc.apache.org/downloads.cgi)
-7.	ASM version 7.0 (http://asm.ow2.org/)
-8.	ASM Commons version 7.0 (http://asm.ow2.org/)
-9.	Guava version 27.1-android (https://github.com/google/guava)
-10.	INFOMAS PCM Application Suite version 3.0.4 (https://github.com/rmuller/infomas-asl)
-11.	JSR-305 version 2.0.1 (http://code.google.com/p/jsr-305/)
+1.  Apache Commons-codec version 1.9 (http://commons.apache.org/proper/commons-codec/download_codec.cgi)
+2.  Apache Commons Lang3 version 3.3.7 (http://commons.apache.org/proper/commons-lang/)
+3.  Apache Commons Logging  version 1.2 (http://commons.apache.org/proper/commons-logging/)
+4.  Apache Commons-io version 2.6 (http://commons.apache.org/proper/commons-io/)
+5.  Apache HttpComponents Client version 4.5.3 (http://hc.apache.org/downloads.cgi)
+6.  Apache HttpComponents Core  version 4.4.6 (http://hc.apache.org/downloads.cgi)
+7.  ASM version 7.0 (http://asm.ow2.org/)
+8.  ASM Commons version 7.0 (http://asm.ow2.org/)
+9.  Guava version 27.1-android (https://github.com/google/guava)
+10. INFOMAS PCM Application Suite version 3.0.4 (https://github.com/rmuller/infomas-asl)
+11. JSR-305 version 2.0.1 (http://code.google.com/p/jsr-305/)
 12. Protobuf-java version 3.6.1 (https://github.com/protocolbuffers/protobuf)
 13. gRPC Stubs version 1.16.1 (https://github.com/grpc/grpc-java)
 14. gRPC Protobuf version 1.16.1 (https://github.com/grpc/grpc-java)

azure-application-insights-spring-boot-starter/src/test/java/com/microsoft/applicationinsights/autoconfigure/ApplicationInsightsStarterCoreParityTests.java

@@ -15,61 +15,61 @@
 import org.springframework.test.context.junit4.SpringRunner;
 
 @SpringBootTest(
-	properties = {
-		"spring.application.name: test-application",
-		"azure.application-insights.instrumentation-key: 00000000-0000-0000-0000-000000000000"
-	},
-	classes = {
-		PropertyPlaceholderAutoConfiguration.class,
-		ApplicationInsightsTelemetryAutoConfiguration.class,
-		ApplicationInsightsWebMvcAutoConfiguration.class
-	}
+    properties = {
+        "spring.application.name: test-application",
+        "azure.application-insights.instrumentation-key: 00000000-0000-0000-0000-000000000000"
+    },
+    classes = {
+        PropertyPlaceholderAutoConfiguration.class,
+        ApplicationInsightsTelemetryAutoConfiguration.class,
+        ApplicationInsightsWebMvcAutoConfiguration.class
+    }
 )
 @RunWith(SpringRunner.class)
 public class ApplicationInsightsStarterCoreParityTests {
 
-	//Instance from Spring Bean Factory
-	@Autowired
-	TelemetryClient telemetryClient;
+    //Instance from Spring Bean Factory
+    @Autowired
+    TelemetryClient telemetryClient;
 
-	@Test
-	public void shouldHaveIdenticalConfiguration() throws Exception{
-		Field field = telemetryClient.getClass().getDeclaredField("configuration");
-		field.setAccessible(true);
-		TelemetryConfiguration config1 = (TelemetryConfiguration)field.get(telemetryClient);
+    @Test
+    public void shouldHaveIdenticalConfiguration() throws Exception{
+        Field field = telemetryClient.getClass().getDeclaredField("configuration");
+        field.setAccessible(true);
+        TelemetryConfiguration config1 = (TelemetryConfiguration)field.get(telemetryClient);
 
-		//needed for clearing down the active instance and get the new config.
-		tearDown();
+        //needed for clearing down the active instance and get the new config.
+        tearDown();
 
-		//Instance created from XML config.
-		TelemetryClient t2 = new TelemetryClient();
+        //Instance created from XML config.
+        TelemetryClient t2 = new TelemetryClient();
 
-		Field field2 = t2.getClass().getDeclaredField("configuration");
-		field2.setAccessible(true);
-		TelemetryConfiguration config2 = (TelemetryConfiguration)field2.get(t2);
+        Field field2 = t2.getClass().getDeclaredField("configuration");
+        field2.setAccessible(true);
+        TelemetryConfiguration config2 = (TelemetryConfiguration)field2.get(t2);
 
-		Assert.assertNotEquals(config1, config2);
-		//There is one additional TelemetryInitializer in case of SpringBoot(For Cloud_RoleName)
-    	Assert.assertEquals(config1.getTelemetryInitializers().size(), config2.getTelemetryInitializers().size() + 1);
-    	Assert.assertEquals(config1.getTelemetryModules().size(), config2.getTelemetryModules().size());
-    	Assert.assertEquals(config1.getContextInitializers().size(), config2.getContextInitializers().size());
-    	Assert.assertEquals(config1.getTelemetryProcessors().size(), config2.getTelemetryProcessors().size());
-    	Assert.assertEquals(config1.getInstrumentationKey(), config2.getInstrumentationKey());
-    	Assert.assertEquals(config1.isTrackingDisabled(), config2.isTrackingDisabled());
-	}
+        Assert.assertNotEquals(config1, config2);
+        //There is one additional TelemetryInitializer in case of SpringBoot(For Cloud_RoleName)
+        Assert.assertEquals(config1.getTelemetryInitializers().size(), config2.getTelemetryInitializers().size() + 1);
+        Assert.assertEquals(config1.getTelemetryModules().size(), config2.getTelemetryModules().size());
+        Assert.assertEquals(config1.getContextInitializers().size(), config2.getContextInitializers().size());
+        Assert.assertEquals(config1.getTelemetryProcessors().size(), config2.getTelemetryProcessors().size());
+        Assert.assertEquals(config1.getInstrumentationKey(), config2.getInstrumentationKey());
+        Assert.assertEquals(config1.isTrackingDisabled(), config2.isTrackingDisabled());
+    }
 
-	@AfterClass
-	public static void tearDown() throws Exception {
-		Method method = TelemetryConfiguration.class.getDeclaredMethod("setActiveAsNull");
-		method.setAccessible(true);
-		method.invoke(null);
+    @AfterClass
+    public static void tearDown() throws Exception {
+        Method method = TelemetryConfiguration.class.getDeclaredMethod("setActiveAsNull");
+        method.setAccessible(true);
+        method.invoke(null);
 
-		//InternalLogger needs to be shutdown
-		Field field = InternalLogger.class.getDeclaredField("initialized");
-		field.setAccessible(true);
-		field.set(InternalLogger.INSTANCE, false);
-		System.out.println("Exiting core parity tests");
-	}
+        //InternalLogger needs to be shutdown
+        Field field = InternalLogger.class.getDeclaredField("initialized");
+        field.setAccessible(true);
+        field.set(InternalLogger.INSTANCE, false);
+        System.out.println("Exiting core parity tests");
+    }
 
 
 }

collectd/src/main/java/com/microsoft/applicationinsights/collectd/ApplicationInsightsWriter.java

@@ -196,7 +196,7 @@ public int write(ValueList valueList) {
                 this.telemetryClient.trackMetric(metricTelemetry);
             }
         } catch (ThreadDeath td) {
-        	throw td;
+            throw td;
         } catch (Throwable t) {
             try {
                 String errorMessage =

core/src/main/java/com/microsoft/applicationinsights/TelemetryClient.java

@@ -415,7 +415,7 @@ public void track(Telemetry telemetry) {
         try {
             telemetry.getContext().initialize(ctx);
         } catch (ThreadDeath td) {
-        	throw td;
+            throw td;
         } catch (Throwable t) {
             try {
                 InternalLogger.INSTANCE.error("Exception while telemetry context's initialization: '%s'", t.toString());            } catch (ThreadDeath td) {
@@ -438,14 +438,14 @@ public void track(Telemetry telemetry) {
         try {
             QuickPulseDataCollector.INSTANCE.add(telemetry);
         } catch (ThreadDeath td) {
-        	throw td;
+            throw td;
         } catch (Throwable t) {
         }
 
         try {
             getChannel().send(telemetry);
         } catch (ThreadDeath td) {
-        	throw td;
+            throw td;
         } catch (Throwable t) {
             try {
                 InternalLogger.INSTANCE.error("Exception while sending telemetry: '%s'",t.toString());            } catch (ThreadDeath td) {
@@ -480,7 +480,7 @@ private boolean activateProcessors(Telemetry telemetry) {
                     return false;
                 }
             } catch (ThreadDeath td) {
-            	throw td;
+                throw td;
             } catch (Throwable t) {
                 try {
                     InternalLogger.INSTANCE.error("Exception while processing telemetry: '%s'",t.toString());                } catch (ThreadDeath td) {
@@ -523,7 +523,7 @@ private TelemetryContext createInitializedContext() {
             try {
                 init.initialize(ctx);
             } catch (ThreadDeath td) {
-            	throw td;
+                throw td;
             } catch (Throwable t) {
                 try {
                     if (InternalLogger.INSTANCE.isErrorEnabled()) {