95ec4a8c1f
HTTP semconv: filter out default peer/host ports ( #7258 )
...
After a loooong break, the next part of the HTTP semconv implementation:
filtering out default HTTP ports, client and server.
> [5]: If not default (80 for http scheme, 443 for https).
https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/http.md#http-client
2022-11-22 17:14:20 +00:00
a9e7eb1264
Fix CI ( #7138 )
...
Resolves #7139
2022-11-11 13:42:19 -08:00
77035fc88c
Extract `net.peer.{name,port}` on start for CLIENT spans ( #6828 )
...
The [HTTP
spec](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/trace/semantic_conventions/http.md#http-client )
says these two attributes must be provided at span creation time - I
think it makes sense to extend it over to all `net`-related
instrumentations, cause these are supposed to be the logical peer
name/port, which are supposed to be known before the connection is
started/exchange is made.
2022-10-10 16:00:19 -07:00
5184a523b6
Add test for null httpcontext ( #6823 )
...
follow-up to #6792
2022-10-07 12:39:50 +03:00
d9b25d34df
Guard against null HttpContext ( #6792 )
...
Resolves #6787
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-10-06 16:03:03 -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
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
6cd79b2a94
Deprecate the 2-arg variant of HttpCommonAttributesGeter#statusCode() ( #6466 )
...
* Deprecate the 2-arg variant of HttpCommonAttributesGeter#statusCode()
* fix liberty
2022-08-12 17:11:11 -07: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
5a152cd289
Deprecate uncompressed content length HTTP attributes ( #6383 )
2022-07-29 06:17:38 +02:00
82b39b1012
Rename `newInstrumenter()` into `buildInstrumenter()` ( #6363 )
...
* Rename newInstrumenter() into buildInstrumenter()
* spotless
2022-07-25 12:02:46 -07:00
3af56e7d22
InstrumentationConfig part 3: HTTP headers and peer service mappings ( #6302 )
2022-07-15 14:52:52 -07:00
87b412fb40
Instrumentation API changes: OperationMetrics, OperationListener ( #6016 )
...
* Instrumentation API changes: OperationMetrics, OperationListener
* errorprone
2022-05-12 11:16:46 -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
13a851ba24
Apache httpasyncclient 5.x ( #5697 )
...
* Copies code for httpasyncclient-4.1 and creates instrumentation for 5.0
* Makes import changes for http client 5
* Decorate request channel and changes type in tests
* Corrects test cases
* Corrects most of the test cases
* Forces http1 protocol to pass the test cases
* Merge supported libraries for async client
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* Remove http.sceme and http.target attr from test
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* Removes not needed null check for status code
* Replaces slf4j loggers with JUL
* Inlined flavor extraction in attributes getter
* Uses parameter placeholders for logging
* Uses success endpoint to test flavor
* Merges httpasyncclient and httpclient modules
* Merges http client 5 modules
* Update java-8 compatible changes
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* Change instrumentation name
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
* Adds missing import statement
* Rename packages
* Java 8
* Reverts adding 5.0+ support from supporting libraries
* Deleted hanging module
* Uses seconds instead of ms in http test
* Merges both classic and async client implementations
* Moves http client all test cases to java tests
* Uses abstract apache test class and moves boilerplate
* Uses connection and read timeouts from ApacheHttpClientTest
* Refactors remaining classes, shifts logic to HttpUtils
* Renames HttpUtils to ApacheHttpClientUtils
* Corrects failing code style error
* Corrects build errors
* Renames package to have http client version
* Corrects package name
* Uses instrumenter as static import
* Inline utility methods
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-04-07 08:45:06 -07:00
56f65e4fab
Convert all logging statements from slf4j to jul - part 1 ( #5628 )
...
* Convert all logging statements from slf4j to jul - part 1
* fix tests
* use placeholders
* fixed all comments, added static imports for Level
2022-03-22 10:35:27 -07:00
8b767ac435
Refactor HTTP attributes extractors to use composition over inheritance ( #5267 )
...
* Refactor HTTP attributes extractors to use composition over inheritance
* Rename remaining variables: *Extractor to *Getter
2022-01-31 09:25:27 -08:00
c5c0a2bcdf
NetClientAttributesAdapter - favor composition over inheritance ( #5030 )
...
* first pass at separating NetAttributesAdapter interface and make NetClientAttributesExtractor concrete
* rename the implementations extractor -> adapter
* hide constructor and make factory method
* rename to client and add javadoc
* spotless
* finish javadoc thought
* rebase
* renamed NetClientAttributesAdapter to NetClientAttributesGetter
* fix lettuce
* code review comments
* code review comments -- renaming for consistency
* adapter -> getter
* fix ratpack
* adapter -> getter
2022-01-20 10:51:13 -08:00
ec375116be
Fix more lint warnings ( #5174 )
...
* Fix more lint warnings
* Redisable lint
* Drift
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-01-20 12:48:46 +09:00
e7b8cca107
Convert TextMapSetters and TextMapGetters to enums ( #4522 )
...
* Convert TextMapSetters to enums
* Convert TextMapGetters to enums
2021-11-08 22:01:40 +02:00
bc7b125718
Fix IndexOutOfBounds in apache http clients ( #4575 )
...
* Fix IndexOutOfBounds in apache http clients
* aws test has an extra span now that http client instrumentation doesn't fail with execption
2021-11-03 09:36:41 -07:00
d314d76fce
rename `newBuilder()` to `builder()` ( #4475 )
...
* rename `newBuilder()` to `builder()`
* rename `newBuilder()` to `builder()`
2021-10-22 20:50:43 -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
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
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
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
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
8cbec715ff
Fill HTTP_CLIENT_IP in ServerInstrumenter ( #3756 )
2021-08-05 13:11:30 +09:00
8ecf709037
Fix Apache HttpClient host + absolute uri ( #3694 )
2021-07-29 08:35:14 -07:00
d305f3140b
Fix NPE in Apache HttpAsyncClient instrumentation ( #3692 )
...
* Fix NPE in Apache HttpAsyncClient instrumentation
* Fix Apache HttpClient host + absolute uri
* Add similar test for Apache HttpClient 5
* Better tests
* Sync with 4.0 and 4.3
* Fix
* sync
* Elasticsearch twist
* Remove so-called optimization path
2021-07-28 10:21:43 -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
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
9b56fc9051
Clean up AgentElementMatchers ( #3527 )
...
* Clean up AgentElementMatchers
* remove a TODO
* moved method
2021-07-09 10:02:21 +03: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
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
2f528e4166
Rename *Instrumenters to *Singletons ( #3335 )
2021-06-16 10:12:37 -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
f7a24b0e4b
Update asynchttpclient-2.0 to Instrumenter API ( #3211 )
...
* Update asynchttpclient-2.0 to Instrumenter API
* Fix play-2.4 tests
2021-06-11 12:41:25 -07:00
ac30b3c185
Add SuppressWarnings("unused") on Advice classes ( #3207 )
...
* Add SuppressWarnings unused on Advice classes
* And in doc
2021-06-07 16:00:21 +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
98b566959a
Make TypeInstrumentations top-level classes ( #3100 )
2021-05-27 13:27:28 -07:00
d755654c29
[WIP] Add peer.service to Instrumenter API ( #3050 )
...
* [WIP] Add peer.service to Instrumenter API
* Move PeerServiceAttributesExtractor to javaagent-api and use reflection to add it
* Finish PeerServiceAttributesExtractor
* Fix tests
* Add peer.service to apache-httpclient-5.0, jedis-1.4, lettuce-4.0
2021-05-25 15:31:41 +02:00
Mateusz Rzeszutek
Trask Stalnaker
jason plumb
Anurag Agarwal
Anuraag Agrawal
Nikita Salnikov-Tarnovski
Lauri Tulmin
Martin
Matthew Ho
Anuraag Agrawal