Commit Graph

249 Commits

Author SHA1 Message Date
Trask Stalnaker 2d79e6a6ef
Upgrade all gradle wrappers (#4107)
* Upgrade all gradle wrappers

* Add doc
2021-09-13 16:16:10 +09:00
Matthew Ho 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
Trask Stalnaker c13eb7932e
Update collector port (#4071) 2021-09-08 18:18:05 -07:00
Trask Stalnaker d52d5d6f8b
Bump smoke test timeout (#4033) 2021-08-31 09:48:25 -07:00
Trask Stalnaker ecde2c7940
Fix smoke tests on windows (#4011)
* Revert "Use --no-daemon on windows builds (#4000)"

This reverts commit c13063b5ea.

* Fix sporadic smoke test failure on Windows
2021-08-29 21:15:20 -07:00
Trask Stalnaker 99de444ffc
Remove zipkin from otel collector smoke test config (#3953)
* Remove zipkin from otel collector smoke test config

* Smoke tests too
2021-08-25 12:17:23 -07:00
Trask Stalnaker 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
Mateusz Rzeszutek 6ba91989a7
Fix javaagent publishing (#3929)
* Fix javaagent publishing

* Take manifest attributes from the jar task too
2021-08-24 11:40:36 -07:00
Trask Stalnaker fa71cf9c8a
Fix sporadically failing smoke test (#3895)
* Fix failing smoke test

* Revert "Fix failing smoke test"

This reverts commit 0356ae308b.

* Apply Xmx
2021-08-23 11:27:16 +09:00
Mateusz Rzeszutek 6a3037df73
Support extraResources in WindowsTestContainerManager (#3868)
* Support extraResources in WindowsTestContainerManager

* Fix span name for liberty servlet test

* Use different server.xml path for linux and windows
2021-08-19 18:38:17 +02:00
Anna Nosek 0fd8d2cc47
Add noop sdk configuration option (#3539)
* introduce noop

* test configuration

* rename to noop api, move System.setProperty() calls

* remove unnecessary semicolon

* codenarc fix
2021-07-15 11:33:00 +03:00
Anuraag Agrawal 1e57fd0f54
Enable smoke-tests iff specified on command line (#3542)
* Enable smoke-tests iff specified on command line

* README
2021-07-12 13:29:48 +03:00
Trask Stalnaker 0d27368866
Run smoke tests with Java 16 (#3457)
* Run smoke tests with Java 16

* Add Wildfly + JDK 16 test

* Bump extra tag
2021-07-05 11:39:47 +03:00
Trask Stalnaker ac54f9d446
Sync windows and linux wildfly smoke test images (#3486) 2021-07-04 09:24:55 -07:00
Trask Stalnaker 614d5dc905
Revert tomcat smoke test image changes (#3483) 2021-07-03 08:49:59 -07:00
Trask Stalnaker 103fba247b
Fix Tomcat windows smoke test images (#3469) 2021-07-01 19:19:59 -07:00
Anuraag Agrawal 44f2354d41
Allow disabling thread details and disable for most tests. (#3464) 2021-07-01 08:31:27 -07:00
Trask Stalnaker e2aae6fc87
Fix Tomcat Java 16 images (#3463) 2021-07-01 17:17:38 +03:00
Anuraag Agrawal c0467567f0
Migrate smoke-tests build to kotlin (#3461) 2021-07-01 18:53:40 +09:00
Trask Stalnaker c40bcc52fd
More Java 16 smoke test images (#3458) 2021-06-30 22:40:05 -07:00
Anuraag Agrawal 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
jason plumb 1f3faca6b9
Register logs marshaller (#3392) 2021-06-24 11:08:04 +03:00
Anuraag Agrawal 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
jason plumb bf3830a8b9
support logs in the fake test backend (#3374)
* support logs in the fake test backend

* fix copypasta
2021-06-22 16:27:03 +09:00
Anuraag Agrawal c1d4cf01e8
Move min/max java properties to an extension class (#3307) 2021-06-15 11:55:24 -07:00
Anuraag Agrawal 7ad9e7a50b
Move shaded testing dependencies to internal package. (#3305) 2021-06-15 13:10:19 +03:00
Anuraag Agrawal 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
Trask Stalnaker 62f1f49bcd
Intellij cleanup (Java and Groovy) (#3285)
* Intellij cleanup

* Update instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/code/CodeAttributesExtractorTest.java

Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>

* Update instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/DbAttributesExtractorTest.java

Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>

* Update instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/db/SqlAttributesExtractorTest.java

Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>

* Update instrumentation-api/src/test/java/io/opentelemetry/instrumentation/api/instrumenter/messaging/MessagingAttributesExtractorTest.java

Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>

* Update instrumentation/spring/spring-web-3.1/library/src/test/java/io/opentelemetry/instrumentation/spring/httpclients/RestTemplateInterceptorTest.java

Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>

* Use glassfish version that supports lambdas

Co-authored-by: Anuraag Agrawal <anuraaga@gmail.com>
2021-06-14 10:23:01 -07:00
Anuraag Agrawal c92fbcf624
Update to OTel SDK 1.3.0 (#3253) 2021-06-12 09:56:23 -07:00
Anuraag Agrawal 84cc044ddf
Migrate remaining test client calls to Armeria and remove testing-com… (#3250) 2021-06-11 11:51:23 -07:00
Anuraag Agrawal 6733b50a65
Update fake backend proto version to 1.3.0 (#3252) 2021-06-11 17:22:46 +09:00
Anuraag Agrawal 2436499a09
Update to Errorprone 2.7 (#3181)
* Update to errorprone 2.7

* ToString

* Finish
2021-06-04 10:40:55 +09:00
Anuraag Agrawal 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
Anuraag Agrawal 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
Anuraag Agrawal 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
Lauri Tulmin 6706dbfe53
Change smoketests to use testcontainers httpclient5 transport (#3112)
* Change smoketest to use testcontainers httpclient5 transport

* Update smoke-tests/src/test/resources/testcontainers.properties

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

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-05-27 12:40:52 -07:00
Trask Stalnaker 10db083e77
Update to OTel API/SDK 1.2.0 (#2945)
* Update to OTel API/SDK 1.2.0

* TCP.IP -> tcp_ip

* Fix smoke tests
2021-05-10 10:14:07 -07:00
Jakub Wach 53c38ac8e4
Renamed min java for test property to better reflect its purpose (#2917) 2021-05-06 11:51:13 -07:00
Lauri Tulmin 357140c081
Server span naming for servlet filters (#2887)
* Server span naming for servlet filters

* wildfly default servlet has empty mappings

* jetty11 requires java11

* try a differnt way to disable jetty11 tests on java8

* Update instrumentation/servlet/servlet-5.0/javaagent/src/test/groovy/TomcatServlet5FilterMappingTest.groovy

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

* review fix

* rework to use InstrumentationContext

* remove debugging code

* move MappingResolver to avoid ClassCastException on wildfly

* Update instrumentation/servlet/servlet-3.0/javaagent/src/test/groovy/TomcatServlet3FilterMappingTest.groovy

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>

* review fixes

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2021-05-06 13:25:17 +03:00
Lauri Tulmin beae3276df
Fix flaky smoke tests (#2849)
* Enable debug logging for smoke tests

* trigger rerunning of smoke tests

* trigger rerunning of smoke tests

* pass agent in JVM_ARGS instead of JAVA_TOOL_OPTIONS on glassfish

* spotless

* remvove debugging code

* update windows image versions

* Ensure java.lang.reflect.Proxy is loaded before bytebuddy transformer is set up

* update windows image version

* Update javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/AgentInstaller.java

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

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-04-29 12:47:42 +02:00
Lauri Tulmin 7c517035c0
Fix payara windows image (#2880) 2021-04-28 13:26:26 +03:00
Lauri Tulmin 2df0bb4b51
Pass jvm arguments from env var on windows payara (#2874)
* Pass jvm arguments from env var on windows payara

* enable more debug logging

* capture test output

* use the same fake backend as regular smoke test
2021-04-27 11:22:19 +03:00
Trask Stalnaker e54eb2ca03
Add doc how to run smoke tests (#2840) 2021-04-22 11:37:18 -07:00
Trask Stalnaker cad3c761a6
Bump smoke test timeout (#2798) 2021-04-13 19:56:45 -07:00
Trask Stalnaker 53ffe9fbef
Reduce smoke test timeout after split out (#2720) 2021-04-06 16:37:59 +09:00
Ago Allikmaa 314794eaae
Tomcat 10 and Jetty 11 smoke tests (#2723) 2021-04-06 08:23:48 +03:00
Ago Allikmaa 905e0c76d6
Fix Tomcat version specified in smoke tests with no public docker image (#2722) 2021-04-05 22:04:15 +03:00
Ago Allikmaa 7027006f66
Request handlers and test images for Tomcat 10 and Jetty 11 (Servlet API 5) (#2703)
* Tomcat 10 and Jetty 11 handlers with Servlet API 5

* Jetty 11 and Tomcat 10 Windows images
2021-04-05 09:45:02 -07:00
Lauri Tulmin 255c7eeb28
Update windows fake backend version (#2695) 2021-04-01 16:12:43 -07:00
Lauri Tulmin 4426e1d87b
Update java in windows fake backend image (#2694) 2021-04-01 19:25:00 +03:00
Trask Stalnaker bf03a77b3f
Split out smoke tests further (#2668) 2021-03-31 09:23:21 +03:00
Lauri Tulmin e0af64ccdf
Start smoke test backend and collector once (#2653)
* Start smoke test backend and collector once

* code style fix

* review fixes

* add Override annotation

* move methods from interface to abstract class
2021-03-31 09:23:07 +03:00
Nikita Salnikov-Tarnovski 43f4ab4734
Run smoke tests on Windows as well (#2617)
* Run smoke tests on Windows as well

* Allow long paths on windows

* Allow long paths on windows

* Polish

* Add check that spans were generated by expected OS

* Fix method name

* Use proper extra tag

* Use long paths on CI build on Windows

* Don't run linux test images on Windows

* Don't run linux test images on Windows

* Typo

* More debug

* Don't use testcontainers on Windows

* Polish

* Update backend

* Support for extra resources on linux

* Trying Linux backend on Windows

* Pull backend images if not found

* We do use windows images for backend as well

* Use correct windows images

* Less logs

* Polish

* Better logs

* Polish

* Polish
2021-03-26 15:11:59 +02:00
Nikita Salnikov-Tarnovski 2a2d4ae2f8
Publish windows images for smoke tests backends (#2621)
* Build and push Windows Docker images for fake-backend and collector

* Run on main branch only

* Update smoke-tests/fake-backend/build.gradle

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

* Fix comment

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-03-24 13:20:40 +02:00
Lauri Tulmin e3155ed977
Run smoketests in parallel (#2622) 2021-03-24 08:31:12 +02:00
Ago Allikmaa 69c2644774
Servlet 5 API, reorganize servlet modules (#2609)
* Servlet 5.0 API support, refactored other servlet modules

* Include correct servlet instrumentation module for grails tests

* Reapply spotless after rebase

* Fix checkstyle

* Spotless

* Addressed PR suggestions

* Fixed files in wrong package.

* Fixed mixed up instrumentation names.

* Fixed incomplete instrumentation name.

* Addressed PR suggestions

* Addressed PR suggestions
2021-03-23 14:11:43 +02:00
Felix Barnsteiner 56c52bc315
Add runtime.jvm.gc.collection.count metric (#2616)
* Add runtime.jvm.gc.collection.count metric

* Fix format violation

* Rename gc.collection to gc.collection.time

* Another rename 😅
2021-03-23 14:11:23 +02:00
Trask Stalnaker 1e3d9dd992
Increase smoke test timeout (#2611)
* Increase smoke test timeout

* Fix muzzle build failure
2021-03-21 22:24:47 -07:00
Nikita Salnikov-Tarnovski fc39d87c82
Remove JCenter which is about to be sunset (#2387)
* Remove JCenter which is about to be sunset

* Fallback to JCenter for muzzle

* Fixing muzzle without jcenter

* Fixing muzzle without jcenter

* Fixing muzzle without jcenter

* Fixing muzzle without jcenter

* Fixing muzzle without jcenter

* Fixing muzzle without jcenter

* Fixing muzzle without jcenter

* Remove debug logs

* polish
2021-03-19 23:21:52 +02:00
Mateusz Rzeszutek 69dcfb77bf
Resolve a TODO in SmokeTest (#2604) 2021-03-19 14:30:11 +02:00
Mateusz Rzeszutek 33042ec842
Verify in smoke tests that runtime metrics are exported (#2603) 2021-03-19 12:31:59 +01:00
Mateusz Rzeszutek 5e1f52659f
Add metrics collection to smoke-tests' fake-backend (#2597)
* Add metrics collection to smoke-tests' fake-backend

* Fix a bug
2021-03-19 15:03:40 +09:00
Nikita Salnikov-Tarnovski 50eca9a325
Upgrade gradle-docker plugin to properly work on Windows (#2582) 2021-03-16 14:58:06 +02:00
Nikita Salnikov-Tarnovski 0a1ea92733
Build Windows images for smoke tests (#2568) 2021-03-15 09:38:06 +02:00
Lauri Tulmin 29790d8472
Low cardinality name for servlet span (#2417) 2021-03-04 12:39:37 -08:00
Trask Stalnaker 4c816105d2
Fix grpc smoke build (#2439) 2021-03-01 16:54:18 +09:00
Trask Stalnaker 475830789c
Update to otel-java 1.0.0 (#2431)
* Update to otel-java 1.0.0

* Fix test

* Fix another test

* Fix another test

* Fix hibernate tests

* Fix spring-data tests

* Spotless
2021-02-28 11:15:27 -08:00
Anuraag Agrawal 0f32ed42a4
Instrument log4j to include bugfix of contextdataprovider mechanism. (#2407)
* Instrument log4j to include bugfix of contextdataprovider mechanism.

* Add regression test

* Update smoke test

* Update instrumentation/log4j/log4j-2.13.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/v2_13_2/BugFixingInstrumentation.java

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
2021-02-26 09:20:55 +09:00
Anuraag Agrawal 9d47f9272b
grpc smoke test: Add logging of trace_id to pattern and target log4j2 2.13.2 (#2406)
* Add logging of trace_id to pattern and target 2.14.0

* Update build.gradle
2021-02-25 15:49:33 +09:00
Anuraag Agrawal c4a11549b2
Add a log statement to gRPC smoke test. (#2405) 2021-02-25 12:28:31 +09:00
Nikita Salnikov-Tarnovski 1641ff0d5c
Fix running condition for smoke-tests (#2389) 2021-02-24 12:27:29 +09:00
Ago Allikmaa 0b0a0aace2
Add OpenJ9 image smoke test configurations (#2386) 2021-02-23 23:34:02 +02:00
Nikita Salnikov-Tarnovski b6c2a8535a
Only run smoke tests if requested (#2385) 2021-02-23 20:59:43 +02:00
Ago Allikmaa be75cee7e4
Add test matrix Docker images for OpenJ9 (#2377)
* Add test matrix Docker images for OpenJ9

* Removed an invalid test image configuration.

* Reordered lines in Dockerfile for more optimal caching
2021-02-23 16:15:12 +02:00
Lauri Tulmin c8ca7e8d07
Make http.flavor spec compliant (#2370) 2021-02-22 13:12:05 -08:00
Anuraag Agrawal 000df967ce
Update to SDK 0.17.0 (#2338)
* Update to SDK 0.17.0

* Finish

* ottrace
2021-02-19 15:51:55 +09:00
Lauri Tulmin 80f389c778
Instrument all jetty handlers (#2320) 2021-02-18 11:51:48 +02:00
Mateusz Rzeszutek f127a972dc
Add 'trace_flags' to logging MDC (#2312)
* Add 'trace_flags' to logging MDC

* Remove 'sampled' flag
* Rename MDC keys to the current logging spec convention: trace_id instead of traceId

* Fix smoke tests
2021-02-18 16:47:26 +09:00
Anuraag Agrawal 8bba7ac364
Update smoke tests to 0.17.0 (#2327) 2021-02-18 15:49:09 +09:00
Mateusz Rzeszutek 15a9d0f113
Update smoke tests for logging changes (#2312) (#2316) 2021-02-18 11:46:00 +09:00
Lauri Tulmin 5dc2cd420a
Start smoke test backend and collector only once (#2249) 2021-02-11 22:13:24 -08:00
Lauri Tulmin 845f758f8e
Close response to avoid warning about leaked response (#2240) 2021-02-10 15:01:54 +02:00
Anuraag Agrawal fc410706d0
Update to Sdk 0.16.0 (#2221)
* Update to 0.16.0-SNAPSHOT

* Finish

* Finish

* Update to 0.16.0

* Finish
2021-02-09 18:00:54 +09:00
Anuraag Agrawal b0a7aa1ae8
Update smoke tests to released 0.16.0 (#2228) 2021-02-09 15:07:10 +09:00
Anuraag Agrawal ef1c250deb
Update spring boot smoke test code too (#2219) 2021-02-08 15:57:47 +09:00
Anuraag Agrawal 29dd296d7a
Update smoke tests to 0.16.0-SNAPSHOT (#2218) 2021-02-08 15:44:28 +09:00
Lauri Tulmin c65fb3ede4
Add tomee to supported servers (#2180)
* Add tomee to supported servers

* move tomee after tomcat

* correct tomee image tag
2021-02-04 14:44:21 +09:00
Lauri Tulmin 8f8b7f75ca
Add docker images for tomee (#2175) 2021-02-02 20:13:07 +02:00
Anuraag Agrawal 1ebb58a596
Update to SDK 0.15.0 (#2137)
* Update to SDK 0.15.0

* Fix lightstep test
2021-01-29 21:30:22 +09:00
Anuraag Agrawal 0a74799419
Update smoke tests to SDK 0.15.0 (#2136) 2021-01-29 16:59:13 +09:00
Anuraag Agrawal 8b470bf378
Add Netty instrumentation handlers after matched handler rather than at end of pipeline. (#2100)
* Support latest webflux version.

* Add Netty instrumentation handlers after matched handler rather than at end of pipeline.

* Drift

* Fix

* Raise smoke tests timeout
2021-01-25 16:06:57 +09:00
Anuraag Agrawal 78ef219f74
Remove queued_retry from repo (#2095) 2021-01-22 14:06:07 +09:00
Vladimir Šor a2cde4132d
Smoke tests declare shadowJar as an input to be rebuilt (#2085)
* Smoke tests declare shadowJar as an input to be rebuilt. Fix some gradle deprecation warnings.

* Try files as inputs.
2021-01-20 16:30:45 +02:00
Anuraag Agrawal c6cc263c6e
Use SDK Autoconfigure module (#2077)
* Use sdk autoconfigure

* Finish

* Finish

* Group exporters

* Update smoke-tests/src/test/groovy/io/opentelemetry/smoketest/SpringBootWithSamplingSmokeTest.groovy

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

Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-01-20 14:31:49 +09:00
Anuraag Agrawal 97b8712e3b
Remove jaeger-thrift from agent distribution (#2073)
* Remove jaeger-thrift from agent distribution

* Update test
2021-01-19 16:08:01 +09:00
Anuraag Agrawal afdde0355b
Update to OTel 0.14.1 (#2059)
* Update SDK dependency to 0.14.1

* WIP

* Finish

* Cleanup
2021-01-18 13:02:04 +09:00
Lauri Tulmin 11ad12289b
Jetty server span handling (#2029) 2021-01-14 09:31:57 -08:00
Anuraag Agrawal 47a4061078
Update smoke tests to SDK 0.14.1 (#2043) 2021-01-13 22:22:30 -08:00
Mateusz Rzeszutek 822e18675d
Make the agent log its version anymore when starting (#2026)
* Make the agent not log its version anymore when starting

* Version logger smoke test

* Version logger smoke test
2021-01-14 14:06:36 +09:00
Lauri Tulmin c7e0a12145
Close request to avoid warnings in stderr (#2030) 2021-01-12 11:02:49 -08:00