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
5345c87680
End groovy files with newline ( #7127 )
2022-11-10 12:21:55 +01: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
429ecfc713
Update error prone ( #6646 )
...
(note that change from BDDMockito is due to
https://github.com/google/error-prone/issues/3396 )
2022-09-23 11:24:40 -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
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
a06f4b1e8e
fix NPE for commons-httpclient v3.1 ( #5944 ) ( #5949 )
...
* fix NPE for commons-httpclient v3.1 (#5944 )
* fix NPE for commons-httpclient v3.1 (#5944 ) - spotless fixes
* extracting abstract class with reused code (#5944 )
2022-04-28 20:19:52 -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
4e3f19d469
Enable span suppression by SpanKey by default ( #5779 )
...
* Enable span suppression by SpanKey by default
* fix HTTP tests (probably)
* add exception for camel
* remove suppression tests from @WithSpan instrumentations
* remove suppression tests from @WithSpan instrumentation; spring boot autoconfigure
* fix twilio tests
* fix netty-based HTTP clients, remove AWS SDK 1.11 unit test
* fix elasticsearch tests
* codenarc
* spotless
* fix AWS SDK 1.11 tests
* remove a TODO
* code review comments
* fix merge conflict
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-04-19 14:13:09 -07:00
333e7bbd50
Migrate apache-httpclient-4.3 tests to Java. ( #5774 )
...
* Migrate apache-httpclient-4.3 tests to Java.
* Spot
2022-04-08 15:04:23 +09: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
cd528e98fb
Rename library entrypoints to Telemetry ( #5624 )
...
* Rename library entrypoints to Telemetry
* Renames
2022-03-22 14:39:23 +09:00
27d5df11a6
Only set read timeout for requests to /read-timeout ( #5651 )
2022-03-21 13:54:36 +02:00
b0d5fc6b99
Remove deprecated methods from instrumentation-api and library instrumentations ( #5575 )
2022-03-15 09:33:48 +09: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
f6cca58f1f
Deprecate CapturedHttpHeaders and replace it with builder methods ( #5533 )
2022-03-09 12:21:32 -08:00
4a98dae431
Add builders for setting optional attributes on HTTP extractors ( #5347 )
...
* Add builders for setting optional attributes on HTTP extractors
* errorprone
* fix compilation failure
2022-03-08 17:21:14 +01: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
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
98d3f88ab8
Fix npe in apache http client 4.0 instrumentation ( #4913 )
2021-12-15 17:29:57 -08:00
b287c8d1d0
Enable read timeout test for some http clients ( #4702 )
...
* Enable read timeout test for some http clients
* remove unused import
* use separate client for read timeout request
2021-11-28 13:18:26 -08:00
9a4a68d836
Add Android API-friendliness checks ( #4505 )
...
* Add Android API-friendliness checks
* Improve comments
* Remove ignores
* Handle CompletionException
* Spotless
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-11-24 12:59:11 -08: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
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
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
a438e0d6ae
Enable concurrency test for apache http client 4.0 ( #4020 )
2021-08-30 09:05:51 -07:00
Mateusz Rzeszutek
Trask Stalnaker
jason plumb
Daniel Gradecak
Anuraag Agrawal
Anurag Agarwal
Lauri Tulmin
Lauri Tulmin
Nikita Salnikov-Tarnovski
Martin
Matthew Ho