Commit Graph

3238 Commits

Author SHA1 Message Date
dougqh 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
dougqh 85240a95ae Revert "Changing test set-up timing"
This reverts commit 0dc63d7d3c.
2019-10-01 16:16:52 -04:00
dougqh 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
dougqh 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
dougqh 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
dougqh 8b42d286e8 Removing unnecessary test code
Removing unnecessary test code left over from initial port integration
2019-09-30 14:21:24 -04:00
dougqh aeef4f4203 Removing unused dependency 2019-09-30 14:20:49 -04:00
dougqh 3780cec4f2 Adding setAsync
Adding setAsync as per review comment
2019-09-30 13:50:53 -04:00
Tyler Benson 9771a6c90f
Merge pull request #1009 from DataDog/tyler/integ-core-update
Update integrations core submodule to 6.14.0
2019-09-27 15:25:22 -07:00
Tyler Benson 91cbb67f6e
Merge pull request #1016 from DataDog/tyler/parse-optimization
Minor optimization to avoid using BigInteger if possible
2019-09-27 15:24:10 -07:00
Tyler Benson 23e058e803
Merge pull request #1015 from DataDog/tyler/use-tracer
Use tracer from field instead of GlobalTracer
2019-09-27 15:23:29 -07:00
Tyler Benson 82d60c27f4 Fix codeNarc 2019-09-27 15:04:41 -07:00
dougqh 1b1cc34ba5 Switching setResourceName -> setTag
Per view comment, switching setResourceName -> setTag
2019-09-27 16:01:50 -04:00
dougqh 48b701877a googleJavaFormat 2019-09-27 13:55:32 -04:00
dougqh b91648d0e3 googleJavaFormat 2019-09-27 09:40:32 -04:00
dougqh ac557ed4ee operationName -> resourceName
Addressing review comments: operationName -> resourceName

This was vestige of the original SignalFX code
2019-09-26 14:56:50 -04:00
dougqh d192811419 Fixing muzzle version 2019-09-26 14:45:29 -04:00
dougqh 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
dougqh 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
dougqh 4d287c63bf googleJavaFormat 2019-09-26 09:31:28 -04:00
dougqh 45f6edfa6e / -> . 2019-09-26 09:30:04 -04:00
dougqh 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
Tyler Benson 088878f1d0 Use tracer from field instead of GlobalTracer 2019-09-25 19:04:46 -07:00
Tyler Benson 05c95100ab Minor optimization to avoid using BigInteger if possible 2019-09-25 18:14:40 -07:00
Laplie Anderson ed7165acc7
Merge pull request #1010 from DataDog/landerson/couchbase-n
Fix Couchbase tests: attempt i+1
2019-09-25 15:41:01 -07:00
dougqh 3b14a1cacd Simplify @Bean annotation 2019-09-25 17:05:59 -04:00
dougqh 1e8af55d57 Fixed typo 2019-09-25 16:57:24 -04:00
dougqh 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
dougqh 59416bf521 Prefix with Jpa 2019-09-25 16:24:27 -04:00
dougqh 682cc40a32 PersistenceConfig -> JpaPersistenceConfig 2019-09-25 16:03:11 -04:00
dougqh 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
Douglas Q Hawkins 83d4dcc4ae
Merge pull request #1013 from DataDog/dougqh/tracescope-doc-quickfix
when -> which
2019-09-25 15:22:31 -04:00
dougqh 64e3ebca88 Adding license clause 2019-09-24 10:32:20 -04:00
dougqh c08ea1ff73 when -> which 2019-09-24 09:33:01 -04:00
dougqh 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
dougqh 680c4426bc Changing muzzle spec to depend on spring-data again 2019-09-23 16:14:56 -04:00
dougqh a242e088de codeNarc - removed unused import of @Shared 2019-09-23 15:54:44 -04:00
dougqh 8a89547004 googleJavaFormat 2019-09-23 15:29:15 -04:00
dougqh 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
Laplie Anderson 31a7ce9b5b Explicitly cleanup the spans for each test 2019-09-20 18:32:48 -04:00
Tyler Benson e977711e78
Merge pull request #1008 from DataDog/tyler/thread-per-task
Add CompletableFuture$ThreadPerTaskExecutor to allow list
2019-09-20 12:33:28 -07:00
Tyler Benson 668649f62e Update integrations core submodule to 6.14.0
https://github.com/DataDog/integrations-core/tree/6.14.0

https://github.com/DataDog/integrations-core/search?q=jmx_metrics
2019-09-20 12:19:44 -07:00
Tyler Benson 8289ccd085 Skip CompletableFuture case in Java 7 2019-09-20 12:11:30 -07:00
Tyler Benson 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
Laplie Anderson 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
Laplie Anderson 18e4b5e9fd Remove unnecessary muzzle 2019-09-19 15:38:53 -04:00
Tyler Benson 40a7ef6086
Merge pull request #1005 from DataDog/tyler/additional-executors
Fix async dispatch for Jetty QueuedThreadPool
2019-09-19 12:15:37 -07:00
Laplie Anderson 607f1b0a86
Merge pull request #1003 from DataDog/landerson/cleaner-test-fix
Cleaner test timeout fix
2019-09-19 15:02:35 -04:00
Nikolay Martynov 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
Nikolay Martynov 43603e970c Disable Log4j1 tests for java versions without '.'
Log4j1 seems to be broken on those.
2019-09-19 08:27:56 -04:00