63a2383905
Split NetAttributesExtractor into NetClientAttributesExtractor and NetServerAttributesExtractor ( #4287 )
...
* Net Extractors
* Either request or response but not both
* Fix merge conflicts
* Separate by OnStart/OnEnd
* PeerServiceAttributes
* Fix test
* Restructure to client/server
* Fix merge conflict in main
* more
* peer.service
* Feedback
* peer.service is only for clients
* Fix merge conflict
* rename
* Armeria
* peer.service is only for clients
* rename
* WIP
* Sync Dubbo with Armeria
* More Dubbo and Armeria
* gRPC
* Revert some Dubbo changes
* more peer.service
* Fix test
* Fix merge
* Fixes
2021-10-07 15:40:15 -07:00
a48bd9de3f
Move PeerServiceAttributesExtractor from javaagent api to instrumentation api ( #4235 )
...
* Move PeerServiceAttributesExtractor from javaagent api to instrumentation api
* spotless
2021-10-06 12:42:55 -07:00
f80f4a9f63
Allow configuring captured HTTP headers in library instrumentations ( #4309 )
2021-10-06 13:32:39 +02:00
d3dbe415a1
Move HttpHeadersConfig methods back to instrumentation-api ( #4298 )
...
* Move HttpHeadersConfig methods back to instrumentation-api
* remove unnecessary method
2021-10-06 10:51:45 +02:00
7791be24e0
Remove implementations of host() and userAgent() in HTTP extractors ( #4299 )
...
* Remove implementations of host() and userAgent() in HTTP extractors
* fix broken headers copying
2021-10-05 10:25:45 -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
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
9ea33edf08
Remove attrs from http client attributes extractor ( #4210 )
...
* Remove scheme/host/target from HttpClientAttributesExtractor
* And jaxrs-client
* Remove unused methods
2021-09-28 12:58:42 -07:00
a277a8b636
Separate HTTP client/server AttributesExtractors ( #4195 )
2021-09-24 10:06:23 -07:00
b8391b1354
Remove the only two author tags ( #4129 )
...
* Remove the only two author tags
* Spotless
2021-09-15 09:42:04 -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
ab9c688e7a
Test nested CLIENT span suppression in library instrumentations ( #3970 )
2021-08-27 11:16:59 +02:00
f808090a4a
Enable kubernetes-client strict context check ( #3945 )
2021-08-25 09:32:56 -07:00
a923efc077
Strict context check on okhttp3 ( #3925 )
2021-08-24 09:43:34 -07:00
fa168268c5
Revert okhttp library instrumentation back to using standard reflection to support Android usage ( #3910 )
...
* Revert back to using standard reflection to support Android usage
* Add a comment about not using MethodHandles
2021-08-23 18:58:43 -07:00
3525733ea8
Enable strict context check in tests by default ( #3822 )
2021-08-23 17:40:02 -07:00
f89579a3ab
Convert okhttp-2.2 to instrumenter api ( #3852 )
...
* Convert okhttp-2.2 to instrumenter api
* Rephrase comment
2021-08-19 12:59:20 +03:00
6dbb64ec7a
Implement a Call.Factory for okhttp 3.x+ library instrumentation ( #3812 )
...
* Add a README for the okhttp library instrumentation.
* Create new instrumentation for okhttp3 4.x+
This exposes a `Call.Factory` which will properly handle internal context propagation when used with async callbacks.
* update the "4.x" instrumentation to support 3.x
* Get rid of the 4.x instrumentation, and just update the 3.x instrumentation to work
* updates from PR review
* replace old reflection with method handle usage
* Apply suggestions from code review
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-08-18 12:16:24 +09:00
8cbec715ff
Fill HTTP_CLIENT_IP in ServerInstrumenter ( #3756 )
2021-08-05 13:11:30 +09:00
ba4db4801f
Clean up concurrent advice utilities in javaagent-instrumentation-api ( #3757 )
...
* Clean up concurrent advice utilities in javaagent-instrumentation-api
* fix classloading tests
2021-08-03 09:17:19 -07: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
b483d7d249
Fix concurrency with callback test on okhttp3 latest ( #3676 )
2021-07-26 18:49:21 +03:00
26dc106399
Okhttp3: fix concurrency test with callback ( #3669 )
2021-07-26 13:12:29 +09:00
04c070ccc1
Add HTTPClientMetrics ( #3598 )
...
* Add HTTPClientMetrics
* Update instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpClientMetrics.java
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-07-16 18:22:35 +09:00
1d01475948
Use http 1.1 for okhttp3 tests ( #3565 )
2021-07-14 13:21:49 +03:00
71e7d666ed
Convert OkHttp 3 to Instrumenter API ( #3538 )
...
* Convert OkHttp 3 to Instrumenter API
* code review
* Update instrumentation/okhttp/okhttp-3.0/library/src/main/java/io/opentelemetry/instrumentation/okhttp/v3_0/OkHttpAttributesExtractor.java
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-07-13 18:41:19 -07: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
3cfa086ffd
Migrate nullaway config to plugin ( #3462 )
2021-07-01 18:13:16 +09: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
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
02098b9353
Ignore task classes using IgnoredTypesConfigurer ( #3380 )
2021-06-23 10:15:02 -07: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
224dc51e93
Migrate java.gradle to conventions plugin ( #3289 )
...
* Migrate java.gradle to convention plugin.
* Switch to java-conventions
* Remove old file
* Fix
* Fix merge
* Missing paragraph
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-06-15 08:10:39 +09: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
d4e64990fc
Add http client concurrency test with callback ( #3192 )
...
* Add http client concurreny test with callback
* Unwrap subscriber for needs executor tests
2021-06-07 12:29:08 -07:00
c1c052318b
Move more type instrumentations to top-level classes ( #3118 )
2021-05-28 17:24:19 -07:00
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
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
d1b9413d88
Use configured NetPeerAttributes in OkHttp3 client tracer ( #3063 )
...
This will make it notice the peer-service-mapping settings to set peer.service span attribute
I know this approach is deprecated but I hope to follow this up with another change to use the
new Instrumenter API.
#3009
2021-05-23 09:29:18 +03: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
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
23dca77428
Instrument okhttp builder constructor instead of client ( #2946 )
...
* Instrument okhttp builder constructor instead of client
* Comment
2021-05-11 12:08:41 +09:00
9c7fae3b04
Extract javaagent-extension-api from tooling & spi ( #2879 )
2021-05-06 23:30:25 -07:00
2ab92f556e
Fix duplicate http client tracing headers ( #2842 )
...
* Fix duplicate spring webclient tracing headers
* Fix Akka Http
* Fix Armeria
* Fix Java 11 Http Client
* Fix OkHttp 2.2
* Fix PlayWS
2021-04-23 13:05:10 -07:00
9464134ffd
Test failing async http request ( #2812 )
2021-04-19 14:11:27 -07:00
9bd028f767
Remove unnecessary genericness ( #2797 )
2021-04-14 00:01:28 -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
fbba3001ee
Test callbacks for okhttp library instrumentation ( #2752 )
2021-04-08 14:20:32 -07:00
d8f6018ba6
Split HttpClientTest execution methods for sync and callback ( #2675 )
2021-04-06 15:26:01 -07:00
6ea316e22e
Remove timeout annotations ( #2725 )
2021-04-06 16:36:18 +09:00
1406855bb7
Revert "Prevent duplicate telemetry when using both library and auto instrumentation ( #2661 )" ( #2689 )
2021-04-01 16:11:15 -07:00
30434696ae
Prevent duplicate telemetry when using both library and auto instrumentation ( #2661 )
...
* Prevent duplicate telemetry when using both library and auto instrumentation
* Add unit test
* Fix Oshi tests
* Fix couchbase 3.1 tests
2021-03-31 10:57:04 -07:00
0d11dbe565
Fix webflux client filter subscribe ( #2646 )
...
* Fix webflux client filter subscribe
* Add test
* Fix test
* Fix test, take 2
* Fix another test
* Suppress test for another module
* Suppress another library instrumentation
* Another
* Add nested client suppression in Armeria
* Add comments
* Revert extra line
2021-03-31 07:54:41 +03:00
dcd316da7a
Enable strict context check and fix some context issues. ( #2637 )
...
* Enable strict context check and fix some context issues.
* Drift
* Drift and cache
* Exclude grizzly include akka
* Grizzly, scala
* ForkJoin worker
* webflux comment, grizzly typo
* Give up on akka for now
* threadpool
* Fallback on grizzly, wait for completion in executor cancellation tests
* Hystrix
* ratpack
* Cleanups
2021-03-29 08:08:11 +03:00
ae23b97ec4
Move and rename NetPeerUtils ( #2548 )
...
* Move and rename NetPeerUtils
* Rename NetPeerUtils to NetPeerAttributes; inject instance instead of using a global var
* Rename SpanAttributeSetter to AttributeSetter (might be used to set on AttributesBuilder in the future, who knows)
* Deprecate default BaseTracer constructor: library instrumentations are supposed to inject all dependencies, the javaagent should explicitly pass globals
* fix compilation failure
* Remove peer.service customization from library instrumentation
2021-03-16 13:50:19 +01:00
41fec5f610
Extract okhttp3 library instrumentation. ( #2489 )
...
* Extract okhttp3 library instrumentation.
* bad spotless
2021-03-05 09:35:35 +09:00
62f2611486
Update instrumentation names ( #2433 )
2021-03-01 19:34:25 -08:00
000df967ce
Update to SDK 0.17.0 ( #2338 )
...
* Update to SDK 0.17.0
* Finish
* ottrace
2021-02-19 15:51:55 +09:00
ee090aee1e
Support library instrumentations with HttpServerTest & HttpClientTest ( #2299 )
2021-02-16 09:05:23 -08:00
e9a4b952dd
Add causality test with multiple concurrent requests ( #2156 )
...
* Add causality test with multiple concurrent requests
* Include support for Reactor Netty 1.0 into README.md
* Fix muzzle conf
* Fix muzzle and version constraints
* More strict causality check
* Better muzzle config
* Fixing muzzle
* Fixing deps
* Better library
* Better naming
2021-02-05 12:39:42 +02:00
32c34de593
Disable retry on connection failure for okhttp tests ( #2154 )
2021-02-02 19:34:49 +09:00
640a7d624b
Correct some spelling mistakes ( #2025 )
2021-01-12 11:10:45 -08:00
8d74baa2e4
Run tests with javaagent. ( #1643 )
...
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-01-04 13:13:24 -08:00
65f54e450b
Use Context more in HttpClientTracer ( #1811 )
...
* Use Context more in HttpClientTracer
* Better http-url-connection response object
* Follow database semantic conv for elasticsearch-rest
* Remove unnecessary CallDepth tracking
2020-12-03 11:47:08 -08:00
26f254b10d
Create javaagent dirs for all instrumentations, part 2 ( #1794 )
2020-11-28 22:26:49 -08:00
5f263644da
Create javaagent dirs for all instrumentations ( #1668 )
...
* Create javaagent dirs for all instrumentation
* Add note about kotlin coroutine library instrumentation
* Feedback
2020-11-28 21:04:16 -08:00
9a64a628ea
Make instrumentations non final ( #1752 )
...
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-11-26 11:22:25 -08:00
50c8ab499d
Remove no longer needed helperClassNames() methods ( #1755 )
2020-11-24 20:50:32 -08:00
cecdfc2cd0
Update instrumentation names to be consistent ( #1671 )
...
* Update instrumentation names to be consistent
* Remove amqp from rabbitmq package name
2020-11-18 19:53:31 -08:00
1a23ac3027
Standardize instrumentation names in InstrumentationModules ( #1648 )
...
* Standardize instrumentation names in InstrumentationModules
* rename gradle modules:
* vertx-3.0 to vertx-web-3.0
* spark-web-framework-2.3 to spark-2.3
* add JavaDoc describing the naming rules to InstrumentationModule
2020-11-17 13:30:28 -08:00
7f36dd1617
Refactor Instrumenters into InstrumentationModules - N, O, P ( #1575 )
2020-11-09 14:42:16 -08:00
d3b60a5e33
Rename TRACER to tracer() ( #1540 )
2020-11-02 20:49:51 -08:00
c6eee70660
Update to latest snapshot. ( #1524 )
2020-10-29 18:54:09 -07:00
54a85f7501
More test fixes ( #1495 )
2020-10-27 16:56:39 +02:00
9e8d663ba4
Remove apache httpclient version ( #1446 )
...
* Remove version from `apache-httpclient` instrumentation
Fixes : #1260
* Remove version from all instrumentation names and add instrumentation name to `spring-web`
Fixes : #1260
2020-10-22 14:22:44 +09:00
1b51d4a6b1
Rename packages ( #1367 )
2020-10-11 13:54:35 -07:00
dadaac9a8c
Use 2-line license header to match SDK repo ( #1321 )
...
* Use 2-line license header to match SDK repo
* Apply change
2020-10-05 14:29:56 +09:00
bc98955176
Update to latest otel-java snapshot ( #1057 )
...
* Update to latest otel-java snapshot
* Upgrade to working otel-java snapshot
* Update to latest otel-java snapshot
* Update to latest otel-java snapshot
2020-08-26 22:03:28 +03:00
282859c963
Remove some unnecessary dependencies ( #1052 )
2020-08-19 21:51:59 -07:00
269b3575ef
Format gradle files ( #1070 )
2020-08-19 19:05:45 -07:00
5d2ae07797
Use startScope() on all HttpClientTracers ( #971 )
2020-08-18 16:59:30 -07:00
bbfdbb39c0
Create abstraction for library dependencies for instrumentation. ( #977 )
...
* Create abstraction for library dependencies for instrumentation.
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-08-19 08:57:31 +09:00
7159d04b8d
Change groovy import order ( #1013 )
...
* Update docs
* Format all groovy code
* Organize imports
2020-08-15 23:19:27 -07:00
414213f2d1
Remove final from parameters ( #1003 )
2020-08-15 22:35:51 -07:00
f893ca540b
Scripted package renaming ( #988 )
2020-08-15 21:55:01 -07:00
bb235a0aa3
Update package name for tracers ( #991 )
2020-08-14 21:07:18 -07:00
7818e33178
Package renaming ( #970 )
2020-08-13 20:14:46 -07:00
bf9c160570
Rename javaagent modules ( #952 )
2020-08-12 22:50:14 -07:00
b5fbf90977
Extract instrumentation api module ( #884 )
2020-08-09 22:52:33 -07:00
1fcb807590
Refactor HttpClient typed Decorators to Tracers ( #893 )
...
* initial work
* Change OkHttp decorators to tracers
* Change AkkaHttpClient decorator to tracer
* Change ClientDecorator to GrizzlyClientTracer
* Change NettyClientDecorator to Tracer
* Change netty3.8 client decorator to tracer
* Update netty4.1 client decorator to tracer
* Override startScope in child tracers when applicable
* Change KHttpDecorator to tracer
* Change HttpUrlConnectionDecorator to tracer
* Fix muzzle validation failure for grizzly client
* Fix a ratpack client test failure
* Address feedback
* Update delegate for setPeer
* Remove nested try
* Remove unnecessary null check
* Remove asserts
* Add a comment for overriding startSpan(String spanName)
* Remove an irrelevant comment
* Throw an exception when getSetter is null
* Change onPeerConnection to static
* Change getSetter() to be abstract
2020-08-06 17:14:19 -07:00
86c438b154
Remove final from local variables ( #732 )
...
* Remove final from local variables
2020-07-20 13:53:34 +09:00
d8355c672d
Docs for writing new instrumentation... ( #652 )
...
* Docs for writing new instrumentation
2020-07-19 14:21:19 +09:00
f3421e91a0
Remove Lombok ( #672 )
...
* Gradle 6.5.1.
* Skip download javadoc and sources automatically in IntelliJ IDEA.
* Added mavenLocal to repositories.
* Removed Lombok usage.
* Removed duplicated idea config.
* Code format.
* Removed useless usage of Objects.requireNonNull.
* Use instanceof to comparing objects.
* Code format.
* Code format.
* Fixes after merge.
* Fixed sneakyThrow exception.
* Code format.
2020-07-18 15:52:55 +03:00
a62801649f
More fixes for Gradle warnings ( #643 )
...
* More gradle deprecation warnings fixed
* More gradle deprecation warnings fixed
* More fixes
* More fixes
Co-authored-by: Anuraag Agrawal <aanuraag@amazon.co.jp>
2020-07-07 15:02:07 +03:00
9a5954a8ff
#593 Remove HttpClientTest.READ_TIMEOUT_MS ( #635 )
...
Signed-off-by: Sergei Malafeev <sergei@malafeev.org>
2020-07-07 08:24:42 +03:00
1aae2bd7f0
Add extension point for HTTP client decorators to return headers gene… ( #623 )
...
* Add extension point for HTTP client decorators to return headers generically instead of only user agent.
2020-07-02 14:29:21 +09:00
874b157fe5
Newline between license and package. ( #581 )
2020-06-25 13:31:16 -07:00
9a52f6708e
Gradle dependencies cleanup ( #556 )
...
* Bootstrap fixed
* Tooling fixed
* Testing fixed
* All instrumentation tests pass
* All tests pass
* Fix test
* Muzzle workaround
* Muzzle fix
* Update instrumentation/trace-annotation/trace-annotation.gradle
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-06-24 12:01:14 +03:00
84d4e24989
Upgradle gradle to 6.5 ( DataDog/dd-trace-java#1589 )
2020-06-23 14:08:46 -07:00
918d3913e3
Populate user-agent in HTTP clients. ( #540 )
2020-06-22 21:13:12 -07:00
1b29184e7c
Make rootDir usage consistent ( DataDog/dd-trace-java#1518 )
2020-06-11 10:14:02 -07:00
5ecd8cb81e
Add instrumentation for okhttp 2.2+ ( DataDog/dd-trace-java#1402 )
2020-05-14 11:50:27 -07:00
Trask Stalnaker
Nikita Salnikov-Tarnovski
Mateusz Rzeszutek
Matthew Ho
Lauri Tulmin
John Watson
Anuraag Agrawal
Michael Bannister
Vadim Shaigorodskiy
Helen Y
Alexey Zhokhov
Sergei Malafeev
Nikolay Martynov
Tyler Benson