Skip to content

Commit 8d79146

Browse files
authored
Merge pull request #971 from microsoft/v2.5.0-BETA
Merge v2.5.0-BETA changes to master
2 parents 8abe83e + 0aa179f commit 8d79146

File tree

223 files changed

+4624
-9791
lines changed

Some content is hidden

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

223 files changed

+4624
-9791
lines changed

CHANGELOG.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
# CHANGELOG
22

3+
# Version 2.5.0-BETA
4+
- Added support for Java 9-12
5+
- Added new `applicationinsights-web-auto.jar` artifact that automatically registers the web filter
6+
by just being present in your dependencies (works for both servlet containers and spring boot standalone)
7+
- No need to modify `web.xml`, or add `@WebFilter`
8+
- Agent now captures application logging via `Log4j 1.2`, `Log4j2` and `Logback`
9+
- No need to add `applicationinsights-logging-*.jar` dependency and modify the application's logging configuration
10+
(e.g. `log4j.properties`, `log4j2.xml`, `logback.xml`)
11+
- To opt out of this (e.g. if you prefer to capture logging via the Application Insights appenders),
12+
add `<Logging enabled="false" />` to the `AI-Agent.xml` file inside of the `Builtin` tag
13+
- Agent now automatically captures dependencies for async requests by tracking the request across multiple threads
14+
- Agent now captures JDBC queries for all JDBC drivers
15+
- Added additional HTTP client support
16+
- `java.net.HttpURLConnection`
17+
- Apache HttpClient 3.x (4.x was already previously supported)
18+
- OkHttp3
19+
- OkHttp2 (previously did not propagate distributed trace context)
20+
- Agent now sets `Operation Name` (used for aggregating similar requests) automatically
21+
based on Spring `@RequestMapping` and JAX-RS `@Path`
22+
- No need for registering `RequestNameHandlerInterceptorAdapter` or writing own interceptor
23+
- (also supports Struts, based on action class / method name)
24+
- Agent now supports multiple applications deployed in the same application server
25+
- (support was removed temporarily in the 2.4.0 release)
26+
- Simplified JBoss and Wildfly deployment when using the agent
27+
- No need for setting `jboss.modules.system.pkgs`, `java.util.logging.manager` and `-Xbootclasspath`
28+
- Added `<RoleName>` tag in `ApplicationInsights.xml` to simplify role name configuration
29+
- No need to write a custom `ContextInitializer`
30+
- Removed support for `<Class>` custom instrumentation in `AI-Agent.xml`
31+
- Removed support for `<RuntimeException>` custom instrumentation in `AI-Agent.xml`
32+
333
# Version 2.4.0
434
- Updated Spring Boot Starter version number to track with the SDK version.
535
- Upgrade gradle to 5.3.1

NOTICE

Lines changed: 177 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,26 @@ Microsoft Application Insights Java Software Development Kit consists of materia
2727
4. Apache Commons-io version 2.6 (http://commons.apache.org/proper/commons-io/)
2828
5. Apache HttpComponents Client version 4.5.3 (http://hc.apache.org/downloads.cgi)
2929
6. Apache HttpComponents Core version 4.4.6 (http://hc.apache.org/downloads.cgi)
30-
7. ASM version 5.2 (http://asm.ow2.org/)
31-
8. ASM Commons version 5.2 (http://asm.ow2.org/)
32-
9. Guava version 26.0-android (http://code.google.com/p/guava-libraries/)
30+
7. ASM version 7.0 (http://asm.ow2.org/)
31+
8. ASM Commons version 7.0 (http://asm.ow2.org/)
32+
9. Guava version 27.1-android (https://github.com/google/guava)
3333
10. INFOMAS PCM Application Suite version 3.0.4 (https://github.com/rmuller/infomas-asl)
3434
11. JSR-305 version 2.0.1 (http://code.google.com/p/jsr-305/)
3535
12. Protobuf-java version 3.6.1 (https://github.com/protocolbuffers/protobuf)
3636
13. gRPC Stubs version 1.16.1 (https://github.com/grpc/grpc-java)
3737
14. gRPC Protobuf version 1.16.1 (https://github.com/grpc/grpc-java)
3838
15. gRPC Netty-shaded version 1.16.1 (https://github.com/grpc/grpc-java)
39+
16. XStream version 1.4.11.1 (https://github.com/x-stream/xstream)
40+
17. SLF4J 1.7.26 (https://github.com/qos-ch/slf4j)
41+
18. Logback 1.2.3 (https://github.com/qos-ch/logback)
42+
19. Guava dependency: FindBugs JSR305 annotations 3.0.2 (https://github.com/findbugsproject/findbugs)
43+
20. Guava dependency: CheckerFramework annotations 2.5.2 (https://github.com/typetools/checker-framework/tree/master/checker-qual)
44+
21. Guava dependency: Google ErrorProne annotations 2.2.0 (https://github.com/google/error-prone/tree/master/annotations)
45+
22. Guava dependency: Google J2ObjC annotations 1.1 (https://github.com/google/j2objc/tree/master/annotations)
46+
23. Guava dependency: Animal Sniffer annotations 1.17 (https://github.com/mojohaus/animal-sniffer/tree/master/animal-sniffer-annotations)
47+
24. Glowroot Instrumentation 0.14.0 (https://github.com/glowroot/instrumentation)
48+
25. CheckerFramework annotations for Java 6 1.0.0 (https://github.com/trask/checker-framework-annotations-for-jdk6)
49+
26. Gson 2.8.5 (https://github.com/google/gson)
3950

4051
%% Apache Commons-codec NOTICES, INFORMATION, AND LICENSE BEGIN HERE
4152
=========================================
@@ -407,40 +418,6 @@ THE POSSIBILITY OF SUCH DAMAGE.
407418
=========================================
408419
END OF ASM NOTICES, INFORMATION, AND LICENSE
409420

410-
%% ASM Commons NOTICES, INFORMATION, AND LICENSE BEGIN HERE
411-
=========================================
412-
Copyright (c) 2000-2011 INRIA, France Telecom
413-
All rights reserved.
414-
415-
Redistribution and use in source and binary forms, with or without
416-
modification, are permitted provided that the following conditions
417-
are met:
418-
419-
1. Redistributions of source code must retain the above copyright
420-
notice, this list of conditions and the following disclaimer.
421-
422-
2. Redistributions in binary form must reproduce the above copyright
423-
notice, this list of conditions and the following disclaimer in the
424-
documentation and/or other materials provided with the distribution.
425-
426-
3. Neither the name of the copyright holders nor the names of its
427-
contributors may be used to endorse or promote products derived from
428-
this software without specific prior written permission.
429-
430-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
431-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
432-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
433-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
434-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
435-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
436-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
437-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
438-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
439-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
440-
THE POSSIBILITY OF SUCH DAMAGE.
441-
=========================================
442-
END OF ASM Commons NOTICES, INFORMATION, AND LICENSE
443-
444421
%% Guava NOTICES, INFORMATION, AND LICENSE BEGIN HERE
445422
=========================================
446423
Guava
@@ -1071,5 +1048,166 @@ Copyright 2014 The gRPC Authors
10711048
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
10721049
See the License for the specific language governing permissions and
10731050
limitations under the License.
1074-
1075-
1051+
=========================================
1052+
1053+
%% XStream NOTICES, INFORMATION, AND LICENSE BEGIN HERE
1054+
=========================================
1055+
(BSD Style License)
1056+
1057+
Copyright (c) 2003-2006, Joe Walnes
1058+
Copyright (c) 2006-2015, XStream Committers
1059+
All rights reserved.
1060+
1061+
Redistribution and use in source and binary forms, with or without
1062+
modification, are permitted provided that the following conditions are met:
1063+
1064+
Redistributions of source code must retain the above copyright notice, this list of
1065+
conditions and the following disclaimer. Redistributions in binary form must reproduce
1066+
the above copyright notice, this list of conditions and the following disclaimer in
1067+
the documentation and/or other materials provided with the distribution.
1068+
1069+
Neither the name of XStream nor the names of its contributors may be used to endorse
1070+
or promote products derived from this software without specific prior written
1071+
permission.
1072+
1073+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
1074+
EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
1075+
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
1076+
SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
1077+
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
1078+
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
1079+
BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
1080+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
1081+
WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
1082+
DAMAGE.
1083+
=========================================
1084+
END OF XStream NOTICES, INFORMATION, AND LICENSE
1085+
1086+
%% SLF4J NOTICES, INFORMATION, AND LICENSE BEGIN HERE
1087+
=========================================
1088+
Copyright (c) 2004-2007 QOS.ch
1089+
All rights reserved.
1090+
1091+
Permission is hereby granted, free of charge, to any person obtaining
1092+
a copy of this software and associated documentation files (the
1093+
"Software"), to deal in the Software without restriction, including
1094+
without limitation the rights to use, copy, modify, merge, publish,
1095+
distribute, sublicense, and/or sell copies of the Software, and to
1096+
permit persons to whom the Software is furnished to do so, subject to
1097+
the following conditions:
1098+
1099+
The above copyright notice and this permission notice shall be
1100+
included in all copies or substantial portions of the Software.
1101+
1102+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1103+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
1104+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
1105+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
1106+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
1107+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
1108+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1109+
=========================================
1110+
END OF SLF4J NOTICES, INFORMATION, AND LICENSE
1111+
1112+
%% Logback NOTICES, INFORMATION, AND LICENSE BEGIN HERE
1113+
=========================================
1114+
Logback: the reliable, generic, fast and flexible logging framework.
1115+
Copyright (C) 1999-2015, QOS.ch. All rights reserved.
1116+
1117+
This program and the accompanying materials are dual-licensed under
1118+
either the terms of the Eclipse Public License v1.0 as published by
1119+
the Eclipse Foundation
1120+
1121+
or (per the licensee's choosing)
1122+
1123+
under the terms of the GNU Lesser General Public License version 2.1
1124+
as published by the Free Software Foundation.
1125+
=========================================
1126+
END OF Logback NOTICES, INFORMATION, AND LICENSE
1127+
1128+
%% FindBugs JSR305 annotations NOTICES, INFORMATION, AND LICENSE BEGIN HERE
1129+
=========================================
1130+
Licensed under the Apache License, Version 2.0
1131+
=========================================
1132+
END OF FindBugs JSR305 annotations NOTICES, INFORMATION, AND LICENSE
1133+
1134+
%% CheckerFramework annotations NOTICES, INFORMATION, AND LICENSE BEGIN HERE
1135+
=========================================
1136+
The Checker Framework
1137+
Copyright 2004-present by the Checker Framework developers
1138+
1139+
Permission is hereby granted, free of charge, to any person obtaining a copy
1140+
of this software and associated documentation files (the "Software"), to deal
1141+
in the Software without restriction, including without limitation the rights
1142+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
1143+
copies of the Software, and to permit persons to whom the Software is
1144+
furnished to do so, subject to the following conditions:
1145+
1146+
The above copyright notice and this permission notice shall be included in
1147+
all copies or substantial portions of the Software.
1148+
1149+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1150+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1151+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1152+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1153+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1154+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1155+
THE SOFTWARE.
1156+
=========================================
1157+
END OF CheckerFramework annotations NOTICES, INFORMATION, AND LICENSE
1158+
1159+
%% Google ErrorProne annotations NOTICES, INFORMATION, AND LICENSE BEGIN HERE
1160+
=========================================
1161+
Licensed under the Apache License, Version 2.0
1162+
=========================================
1163+
END OF Google ErrorProne annotations NOTICES, INFORMATION, AND LICENSE
1164+
1165+
%% Google J2ObjC annotations NOTICES, INFORMATION, AND LICENSE BEGIN HERE
1166+
=========================================
1167+
Licensed under the Apache License, Version 2.0
1168+
=========================================
1169+
END OF Google J2ObjC annotations NOTICES, INFORMATION, AND LICENSE
1170+
1171+
%% Animal Sniffer annotations NOTICES, INFORMATION, AND LICENSE BEGIN HERE
1172+
=========================================
1173+
The MIT License
1174+
1175+
Copyright (c) 2009 codehaus.org.
1176+
1177+
Permission is hereby granted, free of charge, to any person obtaining a copy
1178+
of this software and associated documentation files (the "Software"), to deal
1179+
in the Software without restriction, including without limitation the rights
1180+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
1181+
copies of the Software, and to permit persons to whom the Software is
1182+
furnished to do so, subject to the following conditions:
1183+
1184+
The above copyright notice and this permission notice shall be included in
1185+
all copies or substantial portions of the Software.
1186+
1187+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
1188+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
1189+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1190+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1191+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1192+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
1193+
THE SOFTWARE.
1194+
=========================================
1195+
END OF Animal Sniffer annotations NOTICES, INFORMATION, AND LICENSE
1196+
1197+
%% Glowroot Instrumentation NOTICES, INFORMATION, AND LICENSE BEGIN HERE
1198+
=========================================
1199+
Licensed under the Apache License, Version 2.0
1200+
=========================================
1201+
END OF Glowroot Instrumentation NOTICES, INFORMATION, AND LICENSE
1202+
1203+
%% CheckerFramework annotations for Java 6 NOTICES, INFORMATION, AND LICENSE BEGIN HERE
1204+
=========================================
1205+
Licensed under the Apache License, Version 2.0
1206+
=========================================
1207+
END OF CheckerFramework annotations for Java 6 NOTICES, INFORMATION, AND LICENSE
1208+
1209+
%% Gson NOTICES, INFORMATION, AND LICENSE BEGIN HERE
1210+
=========================================
1211+
Licensed under the Apache License, Version 2.0
1212+
=========================================
1213+
END OF Gson NOTICES, INFORMATION, AND LICENSE

0 commit comments

Comments
 (0)