d6f6c7a087
Move servlet images to repo-scoped ghcr packages ( #4213 )
2021-09-28 12:07:19 +03:00
c5a8920a56
Use repo scoped ghcr package ( #4166 )
...
* smoke-test-spring-boot
* smoke-test-fake-backend
* smoke-test-grpc
* smoke-test-play
* Fix example distro build
* Fix formatting
2021-09-21 13:47:59 -07:00
0b9d8c37a5
Remove collector from smoke tests ( #4186 )
2021-09-21 12:33:01 -07:00
278cae4667
Don't use collector dev image ( #4171 )
...
* Update collector config
* Revert "Update collector config"
This reverts commit 4a76a944af
2021-09-20 20:47:51 -07:00
15cfcfa7b2
Two ghcr container name improvements ( #4165 )
2021-09-18 09:35:47 -07:00
b2984ae731
Fix publishing smoke test windows fake backend ( #4162 )
2021-09-17 12:59:08 -07:00
28c68b91a0
Update "other" smoke tests to Java 16 ( #4144 )
...
* Update "other" smoke tests to Java 16
* Bump extraTag
* Play doesn't support Java 16 (or 17) yet
* Fix formatting
2021-09-17 11:50:21 -07:00
57410cd07c
Use repo-scoped ghcr packages ( #4149 )
2021-09-17 13:12:53 +03:00
b448a0f36a
Fix smoke test play build ( #4134 )
2021-09-15 11:00:16 -07:00
8c23274d7a
Fix smoke test fake backend build ( #4133 )
2021-09-15 10:29:40 -07:00
971ca8b19c
Update to OTel 1.6 ( #4120 )
...
* Update to OTel 1.6
* Example build
* More example
* More example
2021-09-14 20:12:18 +09:00
a576dd5625
Update smoke test docker images ( #4095 )
...
* Update smoke test docker images
* Parallelize
* Clean up
* Some linux Java 17
* Less
2021-09-13 09:59:48 -07:00
62c604f2f5
Format java files in standalone projects ( #4105 )
2021-09-13 16:16:25 +09:00
2d79e6a6ef
Upgrade all gradle wrappers ( #4107 )
...
* Upgrade all gradle wrappers
* Add doc
2021-09-13 16:16:10 +09: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
c13eb7932e
Update collector port ( #4071 )
2021-09-08 18:18:05 -07:00
d52d5d6f8b
Bump smoke test timeout ( #4033 )
2021-08-31 09:48:25 -07:00
ecde2c7940
Fix smoke tests on windows ( #4011 )
...
* Revert "Use --no-daemon on windows builds (#4000 )"
This reverts commit c13063b5ea
2021-08-29 21:15:20 -07:00
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
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
6ba91989a7
Fix javaagent publishing ( #3929 )
...
* Fix javaagent publishing
* Take manifest attributes from the jar task too
2021-08-24 11:40:36 -07:00
fa71cf9c8a
Fix sporadically failing smoke test ( #3895 )
...
* Fix failing smoke test
* Revert "Fix failing smoke test"
This reverts commit 0356ae308b
2021-08-23 11:27:16 +09:00
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
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
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
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
ac54f9d446
Sync windows and linux wildfly smoke test images ( #3486 )
2021-07-04 09:24:55 -07:00
614d5dc905
Revert tomcat smoke test image changes ( #3483 )
2021-07-03 08:49:59 -07:00
103fba247b
Fix Tomcat windows smoke test images ( #3469 )
2021-07-01 19:19:59 -07:00
44f2354d41
Allow disabling thread details and disable for most tests. ( #3464 )
2021-07-01 08:31:27 -07:00
e2aae6fc87
Fix Tomcat Java 16 images ( #3463 )
2021-07-01 17:17:38 +03:00
c0467567f0
Migrate smoke-tests build to kotlin ( #3461 )
2021-07-01 18:53:40 +09:00
c40bcc52fd
More Java 16 smoke test images ( #3458 )
2021-06-30 22:40:05 -07: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
1f3faca6b9
Register logs marshaller ( #3392 )
2021-06-24 11:08:04 +03: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
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
c1d4cf01e8
Move min/max java properties to an extension class ( #3307 )
2021-06-15 11:55:24 -07:00
7ad9e7a50b
Move shaded testing dependencies to internal package. ( #3305 )
2021-06-15 13:10:19 +03: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
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
c92fbcf624
Update to OTel SDK 1.3.0 ( #3253 )
2021-06-12 09:56:23 -07:00
84cc044ddf
Migrate remaining test client calls to Armeria and remove testing-com… ( #3250 )
2021-06-11 11:51:23 -07:00
6733b50a65
Update fake backend proto version to 1.3.0 ( #3252 )
2021-06-11 17:22:46 +09:00
2436499a09
Update to Errorprone 2.7 ( #3181 )
...
* Update to errorprone 2.7
* ToString
* Finish
2021-06-04 10:40:55 +09:00
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
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
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
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
53c38ac8e4
Renamed min java for test property to better reflect its purpose ( #2917 )
2021-05-06 11:51:13 -07:00
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
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
7c517035c0
Fix payara windows image ( #2880 )
2021-04-28 13:26:26 +03:00
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
e54eb2ca03
Add doc how to run smoke tests ( #2840 )
2021-04-22 11:37:18 -07:00
cad3c761a6
Bump smoke test timeout ( #2798 )
2021-04-13 19:56:45 -07:00
53ffe9fbef
Reduce smoke test timeout after split out ( #2720 )
2021-04-06 16:37:59 +09:00
314794eaae
Tomcat 10 and Jetty 11 smoke tests ( #2723 )
2021-04-06 08:23:48 +03:00
905e0c76d6
Fix Tomcat version specified in smoke tests with no public docker image ( #2722 )
2021-04-05 22:04:15 +03:00
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
255c7eeb28
Update windows fake backend version ( #2695 )
2021-04-01 16:12:43 -07:00
4426e1d87b
Update java in windows fake backend image ( #2694 )
2021-04-01 19:25:00 +03:00
bf03a77b3f
Split out smoke tests further ( #2668 )
2021-03-31 09:23:21 +03:00
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
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
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
e3155ed977
Run smoketests in parallel ( #2622 )
2021-03-24 08:31:12 +02:00
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
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
1e3d9dd992
Increase smoke test timeout ( #2611 )
...
* Increase smoke test timeout
* Fix muzzle build failure
2021-03-21 22:24:47 -07:00
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
69dcfb77bf
Resolve a TODO in SmokeTest ( #2604 )
2021-03-19 14:30:11 +02:00
33042ec842
Verify in smoke tests that runtime metrics are exported ( #2603 )
2021-03-19 12:31:59 +01:00
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
50eca9a325
Upgrade gradle-docker plugin to properly work on Windows ( #2582 )
2021-03-16 14:58:06 +02:00
0a1ea92733
Build Windows images for smoke tests ( #2568 )
2021-03-15 09:38:06 +02:00
29790d8472
Low cardinality name for servlet span ( #2417 )
2021-03-04 12:39:37 -08:00
4c816105d2
Fix grpc smoke build ( #2439 )
2021-03-01 16:54:18 +09:00
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
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
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
c4a11549b2
Add a log statement to gRPC smoke test. ( #2405 )
2021-02-25 12:28:31 +09:00
1641ff0d5c
Fix running condition for smoke-tests ( #2389 )
2021-02-24 12:27:29 +09:00
0b0a0aace2
Add OpenJ9 image smoke test configurations ( #2386 )
2021-02-23 23:34:02 +02:00
b6c2a8535a
Only run smoke tests if requested ( #2385 )
2021-02-23 20:59:43 +02:00
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
c8ca7e8d07
Make http.flavor spec compliant ( #2370 )
2021-02-22 13:12:05 -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
80f389c778
Instrument all jetty handlers ( #2320 )
2021-02-18 11:51:48 +02:00
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
8bba7ac364
Update smoke tests to 0.17.0 ( #2327 )
2021-02-18 15:49:09 +09:00
15a9d0f113
Update smoke tests for logging changes ( #2312 ) ( #2316 )
2021-02-18 11:46:00 +09:00
5dc2cd420a
Start smoke test backend and collector only once ( #2249 )
2021-02-11 22:13:24 -08:00
845f758f8e
Close response to avoid warning about leaked response ( #2240 )
2021-02-10 15:01:54 +02:00
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
b0a7aa1ae8
Update smoke tests to released 0.16.0 ( #2228 )
2021-02-09 15:07:10 +09:00
ef1c250deb
Update spring boot smoke test code too ( #2219 )
2021-02-08 15:57:47 +09:00
29dd296d7a
Update smoke tests to 0.16.0-SNAPSHOT ( #2218 )
2021-02-08 15:44:28 +09:00
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
8f8b7f75ca
Add docker images for tomee ( #2175 )
2021-02-02 20:13:07 +02:00
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
0a74799419
Update smoke tests to SDK 0.15.0 ( #2136 )
2021-01-29 16:59:13 +09:00
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
78ef219f74
Remove queued_retry from repo ( #2095 )
2021-01-22 14:06:07 +09:00
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
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
97b8712e3b
Remove jaeger-thrift from agent distribution ( #2073 )
...
* Remove jaeger-thrift from agent distribution
* Update test
2021-01-19 16:08:01 +09:00
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
11ad12289b
Jetty server span handling ( #2029 )
2021-01-14 09:31:57 -08:00
47a4061078
Update smoke tests to SDK 0.14.1 ( #2043 )
2021-01-13 22:22:30 -08:00
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
c7e0a12145
Close request to avoid warnings in stderr ( #2030 )
2021-01-12 11:02:49 -08:00
28c210ed39
Start each server version once for smoke tests ( #1967 )
...
* start each server version once for smoke tests
* Update smoke-tests/src/test/java/io/opentelemetry/smoketest/AppServerTestRunner.java
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
* Update smoke-tests/src/test/java/io/opentelemetry/smoketest/AppServerTestRunner.java
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
* Update smoke-tests/src/test/java/io/opentelemetry/smoketest/AppServerTestRunner.java
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
* review fixes
* review fix
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2021-01-06 12:10:38 +09:00
79433966fb
Liberty server span handling ( #1929 )
...
* Liberty server span handling
* review fixes
* review fixes
* add doc about using compile stubs
* Update instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/LibertyInstrumentationModule.java
Co-authored-by: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
* Update instrumentation/liberty/liberty/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/liberty/ThreadLocalContext.java
Co-authored-by: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
* add links to advice classes
* add commnet, remove unneeded dependency
Co-authored-by: Nikita Salnikov-Tarnovski <gnikem@gmail.com>
2020-12-22 15:00:58 +02:00
0888711574
Add support for Undertow server runtime ( #1917 )
...
* Add support for Undertow server runtime
* Polish
* Damn be classloaders
* Fix correct span name
* Polish
2020-12-22 14:13:50 +02:00
b72e4a9a53
Update smoke tests to released 0.13.1 ( #1933 )
2020-12-18 12:50:26 +09:00
f0a6c6d772
Update SDK dependency to 0.13.0-SNAPSHOT. ( #1924 )
...
* Update SDK dependency to 0.13.0-SNAPSHOT.
* Update smoke tests
* Fix formatting
* Spot
2020-12-17 18:20:59 +09:00
7f3d6c3321
Update smoke tests to 0.13.0-SNAPSHOT ( #1923 )
2020-12-17 15:42:50 +09:00
135ba344cb
Tomcat server handlers ( #1902 )
...
* Tomcat server handler with passing integration and smoke tests.
* Update server span name from the servlet integration instead of trying to mimic it from the server handler.
* Cleanup and more javadocs.
* Use Java8BytecodeBridge in advice code.
* Use Java8BytecodeBridge in advice code.
* Use earliest version for compilation and muzzling.
* Use consistent instrumentation name.
* Record throwables only if the context is managed by something else.
* Getting scope handling right. Moved server span renaming logic via AppServerBridge to the ServletHttpServerTracer.
* codenarc
* more PR comments addressed
* Pass Method to startServerSpan
2020-12-16 16:59:54 +02:00
d00cbfcc5f
Add more testable servlets to some test app, update tomcat 10 and jetty 10 versions ( #1899 )
2020-12-15 08:15:55 +02:00
4c8b8a77fb
Add exporter factory for JaegerThriftSpanExporter ( #1868 )
...
* add exporter factory for JaegerThriftSpanExporter
* add smoke test
2020-12-14 13:02:51 -08:00
f062ee4ce2
fix liberty docker images ( #1853 )
2020-12-09 10:59:04 +02:00
6281583770
Fix smoke tests to use new images ( #1845 )
2020-12-07 16:21:22 +02:00
04217319ad
Let smoke test use non-default servlet context ( #1844 )
2020-12-07 14:39:23 +02:00
3b8827b8ab
Update to SDK 0.12.0 ( #1830 )
...
* Update to SDK 0.12.0
* Update error message to the current world.
* Bump referenced smoke test versions
* fixes
* dependency hell
* Suppress unused call
* Bump missed smoke tests
* Bump image, bump smoke tests gRPC version
2020-12-07 17:16:47 +09:00
b2f2c96904
Bump gRPC version in smoke test ( #1838 )
2020-12-07 11:34:46 +09:00
ef02da9090
Bootstrap prefix fix ( #1833 )
...
* Proper classloading test for WildFly and GlassFish
* Fix using BootstrapPackagePrefixesHolder
* Polish
* Format
2020-12-05 10:41:00 +02:00
32cfc26cfc
Bump smoke tests to SDK 0.12.0 ( #1832 )
2020-12-04 22:02:27 +09:00
6154538d08
Fix matrix smoke test package name ( #1827 )
2020-12-03 17:24:57 -08:00
54e3df3cd4
Add jsp to test matrix application ( #1825 )
...
* Add jsp to test matrix application
* Trying to fix sudden muzzle failure
2020-12-03 19:40:31 +02:00
71f1a79100
Introduce test matrix ( #1821 )
...
* Introduce test matrix and proper WildFly test
* Restore test to old version until matrix is merged
* Add workflow to publish test matrix
* Satisfy checkstyle
* Polish
* Use docker build args instead of replacing tokens
2020-12-03 12:34:45 +02:00
41fc96d1a6
Test span context propagation ( #1808 )
2020-12-02 13:56:44 +09:00
3c1a09109f
Use sdk-extensions/resources in the agent ( #1809 )
...
* Use sdk-extensions/resources in the agent
* Add smoke test, fix dropwizard test
2020-12-01 16:03:51 -08:00
483d477e67
Fix port used for self-call ( #1807 )
2020-11-30 16:21:39 +02:00
3475cbd77d
Migrate test docker images to GHCR. ( #1790 )
2020-11-30 09:15:42 +02:00
61d0af0bd5
Format scala files ( #1800 )
2020-11-29 21:04:34 -08:00
41bd489a77
Format groovy files ( #1793 )
2020-11-28 21:22:14 -08:00
2222905aa2
Preparation for e2e propagators test ( #1781 )
2020-11-27 21:57:21 +02:00
7bfb6b6dbd
Update to SDK 0.11.0 ( #1690 )
2020-11-19 19:37:49 -08:00
3c195f3273
Limit latest test version for Apache HttpClient 2.0 ( #1676 )
2020-11-18 14:57:58 +02:00
53529d3028
Use released 0.10.0 in smoke test containers. ( #1634 )
2020-11-14 15:27:28 -08:00
6c1dabf782
Tag smoke test images with date and run ID from workflow. ( #1559 )
...
* Tag smoke test images with sha from workflow.
* Pass tag as date from workflow
* Echo tag which is nice to see in logs
* Add run ID
* Remove seconds
* Missed files
2020-11-05 19:11:29 +09:00
caf102fe15
Tag docker images for smoke tests with date and time. ( #1553 )
2020-11-05 00:02:33 +09:00
7b64184701
Smoke tests using Jaeger and Zipkin exporters ( #1543 )
2020-11-02 20:50:14 -08:00
c6eee70660
Update to latest snapshot. ( #1524 )
2020-10-29 18:54:09 -07:00
a2dccf2316
Update to latest SDK snapshot. ( #1479 )
2020-10-26 19:29:46 -07:00
f6ad05b8e3
Update to latest SDK snapshot ( #1384 )
...
* Update to latest SDK snapshot
* Use published snapshot
* Fixes
* Cleans
* spotless
* Most
* Clean
* Merge
* Temporarily remove context interop
* WIP
* Prepare for intercepting propagated span
* Bump SDK
* IDE updates
* Lots
* compileJava
* Done?
* bar
* Spot
* drugs
* Groovy--
* green for me
* Spot
* Remove grpc import
* Scrub
2020-10-25 15:14:32 +09:00
7d77b2dc37
Prefer mavenCentral over jcenter ( #1440 )
...
* Prefer mavenCentral over jcenter
* Skip broken version for muzzle
2020-10-21 18:59:29 +03:00
a6e0e27ad4
Remove usage of Contexts from grpc instrumentation. ( #1426 )
...
* Fix grpc instrumentation cannot be applied due to muzzle error and add smoke test.
* Add workflow for building smoke test image
* Revert debug logging
* Java versions
2020-10-21 09:58:45 +09:00
bc507ced12
Fix play span name ( #1416 )
2020-10-19 17:23:30 +03:00
1b51d4a6b1
Rename packages ( #1367 )
2020-10-11 13:54:35 -07:00
79ab34b6ef
Single GHA job to mark PR OK/NOK ( #1333 )
...
* Single GHA job to mark PR OK/NOK
* Debug
* Debug
* Extract smoke test as a separate job
* Debug
* Debug
* Debug
* Debug
* Debug
* Debug
* Debug
* Fix for greedy testcontainers
2020-10-07 15:03:34 +03:00
9523f9ffe6
fix and/or ignore spotbugs errors ( #1325 )
2020-10-06 19:39:17 -07:00
a4fab1396b
Fix compatibility problem with Docker for Mac 2.4 ( #1332 )
...
* Fix compatibility problem with Docker for Mac 2.4
* Polish
2020-10-06 13:54:31 +03: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
8954f222c0
Update to the latest opentelemetry-java 0.9.0-SNAPSHOT ( #1266 )
2020-09-26 20:44:28 -07:00
91b177165c
Bump Java from 14 to 15 in CI ( #1252 )
...
* Bump Java from 14 to 15 in CI
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
* Review comments
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
* adjust comment
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
* Bump jacoco to 0.8.6
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
* maxJavaVersionForTests
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
2020-09-24 15:27:33 +03:00
d59a0d3898
Run smoke tests only on java 11 ( #1247 )
2020-09-23 15:03:40 -07:00
f76fb756be
Add smoke test for Logback MDC instrumentation ( #1227 )
2020-09-22 10:37:36 +03:00
c45a8cd432
Add smoke test for Logback MDC instrumentation - Spring Boot app changes ( #1228 )
2020-09-21 17:51:23 +03:00
5c86bcc20d
Update SDK dependency to released 0.8.0 ( #1162 )
...
* Update SDK dependency to released 0.8.0
* Update exporter
* Fix fake-backend proto reference
2020-09-03 17:09:51 +09:00
83a5714a97
Use a fake OTLP backend for storing smoke tests traces instead of fil… ( #1136 )
...
* Use a fake OTLP backend for storing smoke tests traces instead of file exporter.
* Newlines
* Newlines
* Bins
2020-08-31 15:17:51 +09:00
e20cba57c2
Telemetry auto version ( #1112 )
...
* Provide telemetry.auto.version
* Report instrumentation library version
* Rename class
* Format
2020-08-27 23:16:17 +03:00
6a07b173af
Rename auto exporters module ( #1022 )
2020-08-17 21:04:13 -07:00
89577a168a
Switch to Bintray Docker repo ( #959 )
...
* Debugging jib failures
* Debugging jib failures
* Switching to Bintray Docker
* Switching to Bintray Docker
* Switching to Bintray Docker
2020-08-13 10:16:08 +03:00
bf9c160570
Rename javaagent modules ( #952 )
2020-08-12 22:50:14 -07:00
51e06100ca
Run smoke tests on different java versions ( #948 )
...
* Run smoke tests on different java versions
* Cleaner Docker images names
2020-08-12 20:32:23 +03:00
a222676a3e
Improved smoke tests ( #934 )
...
* Preping smoke tests
* Improved smoke tests
* Make it work in Linux
* Add workflow to run tests on PR
* Build Smoke tests
* Fix PR workflow trigger
* Fix smoke test apps trigger
* Disable smoke tests in CircleCI and let them run in Github Actions only
* Fix smoke test apps docker image names
* Polish
2020-08-12 12:34:14 +03:00
275fab6ea5
Retry all tests ( #941 )
2020-08-11 00:20:47 -07:00
2c786ab1a1
Fix WithSpan annotation instrumentation ( #929 )
2020-08-09 21:46:50 -07:00
2ac65a67d5
Replace Spock retry with Gradle retry. ( #908 )
...
* Replace Spock retry with Gradle retry.
* Retry akka for real
* Warning
2020-08-06 17:59:40 +09:00
5dc2ca350a
Update config property prefix from ota to otel ( #841 )
...
* Update config property prefix from ota to otel
* more
* format
* more
2020-07-31 08:29:29 +03: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
b77fb267f3
Gradle warnings ( #659 )
...
* More gradle warnings fixes
* Disable javadoc where it is definitely not needed
* Polish
2020-07-10 07:57:54 +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
5f70b521b7
#560 Consolidate src/main/java8 and src/main/java9 into src/main/java ( #617 )
...
Signed-off-by: Sergei Malafeev <sergei@malafeev.org>
2020-06-30 16:34:59 +03:00
de1fb295cb
Now publish all instrumentations as well. ( #565 )
...
* Now publish all instrumentations as well.
Changed groupId to `io.opentelemetry.instrumentation`.
Removed `opentelemetry` from auto-exporters' artifactIds.
Some instrumentations will need moving around to have better names, e.g. servlets. Should I do it right away?
* Polish
* Unify names of published artifacts
* Renamed some modules
* Fix CI config
* Rename project-reactor back to reactor
2020-06-27 08:57:24 +03: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
459c291bca
Allow the mock http server get assigned a transient port ( DataDog/dd-trace-java#1540 )
...
This change should eradicate the spurious test failures due to port conflicts - at least for the profiling smoke tests.
2020-06-23 14:08:44 -07:00
5e9e2539e7
The fattest jar now has `-all` classifier ( #515 )
...
* The fattest jar now has `-all` classifier
* Test fix
2020-06-15 10:12:33 +03:00
e61ff5bac2
Rename auto-exporters' artifacts names ( #514 )
2020-06-14 10:53:51 -07:00
1b29184e7c
Make rootDir usage consistent ( DataDog/dd-trace-java#1518 )
2020-06-11 10:14:02 -07:00
9f44348217
Embed exporters into agent jar ( #491 )
...
* Embed all exporters into agent jar
* Publish agent with exporters and without
* Polish
2020-06-11 09:41:11 +03:00
357fb6e989
Deduplicate servlets ( #469 )
...
* Servlet instrumentations unified
* Grizzly migrated
* Fix tests after merge
* Polish and fix tests
* Polish and fix tests
* Muzzle fixes
* Muzzle fixes
* Muzzle fixes
* Test fixes
* One more check fixed
* Stop using SpanWithScope
* Test fix
* Compilation fix
* Apply suggestions from code review
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
* Update agent-bootstrap/src/main/java/io/opentelemetry/auto/bootstrap/instrumentation/decorator/HttpServerTracer.java
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
* Polish
* Tracer does not manage scope anymore
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-06-08 10:49:58 +03:00
109d684152
Configured trace config to read from env vars/sys props ( #479 )
...
* Configured trace config to read from env vars/sys props
* Fixed the codenarc violation
* Addressing review comments
1. Updated span count target to num_tries in the test since SpanCounter stops counting spans as soon as it hits the targets
* Extracted the configure method outside of installExportersFromJar
* Addressing comments
2020-06-08 09:54:18 +03:00
c58d259459
Make Retrys consistent ( DataDog/dd-trace-java#1442 )
2020-05-26 11:54:55 -07:00
29a18bdf20
Used BatchSpansProcessor instead of SimpleSpansProcessor ( #393 )
...
BatchSpansProcessor won't get blocked by the exporter.
Fixes #368
2020-05-16 13:18:43 -07:00
6cfe2256ef
Use java 11 for compilation ( #390 )
...
* Allow compiling of everything with java 11
* Instruct CircleCI to use java 11 be default
* Forbid running some tests on java11
* Muzzle uses ClassLoader.platformClassLoader as parent for user-space classloader
2020-05-14 15:13:30 -07:00
ab0c950140
Update a few last things to otel-java 0.4.0 ( #399 )
2020-05-11 22:17:16 -07:00
6e1c0436da
Clarifications about various test tasks ( #358 )
...
In addition this commit replaces eager tasks generation for running tests using different java versions with rule based task created on-demand.
2020-04-28 18:11:17 -07:00
1f0cd54fd7
Remove copyright year from license header ( #322 )
...
* Update template
* Apply template
2020-04-15 11:24:44 -07:00
d24159c8d2
Merge tag 'v0.48.0' into dd-merge
2020-04-12 15:20:10 -07:00
f885f3f645
A few exporter improvements ( #288 )
2020-03-29 08:13:20 -07:00
2e210683fd
Update to OpenTelemetry API/SDK 0.3.0 ( #286 )
...
* Update gradle dependencies and module name
* Replace Tracer.withSpan() with currentContextWith()
* Update inject to 0.3.0
* Update extract to 0.3.0
* More updates
* Remove distributedcontext package refs
* Update OpenTelemetry API interoperability
* No need to call setNoParent()
setParent(SpanContext.getInvalid()) should give the same result.
2020-03-28 19:38:51 -07:00
96f89ecc48
Span name should not have http method ( #279 )
2020-03-23 09:52:20 -07:00
396baa69d6
Update OpenTelemetry API/SDK ( #257 )
...
* Update dependency version
* Change getTracerFactory to getTracerProvider
* Update some imports
* Change put to set
* Fix up bridge
* Update package names
* Update test SpanProcessor
* Remove null conditionals around setAttribute
* Update shading
* Update span context extraction
2020-03-20 14:13:55 -07:00
5089a05c44
Better span names for spring-webmvc ( #245 )
2020-03-19 19:00:38 -07:00
2298885678
Merge tag 'v0.46.0' into dd-merge
2020-03-16 11:25:27 -07:00
cecabe522a
Make tests pass on Windows ( #217 )
2020-03-12 19:42:21 -07:00
5b1218cdb8
Update instrumentation to be compliant with HTTP semantic conventions ( #227 )
...
* Update HTTP client-side span names
* Add query and fragment to http.url for HTTP client spans
* Add query and fragment to http.url for HTTP server spans
* Update HTTP server span names to be the matched route or resource
* Use net.peer.* instead of peer.* attributes
2020-03-12 18:49:52 -07:00
b2db595430
Merge tag 'v0.45.0' into dd-merge
2020-03-05 21:49:39 -08:00
40e3932358
Add license headers ( #188 )
...
* Add spotless gradle plugin
* Add license headers
2020-02-27 13:24:42 -08:00
8ee04d54e9
Merge remote-tracking branch 'datadog/master' into dd-merge
2020-02-22 14:35:03 -08:00
239eb53a44
Removed statically loaded exporters and added more tests ( #171 )
...
* Classloader done. Still needs shading
* First working version
* Made the dummy exporter slightly less stupid
* Use SPI pattern for loading. Added runtime shader
* Changed to do shading on binary stream instead of loading the class first
* Protected the runtime shader from having its internals shaded
* Cleaned up code and naming
* Cleaned up
* Cleaned up and fixed test issues
* Minor fixes from code review
* Added exporter smoke tests
* Finalized exporter smoke tests
* Reenabled springboot test
* Fixed some copy-paste issues
* Initial work on exporter bridges
* Implemented dynamically loaded exporter adapters
* Added some more files
* Added exporter-adapters for well-known exporters
Moved dummy-exporter to exporter adapters
Removed -Dota.exporter option in favor of ota.exporter.jar
Added basic exporter tests to smoketest
Increased timeout for Finatra server start to help with parallel test execution
* Cleaned up tests, removed dead code and updated README
* Update README.md
* Update README.md
* Removed references to gRPC dependencies needed by Jaeger
* Fixed incorrect use of ServiceLoader in test
* Fixed test dependencies
* Adjusted exporter tests
* Fixed codeNarc issues
* Fixed CircleCI issues
* Added tests to check what CircleCI is doing
* Added missing logging directory
* Removed deadline() from Jaeger factory
* Another attempt to make it pass CircleCI
* Fixed some minor codeNarc issues
* Wrapped test config in doFirst
* Change forEach -> each
* Removed README section about commercial exporters
* Reduced number of changes to Config
* Fixed field reordering issue
* Removed references to dummy exporter
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
2020-02-21 15:12:48 -08:00
794ccd0e6b
Rename java agent artifact ( #137 )
...
* Fix config to not rely on module alpha order
* Rename java-agent module to opentelemetry-auto
2020-02-06 16:03:24 -08:00
2b11b37d0f
Remove trace-api artifact ( #116 )
...
* Remove unused Trace annotations
* Remove Trace annotation from benchmark code
* Remove Trace annotation from instrumentation tests
* Remove Trace annotation from smoke tests
* Remove Trace annotation from agent tests
* Remove Trace annotation from testing tests
* Remove Trace annotation from hystrix tests
* Remove Trace annotation from netty tests
* Remove Trace annotation from webflux tests
* Remove Trace annotation from reactor tests
* Remove unnecessary conditional
* Remove Trace annotation from trace annotation instrumentation
* Remove Trace annotation from akka http tests
* Remove Trace annotation from java concurrent tests
* Delete Trace annotation
* Move classes out of trace-api
* Remove trace-api artifact
* Move trace-api classes to better packages
2020-02-01 13:07:51 -08:00
819ca7c256
Simplify directory/module structure ( #77 )
...
* Move things up a directory
* Scripted mass update
find -type f -name "*.gradle" | xargs sed -i 's/:java-agent:/:/g'
* Remove plugin version now that it's in root module
* Update java-agent and instrumentation configs
* Misc
2020-01-22 13:55:47 -08:00
71d264fd00
Rename package to io.opentelemetry.auto ( #54 )
...
* Remove publishing info
* Remove Datadog-Meta-Lang handling
* Misc renames
* Rename DD_ constant field names
* Rename DDSpanTypes to SpanTypes
* Rename DDTags to MoreTags
* Rename DDSpecification to AgentSpecification
* Rename DDLocationStrategy to AgentLocationStrategy
* Rename DDCachingPoolStrategy to AgentCachingPoolStrategy
* Rename DDTransformers to AgentTransformers
* Script: rename datadog.trace to io.opentelemetry.auto
find -wholename */datadog/trace -exec mkdir -p {}/../../io/opentelemetry \; -exec mv {} {}/../../io/opentelemetry/auto \;
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i 's/datadog\.trace\./io.opentelemetry.auto./g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i 's/datadog\/trace\//io\/opentelemetry\/auto\//g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\.trace\./io.opentelemetry.auto./g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\/trace\//io\/opentelemetry\/auto\//g'
* Script: rename more packages
find -wholename */datadog/test -exec mkdir -p {}/../../io/opentelemetry \; -exec mv {} {}/../../io/opentelemetry \;
find -wholename */datadog/smoketest -exec mkdir -p {}/../../io/opentelemetry \; -exec mv {} {}/../../io/opentelemetry \;
find -wholename */datadog/perftest -exec mkdir -p {}/../../io/opentelemetry \; -exec mv {} {}/../../io/opentelemetry \;
find -wholename */datadog/benchmark -exec mkdir -p {}/../../io/opentelemetry \; -exec mv {} {}/../../io/opentelemetry \;
find -wholename */datadog/loadgenerator -exec mkdir -p {}/../../io/opentelemetry \; -exec mv {} {}/../../io/opentelemetry \;
# keep these outside of io.opentelemetry.auto for now at least (things under io.opentelemetry.auto are not instrumented)
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh | xargs sed -i 's/datadog\.test\b/io.opentelemetry.test/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh | xargs sed -i 's/datadog\.smoketest\b/io.opentelemetry.smoketest/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh | xargs sed -i 's/datadog\.perftest\b/io.opentelemetry.perftest/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh | xargs sed -i 's/datadog\.benchmark\b/io.opentelemetry.benchmark/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh | xargs sed -i 's/datadog\.loadgenerator\b/io.opentelemetry.loadgenerator/g'
# ok to move this into io.opentelemetry.auto
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh | xargs sed -i 's/datadog\.slf4j\b/io.opentelemetry.auto.slf4j/g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\.test\b/io.opentelemetry.test/g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\.smoketest\b/io.opentelemetry.smoketest/g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\.perftest\b/io.opentelemetry.perftest/g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\.benchmark\b/io.opentelemetry.benchmark/g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\.loadgenerator\b/io.opentelemetry.loadgenerator/g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\.slf4j\b/io.opentelemetry.auto.slf4j/g'
* Intellij: format and organize imports
* Script: More renaming
find -name *.xml | xargs sed -i 's/<logger name="datadog"/<logger name="io.opentelemetry.auto"/g'
find -name *.java | xargs sed -i 's/LoggerFactory.getLogger("datadog")/LoggerFactory.getLogger("io.opentelemetry.auto")/g'
find -name *.java | xargs sed -i 's/"datadog.span"/"opentelemetry.auto.span"/g'
find -name *.java -o -name *.groovy | xargs sed -i 's/"datadog.doesnotexist"/"io.opentelemetry.auto.doesnotexist"/g'
# keep this outside of io.opentelemetry.auto for now at least (things under io.opentelemetry.auto are not instrumented)
find -name *.yaml | xargs sed -i 's/"datadog.benchmark"/"io.opentelemetry.benchmark"/g'
find -type f -name "*.gradle" | xargs sed -i 's/datadog\.forked/io.opentelemetry.auto.forked/g'
find -name *.yml | xargs sed -i 's/datadog\.forked/io.opentelemetry.auto.forked/g'
* Improve comment
* Script: rename dd- modules
git mv dd-java-agent java-agent
git mv java-agent/dd-java-agent.gradle java-agent/java-agent.gradle
git mv dd-trace-api trace-api
git mv trace-api/dd-trace-api.gradle trace-api/trace-api.gradle
git mv dd-smoke-tests smoke-tests
git mv smoke-tests/dd-smoke-tests.gradle smoke-tests/smoke-tests.gradle
git mv dd-trace-java.gradle trace-java.gradle
find -type f -name "*.gradle" | xargs sed -i 's/\bdd-java-agent\b/java-agent/g'
find -type f -name "*.gradle" | xargs sed -i 's/\bdd-trace-api\b/trace-api/g'
find -type f -name "*.gradle" | xargs sed -i 's/\bdd-smoke-tests\b/smoke-tests/g'
find -type f -name "*.gradle" | xargs sed -i 's/\bdd-trace-java\b/trace-java/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh -o -name *.yml | xargs sed -i 's/\bdd-java-agent\b/java-agent/g'
sed -i 's/\bdd-java-agent\b/java-agent/g' .gitignore
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh -o -name *.yml | xargs sed -i 's/\bdd-trace-api\b/trace-api/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt -o -name *.sh -o -name *.yml | xargs sed -i 's/\bdd-smoke-tests\b/smoke-tests/g'
* Remove unused config - service.name
* Remove unused config - writer.type
* Remove unused config - trace.partial.flush.min
* Script: rename dd. test packages
find -wholename */dd/trace/instrumentation -exec mkdir -p {}/../../io/opentelemetry/test \; -exec mv {} {}/../../io/opentelemetry/test \;
find -wholename */dd/test/trace/annotation -exec mkdir -p {}/../../io/opentelemetry/test \; -exec mv {} {}/../../io/opentelemetry/test \;
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i 's/dd\.trace\.instrumentation\b/io.opentelemetry.test.instrumentation/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i 's/dd\.test.trace\.annotation\b/io.opentelemetry.test.annotation/g'
* Script: rename dd properties
DD_PROP=opentelemetry.auto
DD_ENV=OPENTELEMETRY_AUTO
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\"dd\.\"/\"$DD_PROP.\"/g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\"DD_\"/\"${DD_ENV}_\"/g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.integration\./$DD_PROP.integration./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.integrations\./$DD_PROP.integrations./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bDD_INTEGRATION_/${DD_ENV}_INTEGRATION_/g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bDD_INTEGRATIONS_/${DD_ENV}_INTEGRATIONS_/g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.trace\./$DD_PROP.trace./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bDdd\.trace\./D$DD_PROP.trace./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bDD_TRACE_/${DD_ENV}_TRACE_/g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.logs\./$DD_PROP.logs./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.trace_id\b/$DD_PROP.trace_id/g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.span_id\b/$DD_PROP.span_id/g"
find -type f -name "*.gradle" | xargs sed -i "s/\bdd\.trace\./$DD_PROP.trace./g"
find -type f -name "*.properties" | xargs sed -i "s/\bdd\.trace\./$DD_PROP.trace./g"
# test code
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.prop\./$DD_PROP.prop./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.float\./$DD_PROP.float./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.garbage\./$DD_PROP.garbage./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bdd\.negative\./$DD_PROP.negative./g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bDD_ENV_/${DD_ENV}_ENV_/g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bDD_FLOAT_/${DD_ENV}_FLOAT_/g"
# test code
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\"is-dd-server\"/\"is-test-server\"/g"
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i "s/\bisDDServer\b/isTestServer/g"
* Rename dd-java-tracer.properties to java-tracer.properties
* Rename DDTracingUtil to OpenTelemetryTracingUtil
* Codec.java was removed already
* Rename __datadog to __opentelemetry
* Misc renames
* Script: remove redundant sub-package
find -wholename */io/opentelemetry/auto/agent -exec bash -c "mv {}/* {}/.." \;
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i 's/io\.opentelemetry\.auto\.agent\b/io.opentelemetry.auto/g'
find -type f -name "*.gradle" | xargs sed -i 's/io\.opentelemetry\.auto\.agent\b/io.opentelemetry.auto/g'
find -name *.java -o -name *.groovy -o -name *.scala -o -name *.kt | xargs sed -i 's/io\/opentelemetry\/auto\/agent\b/io\/opentelemetry\/auto/g'
* Shorten logging config keys
2020-01-14 13:57:01 -08:00
Trask Stalnaker
Anuraag Agrawal
Matthew Ho
Mateusz Rzeszutek
Anna Nosek
jason plumb
Lauri Tulmin
Jakub Wach
Ago Allikmaa
Nikita Salnikov-Tarnovski
Felix Barnsteiner
Vladimir Šor
Lauri Tulmin
Ioannis Mavroukakis
Pavol Loffay
Helen Y
Alexey Zhokhov
Sergei Malafeev
Jaroslav Bachorik
Tyler Benson
Rashmi
Han Zhang
Pontus Rydin