3e6419d4f0
Fixing latestDepTest
2019-10-08 15:12:43 +02:00
e696aa7da8
Test - no span for Object methods
...
Added a test case that confirms that no span is creating for Object methods on the repository
2019-10-08 14:29:07 +02:00
01b92208d0
Clarifying comment
2019-10-08 13:47:11 +02:00
d5021e0cbc
Add test case with netty
2019-10-08 13:43:26 +02:00
24632212e5
Merge pull request #1030 from DataDog/tyler/base-test
...
Extract base test class and move Config class changes there.
2019-10-08 10:44:55 +02:00
5edff68c21
Propagating exception
2019-10-08 09:58:58 +02:00
b01bef7a23
Merge branch 'master' into dougqh/spring-data-support
2019-10-08 09:38:55 +02:00
9ef3332140
Extract base test class and move Config class changes there.
2019-10-07 18:51:25 +02:00
584f181abb
Fix OSGi bootstrap delegation property
2019-10-07 18:40:05 +02:00
5719a783ad
Make trace annotation instrumentation async propagating
2019-10-07 18:29:26 +02:00
828e21123c
Remove debug println
...
Co-Authored-By: Laplie Anderson <randomanderson@users.noreply.github.com>
2019-10-07 14:19:46 +02:00
82180c2ea6
Add support for jax-rs AsyncResponse
2019-10-07 14:19:46 +02:00
0d6fe9d267
Merge pull request #1022 from DataDog/landerson/spring-analytics
...
Change default for Spring and Ratpack analytics to be off
2019-10-07 05:07:31 -04:00
b971a1ae25
Merge pull request #1021 from DataDog/landerson/couchbase-test-setup-spans
...
Another couchbase test race condition
2019-10-07 05:01:22 -04:00
95ec44942f
Remove unused variables
2019-10-04 16:40:15 -04:00
6f4ff22af2
Update tests to play nice with latest version
2019-10-04 15:48:33 -04:00
831fa5c0fd
Disable ratpack events by default
2019-10-04 11:41:41 -04:00
ecc2ee7955
Change default for spring analytics to be off
2019-10-04 11:41:41 -04:00
6203091640
Wrap class setup spans in a trace for another race condition
2019-10-04 11:40:53 -04:00
f785fb2314
Pin spring-kafka at 2.2
...
Pinning spring-kafka @ 2.2 to fix breaking changin in spring-kafka-test 2.3
2019-10-03 16:53:39 -04:00
001d1d8282
codenarc
2019-10-02 14:39:20 -04:00
dfcf9c6abd
Enabling spring-data integration in test
...
Enabling the spring-data integration in this test
Mostly, this introduces an extra span for the repository; however, it also connects some previously separate traces under the repository action.
2019-10-02 14:21:35 -04:00
78f203638e
Introduced lazy proxy around DocRepository
...
To shift the set-up timing without adding a lot of ugly code (as I did previously), I introduced a lazy dynamic proxy around the repository.
I'm not really happy with this, but I consider it better than the prior approach. There is also probably a more "groovy" way to do this.
As before, this change is itself non-functional. The subsequent test will enable spring-data instrumentation and alter the test.
2019-10-01 17:44:31 -04:00
85240a95ae
Revert "Changing test set-up timing"
...
This reverts commit 0dc63d7d3c
2019-10-01 16:16:52 -04:00
0dc63d7d3c
Changing test set-up timing
...
@Shared runs before the spring-data instrumentation is enabled.
Switching to more explicitly set-up code to change the timing; however, this change doesn't enabled spring-data instrumentation to keep this non-functional.
2019-10-01 16:16:44 -04:00
ec9e220f76
Cleaning up gradle file
...
After seeing the existing elasticsearch 5.3 spring data test, I decided to extend that instead.
However, I do think we need to revisit the best place for tests involving multiple pieces of instrumentation.
2019-10-01 14:07:23 -04:00
02c2d43b80
spring-data -> spring-data-1.9
...
Changing directory name to spring-data-1.9 to reflect version restrictions as per review comments
2019-09-30 15:58:13 -04:00
8b42d286e8
Removing unnecessary test code
...
Removing unnecessary test code left over from initial port integration
2019-09-30 14:21:24 -04:00
aeef4f4203
Removing unused dependency
2019-09-30 14:20:49 -04:00
3780cec4f2
Adding setAsync
...
Adding setAsync as per review comment
2019-09-30 13:50:53 -04:00
1b1cc34ba5
Switching setResourceName -> setTag
...
Per view comment, switching setResourceName -> setTag
2019-09-27 16:01:50 -04:00
48b701877a
googleJavaFormat
2019-09-27 13:55:32 -04:00
b91648d0e3
googleJavaFormat
2019-09-27 09:40:32 -04:00
ac557ed4ee
operationName -> resourceName
...
Addressing review comments: operationName -> resourceName
This was vestige of the original SignalFX code
2019-09-26 14:56:50 -04:00
d192811419
Fixing muzzle version
2019-09-26 14:45:29 -04:00
5cb0cc7c79
Preparing for ElasticSearch test
...
Adding spring-data-elasticsearch dependency just to make sure everything plays nice together
2019-09-26 09:57:40 -04:00
56cebb1c0b
Switched to extending JpaRepository
...
Switched to extending JpaRepository rather than CrudRepository, so that multiple spring data integrations can coexist.
Since JpaRepository redefines findAll, this required one update to the test. The other references to CrudRepositopry remain unchanged since JpaRepository extends CrudRepository without redefining those methods.
2019-09-26 09:46:53 -04:00
4d287c63bf
googleJavaFormat
2019-09-26 09:31:28 -04:00
45f6edfa6e
/ -> .
2019-09-26 09:30:04 -04:00
eb05fc7bc4
Adjusting support version of spring-data
...
Rather than using a somewhat ugly solution of implementing both postProcess method signatures.
I'm restricting the integration to newer versions (1.9 - Sept 2014) of spring-data to start.
2019-09-26 09:29:45 -04:00
088878f1d0
Use tracer from field instead of GlobalTracer
2019-09-25 19:04:46 -07:00
3b14a1cacd
Simplify @Bean annotation
2019-09-25 17:05:59 -04:00
1e8af55d57
Fixed typo
2019-09-25 16:57:24 -04:00
64a5fd61f9
Tinkering with version compatibility
...
RepositoryProxyPostProcessor has different method sigs depending on the version of spring-data-commons.
As stop gap implemented both signatures, but probably need to split spring-data support by version.
2019-09-25 16:50:45 -04:00
59416bf521
Prefix with Jpa
2019-09-25 16:24:27 -04:00
682cc40a32
PersistenceConfig -> JpaPersistenceConfig
2019-09-25 16:03:11 -04:00
d0cf564f07
spring -> spring.jpa
...
Moved spring to spring.jpa to make room for other spring data integrations.
2019-09-25 15:59:43 -04:00
64e3ebca88
Adding license clause
2019-09-24 10:32:20 -04:00
02c7e5b98b
Renamed variable
...
Renamed transactionalMethod to just method, since this is no longer tied to spring-tx
2019-09-23 16:32:57 -04:00
680c4426bc
Changing muzzle spec to depend on spring-data again
2019-09-23 16:14:56 -04:00
a242e088de
codeNarc - removed unused import of @Shared
2019-09-23 15:54:44 -04:00
8a89547004
googleJavaFormat
2019-09-23 15:29:15 -04:00
6b5acc8386
New Approach - instrument RepositoryFactorySupport
...
This revised version targets spring-data RepositoryFactorySupport rather than spring-tx
This is accomplished by injecting a RepositoryProxyPostProcessor during construction that adds a datadog specific MethodIntercptor.
In the end, this functions similarly to the tx support in that it uses a widely scoped MethodInterceptor.
This required some changes to the test as well. The old test set-up the repository before the instrumentation was fully-enabled. Enabling the instrumentation earlier capture extra traces where Spring JPA performs metainfo queries.
2019-09-23 15:26:18 -04:00
31a7ce9b5b
Explicitly cleanup the spans for each test
2019-09-20 18:32:48 -04:00
8289ccd085
Skip CompletableFuture case in Java 7
2019-09-20 12:11:30 -07:00
363dd38d81
Add CompletableFuture$ThreadPerTaskExecutor to allow list
...
This allows trace propagation for CompletableFuture’s asyncPool even if `useCommonPool` is disabled.
Also added some additional futures to `WHITELISTED_FUTURES` and sorted list.
2019-09-20 11:08:10 -07:00
e6c061f841
Merge pull request #996 from DataDog/landerson/couchbase-op-id
...
Add operation id and network tags to Couchbase
2019-09-19 15:56:59 -04:00
18e4b5e9fd
Remove unnecessary muzzle
2019-09-19 15:38:53 -04:00
40a7ef6086
Merge pull request #1005 from DataDog/tyler/additional-executors
...
Fix async dispatch for Jetty QueuedThreadPool
2019-09-19 12:15:37 -07:00
53b02fb333
Merge pull request #1002 from DataDog/mar-kolya/enable-tests-for-java13
...
Enable tests for java13
2019-09-19 12:28:00 -04:00
43603e970c
Disable Log4j1 tests for java versions without '.'
...
Log4j1 seems to be broken on those.
2019-09-19 08:27:56 -04:00
de44a0651c
Fix async dispatch for Jetty QueuedThreadPool
...
Includes additional cleanup to supported executors list (removed anonymous classes).
2019-09-18 20:08:06 -07:00
43cbf7a16a
Split traces and add timeout to blockUntilChildSpanFinished
2019-09-18 17:14:52 -04:00
85ffafcd06
Updates based on pull request comments
2019-09-18 10:29:24 -04:00
2086664f6d
Reduce overhead of URLAsResourceName decorator
...
Using `new URL()` just to parse the path out was rather expensive. This should improve the situation.
2019-09-17 18:50:01 -07:00
80185f76f4
Enable async propagation in JAX annotation span
2019-09-17 11:35:10 -07:00
0774933414
All couchbase tests have to be runUnderTrace for sorting
2019-09-17 13:53:03 -04:00
cfd96850e0
Merge pull request #998 from DataDog/mar-kolya/avoid-unnecessary-objects-in-apache-client-instrumentation
...
Avoid unnecessary objects creation in Apache Http Client instrumnentation
2019-09-17 12:16:10 -04:00
e9fc866e67
Add optimization to apache async client instrumentation
2019-09-17 11:47:57 -04:00
f14bfe7803
Merge pull request #990 from DataDog/tyler/spring-web
...
Migrate spring-web to base httpserver test
2019-09-17 08:24:37 -07:00
7c5e74bdf0
Cleaning-up decorator
...
The SpringDataDecorator is really for Spring transactions including non-DB related transactions.
The SpringDataDecorator never really implemented DB or ORM support anyway, since most of the methods just returned null.
Changing the decorator to just extend ClientDecorator instead. Also rename to reflect its true purpose.
2019-09-17 10:51:30 -04:00
0748c10b72
Avoid unnecessary objects creation in Apache Http Client instrumnentation
2019-09-17 10:19:38 -04:00
172ff747cb
Updating muzzle spec
...
Switching muzzle to target spring-tx rather than spring-data (which is logical given the instrumentation point)
Also added extraDependency on aopalliance
This restricts the support the Spring 2.5 when spring-tx & spring-aop using aopalliance were introduced.
2019-09-17 10:06:43 -04:00
e43baf82be
Renaming advice class
...
Renaming advice class to more accurately reflect what is being instrumented
2019-09-17 09:27:39 -04:00
85389b48d8
Google Format
2019-09-17 08:24:57 -04:00
0c3e0579b2
Switching to instrumenting transaction support
...
After experimenting with RepositorySupport$QueryExecutorMethodInterceptor switched to TransactionInterceptor.
QueryExecutorMethodInterceptor was too narrowly scoped and didn't capture the UPDATE or DELETE statement. TransactionInterceptor captures everything, but is still a bit more broadly applicable than I'd like.
2019-09-17 08:19:42 -04:00
8376d83aef
Caching affects network tags
2019-09-16 18:34:23 -04:00
111c44d2da
State can be GCd before exit advice is run
2019-09-16 17:58:29 -04:00
62ea7a59fb
Cant test cross compile because the 2.6 instrumentation gets activated
2019-09-16 17:37:34 -04:00
e244ea633d
Add operation id and network tags to couchbase
2019-09-16 16:59:29 -04:00
122533fde6
Switching to simple concat for efficiency
2019-09-16 11:08:37 -04:00
6a40938fe4
Split remove test into two parts
2019-09-13 18:56:00 -04:00
d3ec72922e
Increasing the timeout may fix the spurious failures
2019-09-13 18:35:21 -04:00
fee58e07f2
Original merge
2019-09-13 17:48:22 -04:00
d063b42491
Revert "Couchbase Async Subscriptions"
2019-09-13 11:51:52 -04:00
e8d6928a8c
Dont share environment. Slower but more deterministic
2019-09-12 21:48:36 -04:00
4e5e75ebff
Fix tests
2019-09-12 20:51:50 -04:00
407c973029
Migrate spring-web to base httpserver test
...
Unfortunately 404 test was not consistent and non-trivial to adapt. I also couldn’t get the validation tests to work well either. Revisit if we have time to dig deeper into spring.
2019-09-12 17:28:12 -07:00
6c445ad030
Extract RxJava instrumentation from Hystrix and add to Couchbase
2019-09-11 19:25:08 -04:00
a5b5b0c307
Failing tests WIP
2019-09-11 19:25:08 -04:00
df0838070a
Extract span assertion from couchbase tests
2019-09-11 19:25:08 -04:00
d2ba6af80c
Removing unneecessary dependencies
...
Removing dependencies rendered redundant by clean-up in datadog repo - as per review comment
2019-09-11 14:29:34 -04:00
ab52988ced
Removing "Modified by SignalFx"
2019-09-11 11:33:14 -04:00
60e9cc249c
Removing "Modified by SignalFx"
...
Removing "Modified by SignalFx" comments, since our integration is current the same.
Added a comment to SpringJpaTest explaining the differences.
2019-09-11 11:23:49 -04:00
7a366f0f01
Added explanatory comments to test
...
Added some explanatory comments for each span -- might turn these into assertions later
Primary aim was to understand the differences from the signalfx fork. They seem to stem deviations in the underlying JDBC integration.
2019-09-11 09:55:40 -04:00
07b58e1cf4
Merge pull request #957 from DataDog/landerson/instrumentation-module-check
...
Java 9 Modules Smoketest
2019-09-10 19:56:12 -04:00
1335296975
Fixing mismatches in spans collected by signalfx fork & datadog
...
There are two main differences...
- "hsqldb" vs "spring-data" as the root test service name
- an extra seemingly spurious sql span in signalfx
2019-09-10 17:42:49 -04:00
6d38831252
Merge branch 'master' into dougqh/spring-data
...
Tweak partially picked from signalfx -- that commit included same other unwanted changes in this file and others (see 636c23ed2c
2019-09-10 17:40:36 -04:00
5f7e0609ed
Initial spring data instrumentation
2019-09-10 15:13:20 -04:00
0681739ceb
Merge pull request #980 from marcoferrer/grpc-interceptor-error-tag
...
Fix span error tagging in grpc server interceptor
2019-09-09 15:58:47 -07:00
bcfb2ac3e7
run formatter
2019-09-06 19:58:57 -04:00
8ee5d8ddc0
assert status code tag in streaming tests
2019-09-06 19:17:36 -04:00
f587011238
add TracingServerCall to helper class names
2019-09-06 18:48:44 -04:00
57e03cc9ea
update tests for new tags
2019-09-06 18:42:40 -04:00
61d85d997a
add comments for tracing call forwarder
2019-09-06 18:42:11 -04:00
b0074495f9
update tests for server error tag
2019-09-06 16:35:19 -04:00
b547886a0d
introduce tracing call forwarder
2019-09-06 14:58:58 -04:00
6ac07abe2b
fix span error tagging in grpc server interceptor
2019-09-06 12:25:31 -04:00
cd6dcf393b
Apply fixed default operation name for @Trace generated spans
...
This should help reduce issues with multiple top level spans.
2019-09-05 16:21:27 -07:00
c410f5b78b
Add additional tags for aws-sdk spans
...
s3 -> bucket name
dynamodb -> table name
sqs -> queue name/url
kinesis -> stream name
2019-09-04 12:41:45 -07:00
3323bbc5b1
java.sql classes are not always present
2019-09-04 13:11:03 -04:00
457410ea4e
Run all tests on all java version
2019-09-03 13:03:16 -04:00
a693c42dc1
Merge pull request #969 from DataDog/labbati/jax-rs-op-name
...
Static operation names for JaxRS instrumentation to be used as root span
2019-08-30 14:09:46 -04:00
aec22640f3
Remove unused method and finish comment
...
Also adjust naming slightly.
2019-08-30 13:52:54 -04:00
0b0d75bcf2
Jax-rs user METHOD PATH as resource only when root span
2019-08-30 19:28:55 +02:00
0b71c6bbe5
Rename operation jax-rs.endpoint to jax-rs.request
2019-08-30 17:57:03 +02:00
d877039fa7
Set span.type = web on jax-rs endpoints
2019-08-30 13:57:30 +02:00
359ac9c190
Fix indentation in JaxRS instrumentation test
2019-08-30 13:05:24 +02:00
d9f09e6af5
Minor refacotrings to JaxRsAnnotationsInstrumentation.java
2019-08-30 12:23:41 +02:00
37dcfe5385
Use static operation names for JaxRS instrumentation
2019-08-30 12:18:41 +02:00
09ad2374cf
Disable Grizzly instrumentation by default
...
Otherwise it can interfere with the more common Servlet instrumentation (changing the root span name).
Unify attribute/property name for saving span on a request/context.
Also add tests for embedded GlassFish.
2019-08-27 13:27:57 -04:00
3f29e72317
Merge pull request #960 from DataDog/landerson/module-reference-fix
...
Ensure injected modules can read helper class modules
2019-08-27 12:42:34 -04:00
5f0e13f6c4
Merge pull request #956 from DataDog/tyler/play-testing
...
Update Play instrumentation to work with 2.7
2019-08-27 12:22:25 -04:00
263c442bdb
Fix order of operations
2019-08-27 12:06:21 -04:00
7a41ca7d6e
Change whitelist fields from static to instance
2019-08-27 12:06:01 -04:00
25c0d19f23
CodeNarc complains about the unused variable
2019-08-26 11:19:03 -04:00
7b66a31d80
Ensure injected modules can read the helper class module
2019-08-23 19:14:10 -04:00
9c5766162a
Add test for ClassNotFound creating a span bug
2019-08-23 13:04:56 -04:00
e74167adf2
Update Play instrumentation to work with 2.7
...
(Don’t be surprised when things break with 2.8… They’re religious about removing deprecated methods on minor release versions. If they followed standard convention, they’d likely be on at least 11.x.)
Add client test for 2.4-2.5 http library. 2.6+ won’t work because the underlying frameworks we instrument are shaded.
Also add server tests. We could do a lot more testing since it seems play still supports using Netty as the backing server even though it’s not the default. It’s difficult to do extensive testing though because they have so many breaking changes between versions.
2019-08-22 12:43:13 -07:00
e69edaec14
Remove project config centrally defined and other misc cleanup
2019-08-22 12:43:13 -07:00
28f4038122
Be more specific about thread assertion.
2019-08-20 09:43:27 -07:00
76c98598e2
Merge pull request #949 from DataDog/tyler/ratpack-testing
...
Improve Ratpack context propagation and migrate tests
2019-08-16 14:03:39 -07:00
452a619b4b
Muzzle doesn’t seem to like those helper classes there
...
Had to move them externally for muzzle to be happy.
2019-08-16 10:10:09 -07:00
3958cebecf
Merge pull request #953 from DataDog/tyler/grpc-client-async
...
Enable async propagation for grpc client callbacks.
2019-08-16 09:38:55 -07:00
fc30b4c5bb
CR fixes.
2019-08-16 09:22:44 -07:00
8c490a42a2
Improve Ratpack context propagation and migrate tests
2019-08-16 09:17:50 -07:00
473aca7c08
Merge pull request #948 from DataDog/tyler/grizzly
...
Add instrumentation and tests for Grizzly 2.x Http Server
2019-08-16 09:06:58 -07:00
20277f5f4a
Minor CR fixes.
2019-08-16 08:47:52 -07:00
b69f9ea041
Enable async propagation for grpc client callbacks.
2019-08-15 17:12:32 -07:00
63cd73e79e
Remove obsolete check
...
We are no longer using UrlConnection to send traces
2019-08-14 16:46:31 -04:00
b0ff861392
Do not trace openConnection for Datadog ClassLoader
2019-08-14 16:46:23 -04:00
f5b73260ed
Add instrumentation and tests for Grizzly 2.x Http Server
2019-08-13 16:05:11 -07:00
ab623ab7b4
Merge pull request #942 from DataDog/tyler/http-server-testing
...
Jetty 8 test migration and ignoreParent
2019-08-13 13:07:18 -07:00
bbfd02befc
Update Jackson to 2.9.9.3
...
As recommended by https://nvd.nist.gov/vuln/detail/CVE-2019-14379
(Remove unused dependency)
2019-08-12 16:41:57 -07:00
2d08464be3
Fixes
2019-08-07 10:48:14 -07:00
6dd729b843
Jetty 8: ignore parent and move to HttpServerTest
...
This method of using jetty doesn’t seem to work with Servlet’s Async. Native Jetty uses Continuations which we don’t support and should investigate instrumenting.
2019-08-07 09:35:04 -07:00
49249c0c6e
Move server field to HttpServerTest
2019-08-07 08:35:18 -07:00
f3e9fa22ef
Add HttpServerTest for redirects
2019-08-07 08:35:18 -07:00
548e4ed6e4
Merge pull request #934 from DataDog/landerson/remove-temp-jars
...
Eliminate temporary jars for instrumentation, jmxfetch, and bootstrap
2019-08-06 18:32:41 -04:00
1cfa847081
Merge pull request #941 from DataDog/tyler/common-deps
...
Remove common (redundant) dependencies
2019-08-06 15:29:14 -07:00
dougqh
Laplie Anderson
Tyler Benson
Laplie Anderson
Nikolay Martynov
Ryan Fitzpatrick
Marco Ferrer
Luca Abbati