Lauri Tulmin
9b8ab5eeec
Migrate to spock 2 ( #4458 )
...
* Migrate to spock 2
* Fix smoke test suites
* address review comments
* review comment
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-10-22 08:40:58 -07:00
Lauri Tulmin
ef131acd6d
Enable http server concurrency test everywhere ( #4465 )
...
* Enable http server concurrency test everywhere
* remove testConcurrency method as test is now always enabled
* rebase
2021-10-22 08:39:30 -07:00
jason plumb
a50c13382f
Don't report 400 level as error for SERVER spans ( #4403 )
...
* don't report 400 level as error for server spans
* fix HttpServerTest base class
* fix JspInstrumentationForward test
* split HttpStatusConverter into client and server implementations, and create two HttpSpanStatusExtractor.create methods, one for server and one for client.
* rebase
* fix test
* spotless
* fix test
* remove unused
* use strongly typed attributes converters and rename to overloaded create()
* fix tests
* remove redundant assert
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-10-20 13:39:35 -07:00
Martin
ac91dc090a
Type annotation placement ( #4406 )
...
* switch annotation `org.checkerframework.checker.nullness.qual.Nullable` to `javax.annotation.Nullable`
* code format
2021-10-17 17:38:43 -07:00
Lauri Tulmin
b06c1f9018
Collect more attributes from servlet instrumenter ( #4356 )
...
* Collect more attributes from servlet instrumenter
* spotless
2021-10-12 10:58:47 -07:00
Trask Stalnaker
87038f2899
Fix call depth ( #4338 )
2021-10-11 10:42:20 +03:00
Mateusz Rzeszutek
354699647a
Test captured HTTP headers - HTTP server tests, part 2 ( #4328 )
...
* Test captured HTTP headers - HTTP server tests, part 2
* Turn off captured HTTP headers testing for grizzly
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-10-08 13:05:35 -07:00
Lauri Tulmin
478f936d54
Retry strict context check failures ( #4282 )
2021-10-08 10:47:52 -07:00
Mateusz Rzeszutek
7473eff1e6
Extract HTTP request/response headers as span attributes ( #4237 )
...
* Extract HTTP request/response headers as span attributes
* fix muzzle
* code review comments
* fix compilation failure after merge conflict
* avoid using streams API when transforming the headers list
* fix liberty extractor
* fix spring webmvc extractor
2021-10-05 10:20:59 +02:00
Mateusz Rzeszutek
c421b66d56
Remove unnecessary VirtualField#setIfNull() method ( #4262 )
2021-10-02 13:17:48 -07:00
Mateusz Rzeszutek
c11b96e4d0
Make it possible to use InstrumentationContext (now VirtualField) fro… ( #4218 )
...
* Make it possible to use InstrumentationContext (now VirtualField) from library instrumentation
* fix tests
* fix javadocs
* fix some more tests
* code review comments
* setIfNull, computeIfNull
2021-10-01 11:13:11 +02:00
Lauri Tulmin
ba3370e054
Build servlet mapping resolver only when needed ( #4197 )
...
* Build servlet mapping resolver only when needed
* move factory interface to boot loader to ensure that everybody has the same class for it
* spotless
* Helper classes should not look up ContextStore on each access
2021-09-27 18:04:22 +03:00
Trask Stalnaker
8066f2787c
Add context customizer hook to Instrumenter API ( #4167 )
...
* Add context customizer hook to Instrumenter API
* Use in tomcat instrumentation
* Some of servlet
* Use in rest of servlet
* Feedback
2021-09-22 14:54:04 -07:00
Mateusz Rzeszutek
dc4ddf7932
Remove ContextStore.Factory interface; use Supplier instead ( #4157 )
2021-09-17 13:00:23 -07:00
Lauri Tulmin
15277cf8f5
Convert servlet instrumentation to instrumenter api ( #4078 )
...
* Convert servlet to instrumenter api
* make classes final
* Remove some tracer files
* remove xxx
* fix liberty and wildfly exception smoke test
* fix async smoke test on liberty
* Apply suggestions from code review
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* generic TextMapGetter for servlets
* not going to use http.route for servlets
* simplify
* add servlet timeout in attribute extractor
* move classes from library to javaagent
* remove unneeded dependency
* make method private
* move helper class initialization to singleton, remove helpers that don't have any methods, add shouldStart checks
* Update instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/ServletRequestContext.java
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* add import
* rename methods that start and end spans
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2021-09-13 10:12:34 -07:00
Matthew Ho
6967484a97
Update groovy import order to match default IntelliJ ( #1708 ) ( #4047 )
...
* Update groovy import order to match default IntelliJ (#1708 )
* organized imports for .groovy files to follow default IntelliJ import settings
* updated intellij-setup.md
* Spotless
* drift
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-09-11 11:53:08 -07:00
Trask Stalnaker
c91eda59b5
Small reduction in context lookups ( #4006 )
2021-08-30 09:02:52 -07:00
Lauri Tulmin
a2928663f4
Strict context check for tomcat and jetty ( #3923 )
2021-08-24 11:45:53 -07:00
Trask Stalnaker
3525733ea8
Enable strict context check in tests by default ( #3822 )
2021-08-23 17:40:02 -07:00
Trask Stalnaker
ec344b3184
Small simplification of servlet/tomcat tests ( #3710 )
...
* Small simplification of servlet/tomcat tests
* Spotless
2021-08-09 09:24:21 -07:00
Lauri Tulmin
d73e030000
Fix NullPointerException on tomcat ( #3705 )
...
* Fix NullPointerException on tomcat
* remove commented out line
* instrument CoyoteAdapter
2021-07-28 12:10:14 -07:00
Trask Stalnaker
b304cc2912
Deprecate CallDepth.reset() and get() ( #3511 )
...
* Deprecate CallDepth.reset() and get()
* Don't pass CallDepth around
2021-07-07 09:24:50 -07:00
Mateusz Rzeszutek
c5ba5c3a71
Use local variable for passing CallDepth between advice enter/exit me… ( #3504 )
...
* Use local variable for passing CallDepth between advice enter/exit methods
* fix broken call depth tracking
* checkstyle
* fix javadocs
2021-07-06 12:05:14 -07:00
Mateusz Rzeszutek
b9fcb6b498
Reduce CallDepth classes' API surface ( #3497 )
2021-07-06 09:24:19 +02:00
Mateusz Rzeszutek
15ed01d4fc
Change all instrumentation names to io.opentelemetry.{libName}-{libVersion} ( #3411 )
...
* Change all instrumentation names to io.opentelemetry.{libName}-{libVersion}
* minumum supported version
2021-06-30 15:34:36 +02:00
Anuraag Agrawal
761b9c280b
Migrate instrumentation gradle files to kotlin ( #3414 )
...
* Migrate instrumentation gradle files to kotlin
* Convert
* Muzzle
2021-06-28 17:27:12 +09:00
Anuraag Agrawal
785dc6adf2
Rename build files to build.gradle ( #3409 )
...
* Rename build files to build.gradle
* Rename smoke-tests
* Fix already broken
2021-06-25 16:10:31 +09:00
Anuraag Agrawal
deb0e255cf
Use plugins block everywhere for applying plugins ( #3386 )
...
* Use plugins block everywhere for applying plugins
* Actually it's library instrumentation
2021-06-24 11:13:35 +09:00
Anuraag Agrawal
80f43b7a6a
Migrate javaagent-instrumentation to plugin ( #3328 )
...
* Migrate instrumentation.gradle to plugin
* Migrate usages
* Remove old
* Fix
* Revert example
* afterEvaluate
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-06-17 23:13:14 +09:00
Anuraag Agrawal
b7bfbf0cc6
Migrate instrumentation-library / common to plugins ( #3320 )
2021-06-15 11:54:48 -07:00
Anuraag Agrawal
7ad9e7a50b
Move shaded testing dependencies to internal package. ( #3305 )
2021-06-15 13:10:19 +03:00
Trask Stalnaker
9f31a057b6
Refactor span names class ( #3281 )
...
* spanNameForMethod
* spanNameForClass
* Cache simple name using ClassValue
2021-06-14 11:56:40 -07:00
Trask Stalnaker
4c80c62ce7
Add unused to remaining advice classes ( #3280 )
...
* Add unused to remaining advice classes
* Add newlines for visual separation
2021-06-14 11:12:02 +09:00
Anuraag Agrawal
84cc044ddf
Migrate remaining test client calls to Armeria and remove testing-com… ( #3250 )
2021-06-11 11:51:23 -07:00
Anuraag Agrawal
60aaff8972
Migrate HttpServerTest to Armeria ( #3240 )
...
* Migrate HttpServerTest to Armeria
* Update testing-common/src/main/groovy/io/opentelemetry/instrumentation/test/base/HttpServerTest.groovy
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-06-11 08:56:02 +09:00
Anuraag Agrawal
2436499a09
Update to Errorprone 2.7 ( #3181 )
...
* Update to errorprone 2.7
* ToString
* Finish
2021-06-04 10:40:55 +09:00
Anuraag Agrawal
ed88cca533
Migrate from spotbugs to errorprone ( #3122 )
...
* Migrate from spotbugs to errorprone
* Fix hashtable
* try-with-resources
* Fix from merge
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-05-28 14:23:40 -07:00
Anuraag Agrawal
c358a35414
Use dependency management pattern for dependency versions ( #3113 )
...
* Use dependency management pattern for dependency versions.
* Add groovy bom too
* Update dependencyManagement/dependencyManagement.gradle.kts
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-05-28 11:32:08 +09:00
Ago Allikmaa
df078f95a9
Extract HttpServerTest INDEXED_CHILD span attribute collection logic ( #3095 )
...
* Extrawct HttpServerTest INDEXED_CHILD span attribute collection logic
* Adjust whitespace
* Fix context issue with JAX-RS
* Rerun tests
2021-05-27 11:18:11 +03:00
Ago Allikmaa
fd132d463d
Change Async Servlet span end logic to fix race condition on Undertow ( #2992 )
...
* Attach servlet async listener with asyncStart instrumentation
* Exclude Spring packages containing servlet request classes from global ignores
* Exclude Tapestry HSR proxy with global ignore
* Improve comments.
* Fix for Liberty - request response when adding async listener
* Removed unused methods
* Explicit response to async listeners on all servlet engines
* Attach response to request on Jetty
* Fix broken build due to rebase, improved a comment
* Address PR comments
* Added a comment.
* Addressed PR comments
2021-05-25 20:46:37 -07:00
Lauri Tulmin
2675364897
Remove span isRecording check from servlet advice ( #3022 )
2021-05-18 08:51:24 +09:00
Anuraag Agrawal
fe41885ee6
Switch to colon notation for dependencies. ( #2994 )
...
* Switch to colon notation for dependencies.
* Even more cleanup
* Revert mistake
2021-05-15 15:31:06 +09:00
Lauri Tulmin
406eabef20
Simplify servlet advice ( #2972 )
...
* Simplify servlet advice
* fix sampling
* Trigger Build
* use the same logic as previously, maybe this helps agains glassfish smoke-test failure
2021-05-14 18:49:32 +03:00
Trask Stalnaker
f413e5a3aa
Remove RequestDispatcherAdvice ( #2942 )
2021-05-12 21:37:48 -07:00
Mateusz Rzeszutek
9c7fae3b04
Extract javaagent-extension-api from tooling & spi ( #2879 )
2021-05-06 23:30:25 -07:00
Lauri Tulmin
1579d59abd
Copy servlet3 tests to servlet5 ( #2918 )
2021-05-06 11:47:49 -07:00
Lauri Tulmin
357140c081
Server span naming for servlet filters ( #2887 )
...
* Server span naming for servlet filters
* wildfly default servlet has empty mappings
* jetty11 requires java11
* try a differnt way to disable jetty11 tests on java8
* Update instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/TomcatServlet5FilterMappingTest.groovy
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
* review fix
* rework to use InstrumentationContext
* remove debugging code
* move MappingResolver to avoid ClassCastException on wildfly
* Update instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TomcatServlet3FilterMappingTest.groovy
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* review fixes
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2021-05-06 13:25:17 +03:00
Trask Stalnaker
1824e36b96
Better server span name for Grails and Wicket ( #2814 )
2021-04-22 14:16:54 -07:00
Trask Stalnaker
46c1212236
Remove forward and include spans ( #2816 )
2021-04-22 11:36:53 -07:00
Mateusz Rzeszutek
078603caf5
Generate InstrumentationModule#contextStore() with muzzle ( #2775 )
2021-04-13 20:05:01 -07:00
Trask Stalnaker
3bd46091bc
Clean up request dispatcher instrumentation ( #2724 )
2021-04-06 13:36:38 -07:00
Ago Allikmaa
7027006f66
Request handlers and test images for Tomcat 10 and Jetty 11 (Servlet API 5) ( #2703 )
...
* Tomcat 10 and Jetty 11 handlers with Servlet API 5
* Jetty 11 and Tomcat 10 Windows images
2021-04-05 09:45:02 -07:00
Ago Allikmaa
69c2644774
Servlet 5 API, reorganize servlet modules ( #2609 )
...
* Servlet 5.0 API support, refactored other servlet modules
* Include correct servlet instrumentation module for grails tests
* Reapply spotless after rebase
* Fix checkstyle
* Spotless
* Addressed PR suggestions
* Fixed files in wrong package.
* Fixed mixed up instrumentation names.
* Fixed incomplete instrumentation name.
* Addressed PR suggestions
* Addressed PR suggestions
2021-03-23 14:11:43 +02:00