0070148b34
Snippet Injection Files Restructure ( #8701 )
2023-06-13 09:52:55 -07:00
40ed895517
Enable snippet changes ( #8689 )
2023-06-12 07:40:40 -07:00
4def59ef78
Fix flaky tomcat access log test ( #8634 )
2023-06-02 23:37:59 +03:00
39c96bc5cb
JavaScript Snippet Injection Support Servlet 5 ( #8569 )
...
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2023-05-31 14:47:53 -07:00
dbf71497d2
Fix snippet injection test ( #8390 )
2023-04-28 14:55:08 +02:00
c7bd3e4d6a
JavaScript Snippet Injection ( #7650 )
...
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2023-04-26 16:09:12 -07:00
e466dc439a
Add HttpServerResponseCustomizer support for Servlet and Jetty ( #8095 )
...
Add `HttpServerResponseCustomizer` support for Servlet 2.2/3.0/5.0 and
Jetty 8/11 instrumentations. Enabled testing for it in JaxRs tests as
well since those should now all be covered due to servlet
instrumentations. Fixed Jetty 11 test source set directory name.
Known limitation - response headers do not work on Jetty 8 for internal
exception pages caused by throwing an exception that is handled outside
of instrumentation scope, working around this would require an
additional instrumentation and/or keeping an expired `Context` instance
referenced by the response object. This does not appear to be an issue
on Jetty 11. Additionally, calling `ServletResponse#reset` can wipe
headers as well, for which there is no workaround (yet?) in this PR.
2023-03-23 12:01:07 +01:00
ea237e3a80
Update HTTP span name extractors ( #7730 )
...
Implements
https://github.com/open-telemetry/opentelemetry-specification/issues/2998
---------
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2023-02-14 07:40:05 -08:00
e526338fc3
Fix akka-http and tomcat10 latest dep tests ( #6766 )
...
Resolves
https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6760
Resolves
https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6759
2022-09-27 15:45:04 -07:00
f50f1fed3b
Fix instrumentation-api-semconv packages ( #6590 )
...
* Fix instrumentation-api-semconv packages
* Move test
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-09-12 14:51:27 -07:00
cfdbe758f2
Net attributes getters changes (in preparation for HTTP spec impl) ( #6503 )
...
* Net attributes getters changes: instrumentation-api-semconv changes
* Net attributes getters changes: getter implementations
* Net attributes getters changes: test fixes
* Remove net.sock.host.name
* code review comments
* default getter methods & getPeerSocketAddress() method name
* set authority in grpc earlier
2022-09-12 09:20:27 -07:00
08f013f9d6
Update gradle to 7.5.1 ( #6359 )
...
* Update gradle to 7.5
* Bump to 7.5.1
* gradle 7.5.1 with jdk17
* spotless
* one more --add-opens
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
2022-08-12 12:03:43 +02:00
68a9f20eb3
Enable PrivateConstructorForUtilityClass errorprone check ( #6427 )
...
* PrivateConstructorForUtilityClass
* Advice
* More advice
* More
* More advice
* More
* Spotless
* Fix
* Fix
* Fix
* A better solution
* Revert
* More
* Fix
* Spotless
* Fix
2022-08-10 11:30:22 +03:00
b2c90c79b5
Extract HTTP request & response content length from headers ( #6415 )
...
* Extract HTTP request & response content length from headers
* remove unused method
* fix camel tests
* fix google http client tests
* fix HttpUrlConnection tests
* fix k8s and jaxrs tests
* fix aws tests
* actually fix aws tests 🤞
* fix elasticsearch tests
* fix ratpack tests
* fix spring webflux tests
* fix vertx tests
* fix reactor netty tests
2022-08-05 10:55:47 -07:00
6a24080fe9
Add code attributes to several instrumentations ( #6365 )
...
* Add code attributes to several instrumentations
* fix servlet tests
* fix tests
* fix elasticsearch tests
* fix context bridge test
* fix rxjava tests
* fix spring webmvc tests
2022-07-27 09:37:01 +02:00
6a0ca530b7
Instrumentation API changes: VirtualField ( #6017 )
...
* Instrumentation API changes: VirtualField
* change class name in string constant
2022-05-12 11:17:24 -07:00
f43c92d244
Remove ResponseSingletons ( #5981 )
2022-05-05 08:38:55 -07:00
d919f84cf8
Merge javaagent-instrumentation-api into javaagent-extension-api ( #5936 )
...
* Merge javaagent-instrumentation-api into javaagent-extension-api
* remove some leftover references to javaagent-instrumentation-api
* add missing instrumentation-api to distro example
2022-04-28 20:11:15 -07:00
8d513f9099
Make tests provide expected exception instance instead of class ( #5540 )
...
* Make tests provide expected exception instance instead of class
* exception is optional
2022-03-11 14:24:03 +02:00
e9c1efece2
Update to Groovy 4 ( #5532 )
...
* Update to Groovy 4
* exclude spock from grails tests, update comment
* Update instrumentation/grails-3.0/javaagent/build.gradle.kts
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-03-09 15:07:41 -08:00
b3496381f1
Write http server tests in java ( #5501 )
...
* Write http server tests in java
* typo
* Apply suggestions from code review
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
* add comments
* address review comments
* use Predicate
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-03-08 14:21:59 -08:00
53a8b85f4c
Updates to http.server_name ( #5369 )
...
* Updates to http.server_name
* Tests
* fix
* armeria
* fix
* fix
* codenarc
2022-02-18 09:38:21 -08:00
022914139e
test latest deps cleanup ( #5269 )
...
* test latest deps cleanup
* Revert currently irrelevant change
* Update instrumentation/lettuce/lettuce-4.0/javaagent/build.gradle.kts
Co-authored-by: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
Co-authored-by: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
2022-02-01 09:49:07 -08:00
23b33adb0a
Auto-format groovy files in Intellij ( #5260 )
...
* Auto-format groovy files in Intellij
* A bit of clean up
2022-01-28 09:29:46 -08:00
9381d5a264
Expected server span name for null route should be HTTP GET ( #5197 )
2022-01-21 19:35:48 -08:00
540e4cfafb
Remove HttpServerTest#extraAttributes() method ( #5176 )
...
* Remove HttpServerTest#extraAttributes() method
* fix ktor tests
* fix ratpack and restlet tests
* fix servlet2 tests
* Fix webflux and vertx tests
2022-01-20 10:41:41 -08:00
872c6c7d80
Add `http.route` to the server span when `ServerSpanNaming` is updated ( #5086 )
...
* Add `http.route` to the server span when `ServerSpanNaming` is updated
* fix camel tests
* fix test compilation failure
* assert route in camel instrumentation
2022-01-14 13:52:06 -08:00
12c15b226f
Capture servlet request parameters at the end of the request ( #5019 )
...
* Capture servlet request parameters at the end of the request
* add comment
2022-01-06 12:02:42 -08:00
a65e9633ba
Refactor `ServerSpanNaming` (in preparation for `http.route`) ( #4852 )
...
* Refactor ServerSpanNaming (in preparation for http.route)
* fix tests
* Add ServerSpanNaming to all HTTP server instrumentations
* fix tests
2021-12-14 10:11:20 +01:00
075434c5bc
Move `AppServerBridge` and `MappingResolver` to `servlet-common:bootstrap` ( #4817 )
...
* Move AppServerBridge and MappingResolver to servlet-common:bootstrap
* Introduce additional gradle configuration for bootstrap libs
2021-12-07 10:20:33 +01:00
0dc410a2e3
Reorganize shared servlet code (intro to #4317 ) ( #4785 )
...
* Reorganize shared servlet code (intro to #4317 )
* Fix dropwizard tests
* fix compile error
2021-12-06 13:49:55 +01:00
61b0dd3698
Capture servlet request parameters ( #4703 )
...
* Capture servlet request parameters
* use concurrenthashmap for cache
2021-12-05 21:25:31 -08:00
bbb571792a
Try to make tomcat async servlet exception test less flaky ( #4772 )
2021-12-02 08:31:30 -08:00
c53c8a0f01
Record exception for async servlet invocations ( #4677 )
...
* Record exception for asyn servlet invocations
* add back accidentally commented out line
* rearrange test so that it passes on both jetty and tomcat
2021-11-22 11:17:59 -08:00
5908cd31ed
Move constant away from deprecated class ( #4487 )
2021-10-25 12:19:58 +03:00
1dfd8654f6
Avoid logging servlet3 muzzle failure when running on servlet2 ( #4474 )
2021-10-22 22:57:53 +03:00
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
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
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
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
b06c1f9018
Collect more attributes from servlet instrumenter ( #4356 )
...
* Collect more attributes from servlet instrumenter
* spotless
2021-10-12 10:58:47 -07:00
87038f2899
Fix call depth ( #4338 )
2021-10-11 10:42:20 +03:00
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
478f936d54
Retry strict context check failures ( #4282 )
2021-10-08 10:47:52 -07:00
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
c421b66d56
Remove unnecessary VirtualField#setIfNull() method ( #4262 )
2021-10-02 13:17:48 -07:00
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
8e54d540bb
Convert liberty instrumentation to instrumenter api ( #4205 )
...
* Convert liberty instrumentation to instrumenter api
* review comment
2021-09-28 09:22:55 -07:00
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
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
siyuniu-ms
Lauri Tulmin
Ago Allikmaa
Mateusz Rzeszutek
Trask Stalnaker
Lauri Tulmin
Nikita Salnikov-Tarnovski
jason plumb
Martin