Commit Graph

355 Commits

Author SHA1 Message Date
Lauri Tulmin bb887465f3
Fix shading aws propagator (#10669) 2024-02-26 07:56:27 -08:00
Steve Rao 3b15791d49
Modified UT method name from Spock to Java (#10601) 2024-02-20 19:01:02 +02:00
Jonas Kunz 980d8ea244
Allow multiple invokedynamic InstrumentationModules to share classloaders (#10015) 2024-02-02 15:35:54 +02:00
Lauri Tulmin b57c1a023b
Update semconv (#10272) 2024-01-30 17:10:35 +00:00
Thomas Duncan 1c1ca91643
Capture the SNS topic ARN under the 'messaging.destination.name' span attribute. (#10096) 2024-01-03 10:50:28 -08:00
Lauri Tulmin fa0914354e
Fix aws readme formatting (#10111) 2023-12-21 08:18:56 -08:00
Lauri Tulmin 37ca15b76f
Add http client response attributes to aws sqs process spans (#10074) 2023-12-14 08:07:54 -08:00
Lauri Tulmin c7fd4d4b1c
Implement forEach support for aws sqs tracing list (#10062) 2023-12-13 08:32:55 -08:00
Paurush Garg dac9bdd9b9
Null check for nullable response object (#10029) 2023-12-07 23:00:03 +02:00
renovate[bot] 0c05fd73ac
fix(deps): update jackson packages to v2.16.0 (#9875)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
2023-12-05 19:10:18 +02:00
Mateusz Rzeszutek 65ee9510f5
Rename the `instrumentation-api-semconv` module into `instrumentation-api-incubator` (#9985) 2023-12-04 08:28:10 +01:00
Mateusz Rzeszutek dc81aae72f
Move HTTP classes to instrumentation-api (#9977) 2023-12-01 12:04:06 +01:00
Mateusz Rzeszutek 280c1ea4c1
Enable stable HTTP semconv by default (#9925) 2023-11-28 10:43:51 -08:00
Lauri Tulmin 9d65926094
Remove latest dep limit for aws2 sqs test (#9902) 2023-11-21 13:50:55 +02:00
Lauri Tulmin 2bcae0b010
Fix flaky aws2 sqs test (#9888) 2023-11-16 07:58:23 -08:00
Lauri Tulmin a6be8ce0c4
Implement capturing message headers for aws2 sqs spans (#9842) 2023-11-15 13:24:57 -08:00
Lauri Tulmin 0b5615f9e6
Capture message id in aws1 sqs instrumentation (#9841) 2023-11-15 12:46:12 -08:00
Lauri Tulmin fa4234396e
Fix flaky aws1 test (#9849) 2023-11-13 17:58:31 +02:00
Lauri Tulmin 4a9b965b2f
Add process spans to aws2 sqs instrumentation (#9778) 2023-11-10 14:20:53 +02:00
Lauri Tulmin ff97f6cce8
Implement capturing message headers for aws1 sqs spans (#9824) 2023-11-09 16:18:05 +02:00
Lauri Tulmin b6c6521d64
Pin aws sqs version to fix latest dep tests (#9832) 2023-11-09 13:58:22 +01:00
Lauri Tulmin 23a6a3e2c0
Add process spans to aws-1 sqs instrumentation (#9796) 2023-11-07 08:25:50 -08:00
Lauri Tulmin 70e3962a87
Always set messaging operation (#9791) 2023-11-06 12:30:27 +02:00
Mateusz Rzeszutek b193ca00a1
Change `user_agent.original` from recommended to opt-in on HTTP client spans (#9776) 2023-10-30 17:20:10 +02:00
Lauri Tulmin 6719ba358e
Add messaging conventions to sqs spans (#9712) 2023-10-23 07:56:58 -07:00
Lauri Tulmin 3dbc301614
Generate only consumer span for sqs receive message (#9652) 2023-10-18 12:24:57 +03:00
Lauri Tulmin 6f0fd8e631
Suppress nested http client spans in aws2 instrumentation (#9634) 2023-10-10 09:21:30 +02:00
Ping Xiang 2724a87743
Enhance AWS SDK Instrumentation with Detailed HTTP Error Information (#9448) 2023-09-29 09:16:11 -07:00
Lauri Tulmin 7d2259742a
Transform inline advice to delegating advice and test indy modules (#9508) 2023-09-22 11:15:39 +03:00
Trask Stalnaker 3b77cc4b2d
Semconv 1.21 (#9408)
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
2023-09-13 19:20:23 +00:00
Lauri Tulmin a9d5acc745
Ignore aws sdk v2 presign requests (#9275) 2023-08-22 12:01:28 -07:00
Lauri Tulmin 04436a13b3
Don't log stack trace for expected exceptions (#9279) 2023-08-22 11:58:40 -07:00
Trask Stalnaker 67f91b8833
Update network.protocol.version 2.0 -> 2 and 3.0 -> 3 (#9145) 2023-08-13 10:01:47 -07:00
Mateusz Rzeszutek d81630331b
Make `HttpClientAttributesGetter` extend `NetClientAttributesGetter` (#9015) 2023-07-31 11:09:09 -07:00
Mateusz Rzeszutek 6e573289ae
Replace NetAttributes with SemanticAttributes (#8992) 2023-07-21 11:27:54 +02:00
Trask Stalnaker 2bdddafdc4
Apply Prettier to markdown files (#8968) 2023-07-19 12:22:35 -07:00
Raphael Philipe Mendes da Silva 57cfddcdd0
Fix http attributes of AWS SDK V2 instrumentation (#8931)
Signed-off-by: Raphael Silva <rapphil@gmail.com>
Co-authored-by: Jean Bisutti <jean.bisutti@gmail.com>
2023-07-12 10:58:46 -07:00
Lauri Tulmin 0607f0b6b8
Fix NPE in aws instrumentation on duplicate TracingExecutionInterceptor (#8896) 2023-07-08 15:05:24 +03:00
Christian Neumüller ba2f8d209f
aws-sdk-1.1: Copy SQS plugin/NoMuzzle approach from 2.2 (#8866)
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2023-07-06 13:17:13 +02:00
Christian Neumüller d9aac1679a
aws-sdk-2.2: SNS.Publish support with experimental messaging propagator flag (#8830) 2023-06-30 08:19:38 -07:00
Christian Neumüller a1f691798e
aws-sdk-2.2.: Support injection into SQS.SendMessageBatch message attributes (#8798)
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2023-06-29 07:55:11 -07:00
Christian Neumüller bb4211d0b7
Fix aws-sdk-2.2 library instrumentation crashing app when SQS is not on classpath (#8805) 2023-06-28 11:04:06 -07:00
Mateusz Rzeszutek 9e37e724dc
Fix the main branch history (#8817) 2023-06-28 10:55:41 +00:00
Lauri Tulmin fac22533f1
Fix context leak on call to AmazonS3.generatePresignedUrl (#8815) 2023-06-28 10:56:38 +02:00
Abhinandan Seshadri f25cd6354c
Convert spring rabbitmq tests from groovy to java (#8765)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
Co-authored-by: SylvainJuge <763082+SylvainJuge@users.noreply.github.com>
Co-authored-by: Christian Neumüller <christian.neumueller@dynatrace.com>
2023-06-28 10:51:27 +02:00
Christian Neumüller 3733094d5c
aws-sdk-2.2: More reflection cleanup. (#8775)
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2023-06-23 15:11:55 +02:00
Christian Neumüller 5b4e05a31e
aws-sdk: Use compile time reference+@NoMuzzle instead of reflection. (#8603)
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
2023-06-16 13:11:04 -07:00
Lauri Tulmin 7719a91734
Increase timeout for aws client timeout and retry errors not captured… (#8735) 2023-06-15 08:36:20 -07:00
Mateusz Rzeszutek cde2e70148
Implement new stable server semantic conventions (#8663) 2023-06-13 11:07:59 +02:00
Mateusz Rzeszutek 506ccb6b7d
Implement new stable network semantic conventions (#8616) 2023-06-12 16:51:47 +02:00
Mateusz Rzeszutek 5b03ae655f
Implement new stable HTTP semantic conventions (#8632) 2023-06-08 20:02:45 -07:00
Mateusz Rzeszutek 8ee63d4441
Implement new stable URL semantic conventions (#8491) 2023-06-05 15:22:22 +00:00
dependabot[bot] c60d0a2673
Bump com.diffplug.spotless:spotless-plugin-gradle from 6.18.0 to 6.19.0 (#8561)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
2023-05-24 12:23:07 -07:00
Christian Neumüller f98a97f671
aws-sdk-2.2: Support non-X-Ray propagation for SQS (#8405)
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2023-05-15 17:28:15 -07:00
Lauri Tulmin b370ed52e9
Pin localstack docker image version and fix vetx sql client latest dep test (#8483) 2023-05-12 06:40:25 -07:00
dependabot[bot] 3122897b2e
Bump errorProneVersion from 2.18.0 to 2.19.0 (#8459)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
2023-05-10 09:49:55 -07:00
Lauri Tulmin 897031c223
Fix aws sdk latest dep tests again (#8431) 2023-05-06 15:14:51 -07:00
Lauri Tulmin 83a4054fcc
Fix aws sdk latest dep tests (#8423) 2023-05-05 12:22:08 +02:00
Mateusz Rzeszutek e3944a53a5
Make net.transport an optional attribute (#8279) 2023-04-20 08:14:03 -07:00
OpenTelemetry Bot 22df5866b0
Update the OpenTelemetry SDK version to 1.25.0 (#8262)
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
2023-04-10 18:12:57 -07:00
Mateusz Rzeszutek f501569106
Switch from http.flavor to net.protocol.* in HTTP client instrumentat… (#8131) 2023-04-07 13:39:42 +02:00
Lauri Tulmin 856d521f0a
Update testcontainers and selenium (#8218) 2023-04-05 08:24:53 -07:00
Lauri Tulmin 402635bb64
Remove aws-sdk-2.2 latest dep restriction (#8207) 2023-04-04 10:03:19 +03:00
Lauri Tulmin 0638f983a6
Fix jfr metrics on openj9 and aws-sdk muzzle failure (#8157)
Resolves
https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/8156
Resolves
https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/8155
2023-03-29 10:49:17 +03:00
Lauri Tulmin b926165fe1
Fix NPE in aws 2 when request instrumentation is suppressed (#7953)
Resolves
https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/7903
2023-03-03 09:31:01 +02:00
Lauri Tulmin 13c7617be1
Convert aws-sdk tests to test suites (#7943)
Part of
https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/7911
2023-03-01 11:25:53 -08:00
Mateusz Rzeszutek e1895e548c
Rename all methods in all Getters to use the `get*()` naming scheme (#7619)
Resolves #6562

This PR only contains renames; the actual content is in the `*Getter`
interfaces, the rest of changes is just IntelliJ doing its job.
2023-01-23 09:28:11 +00:00
Mateusz Rzeszutek 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
jack-berg 94ba33e395
Use contrib AwsXrayPropagator (#7234)
Reflects move of `AwsXrayPropagator` to
[opentelemetry-java-contrib/aws-xray-propagator](https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-xray-propagator).
2022-11-21 11:31:17 -08:00
Trask Stalnaker 61ed2d14db
Update SDK version (#7223)
Resolves #7221 
Resolves #7222
2022-11-18 18:13:39 +00:00
Trask Stalnaker 597b2a5321
More spotless (#7126) 2022-11-11 05:01:21 +00:00
Trask Stalnaker 5345c87680
End groovy files with newline (#7127) 2022-11-10 12:21:55 +01:00
Lauri Tulmin 5c2c86c65d
Run aws-sdk tests against 2.18.x (#6956)
Resolves
https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/6945
2022-10-23 10:33:48 -07:00
Trask Stalnaker b2a4cf171f
Cap aws-sdk versions to fix testLatestDeps (#6944)
Opened issue #6945 to track removing the cap.

Resolves #6941 
Resolves #6943
2022-10-23 12:32:37 +03:00
Trask Stalnaker c18bea3b79
Revert "Temporary fix for testLatestDeps (#6904)" (#6922)
This reverts commit ceb6975d17.

Looks like this got sorted.
2022-10-20 13:06:58 +03:00
Trask Stalnaker ceb6975d17
Temporary fix for testLatestDeps (#6904)
Resolves #6903
2022-10-18 16:28:30 +02:00
Mateusz Rzeszutek 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
Trask Stalnaker 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
Trask Stalnaker 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
Mateusz Rzeszutek 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
Trask Stalnaker beabda6d96
Fix the build (#6445) 2022-08-08 17:39:06 -07:00
Trask Stalnaker f46ca5dfe0
Fix test latest deps (#6429) 2022-08-06 09:02:16 +02:00
Mateusz Rzeszutek 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
Mateusz Rzeszutek 5a152cd289
Deprecate uncompressed content length HTTP attributes (#6383) 2022-07-29 06:17:38 +02:00
Mateusz Rzeszutek 82b39b1012
Rename `newInstrumenter()` into `buildInstrumenter()` (#6363)
* Rename newInstrumenter() into buildInstrumenter()

* spotless
2022-07-25 12:02:46 -07:00
Mateusz Rzeszutek e7887ac929
Idea: deprecate `Config`, add agent-only `InstrumentationConfig` (#6264)
* Idea: deprecate Config, add agent-only InstrumentationConfig

* fix

* fix camel test

* fix external-annotation tests
2022-07-08 16:20:49 +02:00
Lauri Tulmin 6534dd4d51
Aws sdk2 sqs context propagation (#6199) 2022-07-01 09:24:45 -07:00
Mateusz Rzeszutek 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
Anuraag Agrawal 980746ae44
Update errorprone (#5776)
* Update errorprone

* Fix errorprone on java 17

* Fix oshi test

* Spot

* Fix merge
2022-04-11 12:48:16 -07:00
Mateusz Rzeszutek 50f91e6dee
Deprecate AttributesExtractor#set() method (#5749)
* Deprecate AttributesExtractor#set() method

* code review comments
2022-04-05 20:20:02 -07:00
Anuraag Agrawal 14372adb68
Migrate Guava tests to Java (#5668)
* Migrate Guava tests to Java

* Update instrumentation/guava-10.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/guava/ListenableFutureTest.java

Co-authored-by: Lauri Tulmin <tulmin@gmail.com>

* Workaround inline mock issue

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Lauri Tulmin <tulmin@gmail.com>
2022-03-24 14:14:09 +09:00
Anuraag Agrawal cd528e98fb
Rename library entrypoints to Telemetry (#5624)
* Rename library entrypoints to Telemetry

* Renames
2022-03-22 14:39:23 +09:00
Anuraag Agrawal 213057d057
Run check during testing and assemble during building (#5619) 2022-03-18 13:48:51 +09:00
Mateusz Rzeszutek 1ee60aa6e6
Split out RpcAttributesGetter (#5548)
* Split out RpcAttributesGetter

* code review comments

* go back to RpcAttributesGetter
2022-03-17 11:14:19 +01:00
Lauri Tulmin 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
Trask Stalnaker e058fa7810
Fix aws-core testLatestDeps (#5458)
* Fix aws-core testLatestDeps

* ooops
2022-02-27 21:07:27 -08:00
Lauri Tulmin 12e1134f57
Increase delay in attempt to fix flaky test in AbstractAws1ClientTest (#5441) 2022-02-24 08:38:16 -08:00
Lauri Tulmin fc5b0e9a02
Remove and ignore .attach_pid files (#5348) 2022-02-11 09:37:52 -08:00
Anuraag Agrawal 7e5fa5ee93
Add all AWS SDK api libraries referenced in testing to latestDepTest (#5280)
* Add all AWS SDK api libraries referenced in testing in latestDepTest

* Fix merge
2022-02-11 10:48:52 +09:00
Mateusz Rzeszutek 551418c283
Refactor AttributesExtractor so that it extracts route from Context (#5288)
* Refactor AttributesExtractor so that it extracts route from Context

* typo

* fix tests

* Update instrumentation-api/src/main/java/io/opentelemetry/instrumentation/api/instrumenter/http/HttpRouteHolder.java

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

* fix all AttributesExtractors

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2022-02-08 10:38:41 +01:00