Skip to content

Commit a4437aa

Browse files
authored
Merge pull request #1006 from microsoft/buildme/remove-trailing-spaces
Normalize white space
2 parents eb64191 + 99da7a1 commit a4437aa

File tree

150 files changed

+935
-935
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+935
-935
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ If you're interested in contributing, take a look at the general [contributer's
3030
To build Application Insights CollectD writer plugin, please do the following:
3131

3232
1. Aquire 'collectd-api.jar' using one of the following methods:
33-
* Install CollectD
33+
* Install CollectD
3434
* Set an environment variable **COLLECTD_HOME** to the installation directory.
3535
* Download CollectD Java API sources and compile them using JDK 1.7.
3636
The output jar should be named: 'collectd-api.jar'.

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ If applicable, provide a sample application which reproduces the issue.
1818

1919
### System information
2020
Please provide the following information:
21-
- SDK Version:
21+
- SDK Version:
2222
- OS type and version:
2323
- Application Server type and version (if applicable):
2424
- Using spring-boot?

CHANGELOG.md

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -60,33 +60,33 @@
6060

6161
# Version 2.4.0-BETA
6262
- Removed support for multiple apps instrumented with single JVM Agent. Instrumentation will only work for single apps
63-
in application server.
63+
in application server.
6464
- Fixed [#749](https://github.com/Microsoft/ApplicationInsights-Java/issues/749) introduce support for PostgreSQL jdbc4 prepared statements.
65-
- Introduced support for Manual Async and Explicit Multithreading correlation.
65+
- Introduced support for Manual Async and Explicit Multithreading correlation.
6666
- <strike>Introduced `setRequestTelemetryContext` API in `WebTelemetryModule` Interface.</strike>
6767
- Introduced experimental API's `AIHttpServletListner`, `HttpServerHandler`, `ApplicationInsightsServletExtractor`
6868
and `HttpExtractor`.
6969
- Deprecated `ApplicationInsightsHttpResponseWrapper`
7070
- Fixed [#826](https://github.com/Microsoft/ApplicationInsights-Java/issues/826) Remove duplicate provider.
7171
- Fix incorrect sdk version being sent in Quick Pulse payload.
72-
- Fix [#882](https://github.com/Microsoft/ApplicationInsights-Java/issues/882) Dependency metrics does not show up on
72+
- Fix [#882](https://github.com/Microsoft/ApplicationInsights-Java/issues/882) Dependency metrics does not show up on
7373
Livemetrics UX.
74-
74+
7575
# Version 2.3.1
7676
- Fixed [#799](https://github.com/Microsoft/ApplicationInsights-Java/issues/799) Removed dependency on Guava vulnerable to [CVE-2018-10237](https://nvd.nist.gov/vuln/detail/CVE-2018-10237).
7777

7878
# Version 2.3.0
7979
- Introducing Application Insights SpringBoot Starter 1.1.1 (GA VERSION).
80-
- Fix [#784](https://github.com/Microsoft/ApplicationInsights-Java/issues/784) Shade guava dependency.
80+
- Fix [#784](https://github.com/Microsoft/ApplicationInsights-Java/issues/784) Shade guava dependency.
8181
- [#716](https://github.com/Microsoft/ApplicationInsights-Java/issues/716) Introduced W3C Distributed tracing protocol.
8282

8383
# Version 2.2.1
8484
- Fixed [#767](https://github.com/Microsoft/ApplicationInsights-Java/issues/767). Updated gRPC dependencies which inlcudes latest netty version.
8585
- Fixed [#751](https://github.com/Microsoft/ApplicationInsights-Java/issues/751). Added support for absolute paths for log file output.
86-
- Abstracted Internal Logger in Core into separate reusable module.
86+
- Abstracted Internal Logger in Core into separate reusable module.
8787
- Deprecated InternalAgentLogger in favor of InternalLogger for better consistency.
88-
- Fixed [#752](https://github.com/Microsoft/ApplicationInsights-Java/issues/752). Agent now supports diagnostic writing logs to file.
89-
- Added ability to configure FileLogger for SpringBootStarter.
88+
- Fixed [#752](https://github.com/Microsoft/ApplicationInsights-Java/issues/752). Agent now supports diagnostic writing logs to file.
89+
- Added ability to configure FileLogger for SpringBootStarter.
9090
- Fixed the `WebRequestTrackingFilter` order in FilterChain for SpringBoot Starter.
9191

9292

@@ -98,11 +98,11 @@ Livemetrics UX.
9898
- SpringBoot Starter now supports reading iKey using all the variable names as core sdk.
9999
- Starter would no longer support relaxed binding of ikey property due to complex conditional need and backport problems with RelaxedBinder from Boot 2 to 1.5.x.
100100
- `InterceptorRegistry` class no longer has `@EnableWebMvc` annotation as it breaks springboot autoconfig.
101-
- Deprecated `getRoleName`/`setRoleName` and `getRoleInstance`/`setRoleInstance` in `DeviceContext`. Introduced `CloudContext` to hold replacements, `getRole`/`setRole` and `getRoleInstance`/`setRoleInstance`, respectively.
101+
- Deprecated `getRoleName`/`setRoleName` and `getRoleInstance`/`setRoleInstance` in `DeviceContext`. Introduced `CloudContext` to hold replacements, `getRole`/`setRole` and `getRoleInstance`/`setRoleInstance`, respectively.
102102
- Introduced `CloudInfoContextInitializer` to set roleInstance in `CloudContext`. This new initializer is included by default and therefore will not affect the current tags.
103103
- Adds `WebAppNameContextInitializer` for use with the `WebRequestTrackingFilter`.
104104
- Adds `LocalForwarderChannel` for use with the [LocalForwarder](https://github.com/Microsoft/ApplicationInsights-LocalForwarder).
105-
- Removes Servlet 3.0 annotations from `WebRequestTrackingFilter` and `ApplicationInsightsServletContextListener` which were causing issues in certain cases. This will allow easier customization of the filter. To use the listener moving forward, it will need to be defined in web.xml.
105+
- Removes Servlet 3.0 annotations from `WebRequestTrackingFilter` and `ApplicationInsightsServletContextListener` which were causing issues in certain cases. This will allow easier customization of the filter. To use the listener moving forward, it will need to be defined in web.xml.
106106
- Fix QuickPulse post interval bug from 5 seconds to 1 second.
107107

108108
# Version 2.1.2
@@ -117,15 +117,15 @@ Livemetrics UX.
117117
- Introducing support for SpringBoot via Application-Insights-SpringBoot-Starter [#646](https://github.com/Microsoft/ApplicationInsights-Java/pull/646). This is currently in beta.
118118
- In order to add support for SpringBoot starter some fields in core SDK are made public.
119119
- Introduced public constructor in `InProcessTelemetryChannel.java` class.
120-
- Introduced a public method `getActiveWithoutInitializingConfig()` in `TelemetryConfiguration.java` class.
120+
- Introduced a public method `getActiveWithoutInitializingConfig()` in `TelemetryConfiguration.java` class.
121121

122122
# Version 2.1.0
123123
- Introduced Heartbeat feature which sends periodic heartbeats with basic information about application and runtime to Application Insights.
124124
- Enable support for system properties in the instrumentation key resolving component.
125125
- Performance improvements during initialization.
126126
- Fix [#647](https://github.com/Microsoft/ApplicationInsights-Java/issues/647). If a performance counter cannot be computed, it will not report a placeholder value (`-1`). Instead, it does not report any value.
127127

128-
## Version 2.0.2
128+
## Version 2.0.2
129129
- Fix incorrect success flag set when capturing HTTP Dependency.
130130
- Fix [#577](https://github.com/Microsoft/ApplicationInsights-Java/issues/577), removed HttpFactory class as it was not being used.
131131
- Fixed issue with sessionId not being set in request telemetry due to date parsing issues.
@@ -140,7 +140,7 @@ Livemetrics UX.
140140
- `httpMethodFinished(String identifier, String method, String correlationId, String uri, String target, int result, int delta)` is now marked as deprecated
141141
- Logger Messages now being pushed as custom dimension when reporting exceptions via Loggers. (#400)
142142
- Enhanced Log4j2 appender to support basic parameters including Filters, Layouts and includeException. (#348)
143-
- Fixed PageView telemetry data not being reported.
143+
- Fixed PageView telemetry data not being reported.
144144
- Fixed Issue [#526](https://github.com/Microsoft/ApplicationInsights-Java/issues/526) (NPE in MapUtil.copy())
145145
- Fixed Issue [#513](https://github.com/Microsoft/ApplicationInsights-Java/issues/513) (Memory leak in SDKShutdownActivity). This fix upgrades our Servlet version from 2.5 to 3.0. The SDK must now be run on an application server supporting Servlet 3.0.
146146
- Fixed Issue [#504](https://github.com/Microsoft/ApplicationInsights-Java/issues/504) (SDK initialization happens twice) to improve startup performance.
@@ -171,15 +171,15 @@ Livemetrics UX.
171171
- Introducing Telemetry Processor 'com.microsoft.applicationinsights.internal.channel.samplingV2.FixedRateSamplingTelemetryProcessor'
172172
- Introducing FixedRate Sampling v2 Using Telemetry Processors
173173
- Fixed issue #436 (TraceTelemetry with Severity is not shown in UI). This fixes a regression issue with `TelemetryClient.trackTrace` and `TelemetryClient.trackException`.
174-
- Introducing support for [cross-component correlation](https://docs.microsoft.com/en-us/azure/application-insights/application-insights-correlation). Addresses issue [#457](https://github.com/Microsoft/ApplicationInsights-Java/issues/457).
174+
- Introducing support for [cross-component correlation](https://docs.microsoft.com/en-us/azure/application-insights/application-insights-correlation). Addresses issue [#457](https://github.com/Microsoft/ApplicationInsights-Java/issues/457).
175175
- Changed signature of com.microsoft.applicationinsights.internal.agent.CoreAgentNotificationHandler.httpMethodFinished. It now includes correlation information.
176176
- Compilation now targets Java 1.7. Java 1.6 is no longer supported.
177177
- Adding system property `applicationinsights.configurationDirectory` to allow to explicitly set directory containing the config file.
178178

179179
## Version 1.0.10
180180
- `track()` method of 'com.microsoft.applicationinsights.TelemetryClient' is now modified. No longer performing pre-sanitization
181-
- All Sanitization will now occur in `com.microsoft.applicationinsights.telemetry.JsonTelemetryDataSerializer` class.
182-
- Method `sanitize` of interface `com.microsoft.applicationinsights.telemetry.Telemetry` is now obsolete.
181+
- All Sanitization will now occur in `com.microsoft.applicationinsights.telemetry.JsonTelemetryDataSerializer` class.
182+
- Method `sanitize` of interface `com.microsoft.applicationinsights.telemetry.Telemetry` is now obsolete.
183183
- The auto generated schema classes now have writer method with limits according to endpoint.
184184
- Fixed issue #403 (Exceeding property length invalidates custom event)
185185
- Fixed issue #401 (Custom key and property sanitized)
@@ -190,11 +190,11 @@ Livemetrics UX.
190190
- Class `SendableData` in internal namespace deleted.
191191
- Class `com.microsoft.applicationinsights.telemetry.BaseSampleSourceTelemetry` takes generic class qualifier `Domain` instead of `SendableData`.
192192
- Class `com.microsoft.applicationinsights.telemetry.BaseTelemetry` takes generic class qualifier `Domain` instead of `SendableData`.
193-
- Methods `getExceptionHandledAt` and `setExceptionHandledAt` of `ExceptionTelemetry` marked obsolete and do not do anything.
193+
- Methods `getExceptionHandledAt` and `setExceptionHandledAt` of `ExceptionTelemetry` marked obsolete and do not do anything.
194194
- Obsolete methods of `RemoteDependencyTelemetry`: `getCount`, `setCount`, `getMin`, `setMin`, `getMax`, `setMax`, `getStdDev`, `setStdDev`, `getDependencyKind`, `setDependencyKind`, `getAsync`, `setAsync`, `getDependencySource`, `setDependencySource`.
195195
- Obsolete methods of `RequestTelemetry`: `getHttpMethod`, `setHttpMethod`.
196196
- Add option to configure instrumentation key via `APPINSIGHTS_INSTRUMENTATIONKEY` environment variable for consistency with other SDKs.
197-
- Fix the issue where `track(...)` of `TelemetryClient` class was overwriting the provided telemetry timestamp.
197+
- Fix the issue where `track(...)` of `TelemetryClient` class was overwriting the provided telemetry timestamp.
198198
- Changed the policy on failed sent requests to delay retrying for 5 minutes instead of immediately retrying.
199199

200200
## Version 1.0.9
@@ -239,7 +239,7 @@ Livemetrics UX.
239239
- [Propagate log context properties in custom properties](https://github.com/Microsoft/ApplicationInsights-Java/pull/288).
240240
- [Ability to filter out certain telemetry from being sent](https://github.com/Microsoft/ApplicationInsights-Java/pull/296).
241241
- Some other miscellaneous fixes and improvements.
242-
242+
243243
## Version 1.0.4
244244
- Interim version replaced by 1.0.5 on August 2016
245245

@@ -269,8 +269,8 @@ Livemetrics UX.
269269
- Adding support for Java EE interceptors.
270270
- Removing redundant dependencies from the Logback appender.
271271

272-
## Version 0.9.5
273-
- Fix for an issue where custom events are not correlated with Users/Sessions due to cookie parsing errors.
272+
## Version 0.9.5
273+
- Fix for an issue where custom events are not correlated with Users/Sessions due to cookie parsing errors.
274274
- Improved logic for resolving the location of the ApplicationInsights.xml configuration file.
275275
- Anonymous User and Session cookies will not be generated on the server side. To implement user and session tracking for web apps, instrumentation with the JavaScript SDK is now required – cookies from the JavaScript SDK are still respected. Note that this change may cause a significant restatement of user and session counts as only user-originated sessions are being counted now.
276276

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
## Introduction
77

8-
This is the repository of the Java SDK for [Azure Application Insights](https://azure.microsoft.com/en-us/services/application-insights/). Application Insights is a service that monitors the availability, performance and usage of your application. The SDK sends telemetry about the performance and usage of your app to the Application Insights service where your data can be visualized in the [Azure Portal](https://portal.azure.com). The SDK automatically collects telemetry about HTTP requests, dependencies, and exceptions. You can also use the SDK to send your own events and trace logs.
8+
This is the repository of the Java SDK for [Azure Application Insights](https://azure.microsoft.com/en-us/services/application-insights/). Application Insights is a service that monitors the availability, performance and usage of your application. The SDK sends telemetry about the performance and usage of your app to the Application Insights service where your data can be visualized in the [Azure Portal](https://portal.azure.com). The SDK automatically collects telemetry about HTTP requests, dependencies, and exceptions. You can also use the SDK to send your own events and trace logs.
99

1010
For more information please refer to:
1111

12-
* [Getting started with Application Insights in a Java web project](https://azure.microsoft.com/documentation/articles/app-insights-java-get-started/)
12+
* [Getting started with Application Insights in a Java web project](https://azure.microsoft.com/documentation/articles/app-insights-java-get-started/)
1313
* [Application Insights overview](https://azure.microsoft.com/services/application-insights/)
1414
* [Application Insights with SpringBoot](https://docs.microsoft.com/en-us/java/azure/spring-framework/configure-spring-boot-java-applicationinsights)
1515

@@ -22,7 +22,7 @@ The following packages are built in this repository:
2222
- Log4J 2 adaptor: [![applicationinsights-logging-log4j2](https://img.shields.io/maven-central/v/com.microsoft.azure/applicationinsights-logging-log4j2.svg)](https://search.maven.org/remote_content?g=com.microsoft.azure&a=applicationinsights-logging-log4j2&v=latest)
2323
- Log4J 1.2 adaptor: [![applicationinsights-logging-log4j1_2](https://img.shields.io/maven-central/v/com.microsoft.azure/applicationinsights-logging-log4j1_2.svg)](https://search.maven.org/remote_content?g=com.microsoft.azure&a=applicationinsights-logging-log4j1_2&v=latest)
2424

25-
## To upgrade to the latest SDK
25+
## To upgrade to the latest SDK
2626

2727
After you upgrade, you'll need to merge back any customizations you made to `ApplicationInsights.xml`. Take a copy of it to compare with the new file.
2828

@@ -34,7 +34,7 @@ After you upgrade, you'll need to merge back any customizations you made to `App
3434
*Otherwise*
3535

3636
* Download the latest version of [Application Insights Java SDK](https://docs.microsoft.com/en-us/azure/application-insights/app-insights-java-get-started), [scroll down to the getting started section](https://docs.microsoft.com/en-us/azure/application-insights/app-insights-java-get-started) and follow the instructions to manually download the SDK and replace the old `.jar` files.
37-
37+
3838
Compare the old and new `ApplicationInsights.xml`. Many of the changes you see are because we added and removed modules. Reinstate any customizations that you made.
3939

4040
## Application Insights for Java Roadmap

azure-application-insights-spring-boot-starter/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ azure.application-insights.jmx.jmx-counters[0]=java.lang:type=ClassLoading/Loade
182182
azure.application-insights.jmx.jmx-counters[1]=java.lang:type=Memory/HeapMemoryUsage.init/Initial Heap Memory Usage/Composite
183183
azure.application-insights.jmx.jmx-counters[2]=java.lang:name=PS MarkSweep,type=GarbageCollector/CollectionTime/GC MarkSweep Time
184184
# where the elements separated by / have the following order:
185-
# 1. objectName 2. AttributeName 3. Display Name and 4. Type
185+
# 1. objectName 2. AttributeName 3. Display Name and 4. Type
186186

187187
#Enable/Disable heartbeat module. Default value : true
188188
azure.application-insights.heart-beat.enabled=true
@@ -207,10 +207,10 @@ and avoiding any Application Insights beans creation by Spring.
207207
1. Please remove ApplicationInsights.xml file from the project resources or class path.
208208
2. Add applicationinsights-spring-boot-starter-<version_number>.jar file to pom.xml or build.gradle (you do not need to specify applicationinsights-core and web jars independently).
209209
The starter takes are of it for you.
210-
3. Please configure springboot Application.properties file with Application Insights Instrumentation key.
210+
3. Please configure springboot Application.properties file with Application Insights Instrumentation key.
211211
4. Compile the project and execute it from your IDE or command line using java -jar applicationjarname
212212
5. To specify AI properties using command line please refer to SpringBoot Documentation.
213-
6. To use [ApplicationInsights Java agent](https://docs.microsoft.com/en-us/azure/application-insights/app-insights-java-agent) please follow official documentation
213+
6. To use [ApplicationInsights Java agent](https://docs.microsoft.com/en-us/azure/application-insights/app-insights-java-agent) please follow official documentation
214214
4. To get an initialized instance of TelemetryClient please use Spring autowired annotation. This will provide a fully initialized instance of TelemetryClient.
215215

216216
```Java

azure-application-insights-spring-boot-starter/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ shadowJar {
8282
exclude(dependency([group: 'org.apache.httpcomponents', name: 'httpasyncclient', version: '4.1.3']))
8383
exclude(dependency([group: 'com.google.guava', name: 'guava', version: '26.0-android']))
8484
exclude(dependency([group: 'com.google.code.gson', name: 'gson', version: '2.8.2']))
85-
85+
8686
// exclude gRPC and protobuf dependencies
8787
exclude(dependency([group: 'com.google.protobuf', name:'protobuf-java', version:'3.6.1']))
8888
exclude(dependency([group: 'io.grpc', name: 'grpc-stub', version: '1.16.1']))

core/native.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ model {
7777
}
7878
}
7979
}
80-
80+
8181
binaries.all {
8282
if (delegate instanceof StaticLibraryBinarySpec) {
8383
buildable = false

0 commit comments

Comments
 (0)