d5aadbab04
Split out :instrumentation:netty:netty-4.1 library ( #6820 )
...
Resolves #6734 . Builds on #6811 .
2022-10-10 16:01:14 -07:00
1fcea2017b
Publish :instrumentation:netty:netty-4-common as library instrumentation ( #6811 )
...
Related to #6734 . Builds on #6805 .
I'll follow it up by splitting out `:instrumentation:netty:netty-4.1` in
a separate PR.
2022-10-06 08:50:25 -07:00
4c91ec9f42
Publish :instrumentation:netty:netty-common as library instrumentation ( #6805 )
...
Related to #6734 .
This first stage splits out the shared utilities in
`:instrumentation:netty:netty-common`. I'll follow it up by splitting
out `:instrumentation:netty:netty-4-common`,
`:instrumentation:netty:netty-4.1` in separate PRs. If there is
appetite, I can also split out library instrumentation for
`:instrumentation:netty:netty-4.0` and
`:instrumentation:netty:netty-3.8`, though I have no need for these.
2022-10-05 09:24:44 -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
b7cec3b115
Fix netty issue ( #6469 )
...
* Fix
* Comment
2022-08-18 11:19:24 -07:00
f1774cabe2
Update net semantic convention changes ( #6268 )
...
* New net conventions: option a
* Feedback + sock.family + sock.peer.name
* peer.service + tests
* server net attributes attempt 1
* server net attributes attempt 2
* Javadoc
* Revisions
* Apply to instrumentations
* Feedback
* One more default method
* Spotless
* Fix javadoc
2022-08-18 09:02:23 -07:00
7bbe918008
InstrumentationConfig part 2 ( #6292 )
2022-07-11 09:47:19 +02:00
81de0d8906
Don't wait for netty to shut down ( #6271 )
2022-07-06 13:00:27 -07:00
528360db8c
Update dependencies ( #6007 )
...
* Update dependencies
* Add maven to plugin repos
* Fix tests that fail with groovy 4.0.2 (#42 )
Co-authored-by: Lauri Tulmin <tulmin@gmail.com>
2022-05-17 14:12:36 -07: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
45d0518d69
Update netty 4 common package name ( #5991 )
2022-05-07 20:55:37 -07:00
cfe4a22307
Remove netty-4.1-common ( #5985 )
...
* Remove netty-4.1-common
* reactor-netty-1.0
2022-05-06 11:51:02 -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
e9fbb367b3
Rename netty `always-create-connect-span` property to `connection-tel… ( #5834 )
...
* Rename netty `always-create-connect-span` property to `connection-telemetry`
* formatting
* warn when deprecated property is used
* errorprone
2022-04-15 13:38:04 +02:00
213057d057
Run check during testing and assemble during building ( #5619 )
2022-03-18 13:48:51 +09: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
6d58704e76
Sort spans in Netty41ClientSslTest ( #5433 )
2022-02-24 13:02:40 +02:00
8c6cd97cc7
Sort netty RESOLVE, CONNECT and SSL handshake spans ( #5394 )
2022-02-17 20:20:08 -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
9381d5a264
Expected server span name for null route should be HTTP GET ( #5197 )
2022-01-21 19:35:48 -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
f6bcd76219
Update errorprone ( #5016 )
...
* Update errorprone
* gwt
* Remove unnecessary final
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-01-06 14:21:56 -08:00
98034e93c6
Remove pinned netty test latest dep version ( #4896 )
...
This reverts commit be7bc243de
2021-12-14 11:25:05 +02:00
be7bc243de
Skip problem netty version ( #4860 )
2021-12-10 09:28:12 +01:00
6b6b22de96
Update Armeria for testing ( #4730 )
...
* Update Armeria for testing
* Fix aws sdk and netty tests for armeria update (#4841 )
* Fix aws sdk tests for armeria update
* fix flaky aws11 test
* send path instread of full uri
* send path instread of full uri
* fix flaky aws11 test
* fix netty tests
* spotless
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
2021-12-09 08:53:56 +09:00
ce4cef76f9
Clean up groovy assertions ( #4805 )
2021-12-05 23:23:58 -08:00
cd119f491d
Trace DNS resolution in reactor-netty ( #4627 )
...
* Trace DNS resolution in reactor-netty
* Code review comments
* removed a little too much
* implementation -> api
* revert and make muzzle happy
2021-11-16 08:34:27 +01:00
d53c276b96
Ensure that netty 4.0 instrumentation is not applied to 4.1 ( #4626 )
...
* Enusre that netty 4.0 instrumentation is not applied to 4.1
* formatting
* cross test netty instrumentation
2021-11-11 08:38:56 -08:00
4719e4cc79
Trace SSL handshakes in netty 4.1 ( #4604 )
...
* Trace SSL handshakes in netty 4.1
* Update testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/HttpClientTestServer.java
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
* remove unneeded bit of code
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-11-10 13:43:59 -08:00
958f1c039c
Trace DNS resolution in Netty 4.1 ( #4587 )
...
* Trace DNS resolution in Netty 4.1
* Fix reactor-netty 0.9 tests
* Update instrumentation/netty/netty-4.1/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/v4_1/client/InstrumentedAddressResolverGroup.java
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-11-05 11:37:54 -07:00
e9ba87d6b3
Migrate Netty 3.8 CONNECT instrumentation to Instrumenter API ( #4492 )
...
* Migrate Netty 3.8 CONNECT instrumentation to Instrumenter API
* Move shouldStart()
2021-10-26 17:28:31 +02:00
25f6864602
Migrate reactor-netty CONNECT instrumentation to Instrumenter API ( #4493 )
2021-10-25 13:43:30 -07:00
413d7d1fa6
Migrate Netty 4.x CONNECT instrumentation to Instrumenter API ( #4461 )
2021-10-25 12:44:20 +02: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
2e97a4d3d5
Netty: preserve caught exception in the context instead of calling end() ( #4413 )
2021-10-19 13:40:11 -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
ac479d4b34
Migrate Netty 4.x client instrumentations (except CONNECT) to Instrum… ( #4381 )
...
* Migrate Netty 4.x client instrumentations (except CONNECT) to Instrumenter API
* Revert testReadTimeout changes
2021-10-15 17:06:02 -07:00
2904578875
Test HTTP headers capturing on Netty-based server frameworks ( #4395 )
...
* Test HTTP headers capturing on Netty-based server frameworks
* fix vertx circuit breaker tests
* fix play async tests
2021-10-15 12:30:24 -07:00
25bfb49b80
Migrate Netty 4.x server instrumentations to Instrumenter API ( #4342 )
...
* Migrate Netty 4.x server instrumentations to Instrumenter API
* fix vertx tests
* codenarc
* code review comments
* fix broken assertion
* Update instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/server/NettyServerInstrumenterFactory.java
Co-authored-by: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
2021-10-13 15:32:24 +02: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
dafc97f96e
Simplify gradle files ( #4292 )
2021-10-04 21:53:35 -07:00
92394ad9ae
Remove url from HttpServerAttributesExtractor ( #4209 )
...
* Remove url from HttpServerAttributesExtractor
* Remove UriBuilder
* Tracers too
* apache-camel
* Finatra
* jsp
* Ratpack
* Ratpack library
* Ratpack
* Spark
* Feedback
* Fix Undertow
* Vertx
* vertx-web
* play-2.4
* webflux
* jaxrs
* Spotless
* Update semantic-conventions.md
* Update smoke tests
* More realistic target
* Remove outdated doc
* Wording
2021-10-03 09:17:23 -07: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
3bc0e07c60
#4056 remove oringin handler when removelast in netty ( #4123 )
...
* removelast
* removelast
* addAfter and removeLast
* addAfter and removeLast
* addAfter and removeLast
2021-09-17 13:23:20 -07:00
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
23fc4ce443
Fix memleak in the Netty ChannelPipeline instrumentation ( #4053 )
2021-09-07 14:16:08 -07:00
58d640a373
Fix netty strict context checks ( #4002 )
...
* Fix netty strict context leaks
* And netty-4.0
* ClassValue and more
2021-08-30 09:02:16 -07:00
20c72f3e98
Format kotlin gradle files ( #3942 )
...
* Add ktlint for kotlinGradle
* ktlint fails on wildcard imports
* Auto-format kotlin gradle files
2021-08-25 13:43:57 +09:00
1889c1adfb
Limit netty exception capture to netty spans ( #3809 )
...
* Limit Netty exception capture to Netty span
* Rename constant
* Fix var name
* Apply to netty-4.0 also
2021-08-10 20:58:37 -07:00
77dc1ecf27
Fix warning in build scripts ( #3739 )
2021-08-02 19:37:35 +03:00
a04a7a6b72
Add option to create span on new netty connection ( #3707 )
...
* Create span on new netty connection
* add test for connection failure
* add comment
* remove commented out line
* rebase
* test fix
* review comments
* keep connection failure span as client span
2021-07-30 11:32:53 +03:00
47be4a16b4
Convert HttpClientTest to JUnit ( #3652 )
...
* Migrate HttpClientTest to junit to allow both Java or spock tests.
* More
* Update
* Finish
* Cleanup
* Better stack
* Java 15
* Merge
* Fix name
* Cleanup
* ? extends
* Moar
2021-07-27 21:55:40 +09:00
4db7bd5ff3
Move common code from netty 4.0 and 4.1 http client to common superclass ( #3660 )
2021-07-26 11:15:13 +09:00
1b5df6d78a
Netty connection failure handling ( #3569 )
...
* Netty connection failure handling
* Update instrumentation/netty/netty-4-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/netty/common/client/AbstractNettyHttpClientTracer.java
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* Remove unused import
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2021-07-23 11:21:15 +03:00
1197480f6e
Netty4: handle read timeout ( #3613 )
...
* Netty4: handle read timeout
* spotless
2021-07-21 21:20:21 +03:00
f5ce4c03f8
Inline basic usages of basicSpan ( #3583 )
...
* Inline basic usages of basicSpan
* spock
2021-07-18 21:15:51 +03:00
d3b62de8a5
Replace most uses of TraceUtils with testRunner runWithSpan. ( #3582 )
2021-07-15 10:30:34 -07:00
9b56fc9051
Clean up AgentElementMatchers ( #3527 )
...
* Clean up AgentElementMatchers
* remove a TODO
* moved method
2021-07-09 10:02:21 +03:00
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
b9fcb6b498
Reduce CallDepth classes' API surface ( #3497 )
2021-07-06 09:24:19 +02:00
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
761b9c280b
Migrate instrumentation gradle files to kotlin ( #3414 )
...
* Migrate instrumentation gradle files to kotlin
* Convert
* Muzzle
2021-06-28 17:27:12 +09:00
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
bcb282a220
Conform to google style guide checkstyle ( #3399 )
2021-06-24 10:53:23 +03:00
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
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
b7bfbf0cc6
Migrate instrumentation-library / common to plugins ( #3320 )
2021-06-15 11:54:48 -07:00
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
80a7403763
Remove insecure trust manager from test ( #3268 )
2021-06-12 12:03:46 +03:00
de7eaa0fe6
Enable https tests ( #3258 )
2021-06-11 17:16:34 -07:00
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
e93ff4d419
Remove references to dropped request test ( #3238 )
2021-06-10 16:21:11 +03:00
f51bace1eb
Netty connection failure span only when first operation fails ( #3228 )
2021-06-09 17:24:02 +09:00
7ae23fc694
Migrate HttpClientTest test server to Armeria ( #3225 )
...
* Use Armeria for test HTTP server.
* Continue
* Migrate test http server to Armeria.
* Finish
* Use junit extension
* Remove unused.
* Use localhost for net peer name.
* Block for full response in recator-netty tests.
* Handle split responses in netty41 and akka
* Typo
2021-06-09 15:05:58 +09:00
cefaecab3f
Use more efficient namedOneOf where possible ( #3200 )
...
* Use more efficient namedOneOf where possible
* Fix - hasClassesNamed does and not or
2021-06-07 11:41:34 +09:00
de2bdb80b4
Fix netty muzzle ( #3191 )
2021-06-04 11:00:01 -07:00
0ad8c1b8ce
Manage Netty transitive dependencies ( #3165 )
...
* Manage transitive Netty versions.
* Finish
* .each to not apply resolutions to muzzle
* Exclude epoll from finatra muzzle
2021-06-03 13:12:32 +09:00
e1762677da
Refactor HttpClientTest ( #3159 )
...
* Remove unused extraClientSpans() method
* Merge extraAttributes() and hasClientSpanHttpAttributes(uri) into
httpAttributes(uri): this will allow to choose extracted attributes
per URI (for example, OkHttp won't set flavor on connection exception
once it's rewritten to Instrumenter)
2021-06-03 10:54:01 +09:00
53cfd73bb3
Enable excluding muzzle dependencies and exclude netty-tcnative ( #3169 )
...
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2021-06-02 09:42:56 -04:00
c3dedbb64e
Enable all errorprone checks ( #3155 )
...
* Enable all errorprone checks
* Fixes
* Finish
* Finish
* Add flag to disable error prone
2021-06-01 17:41:08 +09:00
e16cf3001f
Add attributes to netty connection failure span ( #3115 )
2021-05-28 15:01:10 -07:00
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
119697b131
Share some code between netty 4.0 and 4.1 instrumentation ( #3048 )
2021-05-20 14:32:37 -07:00
23a40d926c
Netty4.1: remove our handler when original handler is removed ( #3026 )
...
* Netty4.1: remove our handler when orignal handler is removed
* Update instrumentation/netty/netty-4.1/javaagent/src/test/groovy/ChannelPipelineTest.groovy
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* disable epoll to see whether it makes any difference
* fix netty with epoll/kqueue native library
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2021-05-19 10:01:56 -07:00
87bc1c69dc
Exclude failing netty version from muzzle ( #3038 )
2021-05-19 09:53:09 -07:00
d1946f6774
Don't use type annotation style ( #3023 )
2021-05-18 10:23:09 -07:00
bb8f515083
Refactor TypeInstrumentation#transformers() method ( #3019 )
...
* Refactor TypeInstrumentation#transformers() method part 1
Add TypeInstrumentation and its implementations
* Refactor TypeInstrumentation#transformers() method part 2
Use the new method in all existing TypeInstrumentation implementations
* Drift
* Spotless
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-05-18 09:50:26 +02:00
b4b102dbec
Enable http client connection failure tests ( #2998 )
2021-05-17 12:15:48 -07:00
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
cd3dd581f9
Fix some remote connection tests ( #2933 )
2021-05-10 12:19:39 +09:00
9c7fae3b04
Extract javaagent-extension-api from tooling & spi ( #2879 )
2021-05-06 23:30:25 -07:00
56d7fd3516
Expose correct Context.current() in reactive-netty callbacks ( #2850 )
2021-04-29 12:29:36 -07:00
77f8be8add
Fix netty 4.1 instrumentation not removing future listeners ( #2851 )
...
* Fix netty 4.1 instrumentation not removing future listeners
* Code review follow-up
* Use InstrumentationContext
2021-04-27 11:22:52 +03:00
8ded533f52
Add another missing Unroll annotation ( #2829 )
2021-04-20 12:40:37 -07:00
9464134ffd
Test failing async http request ( #2812 )
2021-04-19 14:11:27 -07:00
bd829a6494
Remove duplicate status verification ( #2710 )
2021-04-19 11:41:37 -07:00
b922b3ece9
Remove the netty connection interference test ( #2765 )
2021-04-12 13:55:00 -07:00
3bc058b10b
Don't create duplicate headers ( #2727 )
...
* Test infra
* Update examples
* Update instrumentation
* Update tests
* jaxrs-client fixes
* Remove doRequest/doReusedRequest
* Fix muzzle
* some fixes
* fix test
* doc
* not private
* Apply to doRequestWithCallback also
* Update doc
* groovy
* better
* Don't hardcode traceparent
* Reuse request in SpringRestTemplateTest
2021-04-12 12:21:16 +03:00
jack-berg
Mateusz Rzeszutek
Trask Stalnaker
Lauri Tulmin
Anuraag Agrawal
Martin
YuDong Tang
Matthew Ho
Anuraag Agrawal
Ago Allikmaa