Commit Graph

1970 Commits

Author SHA1 Message Date
Andrew Kent 20b726bca7
Merge pull request #609 from DataDog/ark/aws-muzzle-ranges
Simplify AWS muzzle ranges
2018-11-30 18:53:05 +00:00
Andrew Kent 91f1bef6f4 Simplify AWS muzzle ranges
AWS Muzzle workaround is no longer needed with latest muzzle
optimizations.
2018-11-29 16:18:14 -08:00
Nikolay Martynov 8511fad147
Merge pull request #564 from DataDog/mar-kolya/executor-instrumentation-context-map
Make executor instrumentation using context storage
2018-11-29 15:34:12 -08:00
Nikolay Martynov 2e8dc9d08f Fix Ratpack tests that got broken by ExecutorInstrumentation refactoring
It turns out closing continuation also closes parent span. This is not
very good in cases when we end up not using continuation if
continuation in a state has already been setup.

This patch provides way to close continuation in a way that doesn't
affect parent scope.
2018-11-29 15:21:46 -08:00
Nikolay Martynov 4ec5ca394c Add code to wrap future returned by submit(Runnable) call 2018-11-29 15:18:46 -08:00
Nikolay Martynov 177c1432e3 Add tests to verify that fields are not injected when feature is disabled 2018-11-29 15:18:46 -08:00
Nikolay Martynov ad98ebc01f Add some comments and some other minor CR tweaks 2018-11-29 15:18:46 -08:00
Nikolay Martynov 1509286b15 Remove MapBackedProvider 2018-11-29 15:18:46 -08:00
Nikolay Martynov 118a61cc67 Add field backed context provider 2018-11-29 15:18:46 -08:00
Nikolay Martynov b89e73b3c0 Switch executor instrumentation to use context storage 2018-11-29 15:18:46 -08:00
Tyler Benson f47ed232f9
Merge pull request #607 from DataDog/tyler/misc
Misc small changes
2018-11-29 14:54:56 -08:00
Tyler Benson 442323d4d1 Add catch so instrumentation errors don’t interrupt primary execution. 2018-11-29 13:14:12 -08:00
Tyler Benson c9ec9ebd0f Add guard against null values in extract adapter. 2018-11-29 13:06:01 -08:00
Tyler Benson ae063e8a14 Add additional 404 tests for spring boot.
This one succeeds in applying routing, but returns a 404 response.
2018-11-29 11:32:49 -08:00
Tyler Benson 785860b6a7 Add null check for envelope in consumer delegate 2018-11-29 11:22:32 -08:00
Andrew Kent 1671a4560b
Merge pull request #601 from DataDog/ark/muzzle-gradle-plugin-memory-leak
Fix Muzzle Gradle Plugin Memory leak and optimize JVM for muzzle runs
2018-11-29 17:49:53 +00:00
Andrew Kent 3c4b480a18 Share tooling loader across muzzle runs 2018-11-28 13:01:01 -08:00
Andrew Kent e0d00078f9 Assert muzzle tooling invocations do not create orphaned dd threads 2018-11-28 12:05:47 -08:00
Andrew Kent 8cb9487546 Tune gradle JVM's max metaspace 2018-11-28 12:05:47 -08:00
Andrew Kent 6ee5fd27b0 Guard against invoking WeakConcurrent constructor 2018-11-28 12:05:47 -08:00
Tyler Benson 66b625c6a2
Merge pull request #604 from DataDog/tyler/rethrow-exception
Consumer delegate should rethrow the exception
2018-11-28 09:31:43 -08:00
Tyler Benson 2f319b9301 Consumer delegate should rethrow the exception
Previously the delegate would swallow the exception and not rethrow.

I also added a test to attempt to verify, but the exception doesn’t seem to be observable in the test.

(See #602)
2018-11-28 08:36:15 -08:00
Nikolay Martynov 1060429ba4
Merge pull request #595 from DataDog/mar-kolya/servlet-instrumentation-fixes
Servlet3 instrumentation race condition fixes
2018-11-27 17:45:20 -08:00
Nikolay Martynov e87d4ef161 Servlet3 instrumentation race consition fixes
* Do not set `asyncPropagate` on scope since it will be closed anyway.
* Close span once done with it in `TagSettingAsyncListener`.
* No point in explicit finishing span in 'finishOnClose' scope.
* Do not reattach listener in
  `TagSettingAsyncListener#onStartAsync`. Listener is attached each
  time by `Servlet3Advice#stopSpan` and reattaching listener in
  `TagSettingAsyncListener#onStartAsync` causes multiple listeners to
  be attached and race conditions to happen.
* Do not close span in `AsyncContextInstrumentation`. This leads to
  span being written prematurely. This span will be closed in
  `TagSettingAsyncListener` anyway, along with adding proper status code.
2018-11-27 17:17:56 -08:00
Tyler Benson e46ab1d01d
Merge pull request #600 from DataDog/tyler/threadpool-errors
Improve error handling for ThreadPoolExecutorInstrumentation
2018-11-27 15:24:58 -08:00
Tyler Benson 2ab75e3e0b
Merge pull request #599 from DataDog/tyler/es-rest-test-fix
Remove ES-transport instrumentation from rest test
2018-11-27 15:22:25 -08:00
Tyler Benson 4199f924ac Remove ES-transport instrumentation from rest test
It is generating an extra trace/span that in a realistic scenario would be generated by the server, not the client.
2018-11-27 13:02:44 -08:00
Tyler Benson 468ccab99a Improve error handling for ThreadPoolExecutorInstrumentation
If other exceptions are thrown when trying to test the queue, it generates lots of log noise.  This should handle it better.
2018-11-27 11:28:44 -08:00
Andrew Kent 1535a9ae38
Merge pull request #598 from DataDog/ark/revert-jmx-service-tagging
Revert "Add service name to default jmx tags"
2018-11-27 17:08:01 +00:00
Nikolay Martynov 6f61ddc67d
Merge pull request #594 from DataDog/mar-kolya/es-tests-stability
Improve stability of ES tests by avoiding unpredictable spans
2018-11-26 22:50:43 -08:00
Gary Huang ca2fae5e8e
Merge pull request #574 from DataDog/gary/remove-versionscan
Retire/remove version scan
2018-11-26 19:32:14 -05:00
Gary 90777f4b39
Retire/remove version scan
Remove version scan dead code and unnecessary classLoaderMatcher methods in instrumentations. Depends on #572
2018-11-26 18:21:56 -05:00
Andrew Kent 5bbc76f7b9
Merge pull request #572 from DataDog/gary/refactor-ratpack
Refactor Ratpack
2018-11-26 23:04:50 +00:00
Gary 477c2f92c8
Address comments and add onClose callback on context to close scope. 2018-11-26 17:26:48 -05:00
Gary 50c2af9abb
remove classloader matcher 2018-11-26 16:57:12 -05:00
Gary 51978d877f
remove version scan task from ci 2018-11-26 16:57:10 -05:00
Gary bf30d73746
remove skipping of ratpack helper checks 2018-11-26 16:55:36 -05:00
Gary 4169e42cdc
replace version scan with muzzle block 2018-11-26 16:55:33 -05:00
Gary 6475f20308
Refactor Ratpack
Remove the use of the OT project and Execution managed scopes. Updated tests.
2018-11-26 16:55:18 -05:00
Andrew Kent 069880105d Revert "Add service name to default jmx tags"
This reverts commit 1d2cc52747.
2018-11-26 13:53:59 -08:00
Nikolay Martynov 467f14c359 Small fix in ES tests 2018-11-26 13:07:42 -08:00
Andrew Kent cf033baf7e
Merge pull request #591 from henry-megarry/master
implementing add reference to work with opentracing-spring-cloud-starter
2018-11-26 20:06:06 +00:00
Andrew Kent 1b1527da93
Merge pull request #596 from DataDog/mar-kolya/set-gradle-heap
Mar kolya/set gradle heap
2018-11-26 19:39:40 +00:00
Andrew Kent 803309ad81
Merge pull request #593 from DataDog/mar-kolya/fix-kafka-latest-deps-tests
Do not force latest kafka-clients version since it may be incompatibl…
2018-11-26 17:54:34 +00:00
Nikolay Martynov ed5692871d Properly limit heap size for gradle child processes 2018-11-23 09:44:50 -05:00
Nikolay Martynov 80cd7cd500 Do testAnnotationProcessor deps.autoservice in modules with services in tests
Otherwise sometimes tests cannod discover services
2018-11-23 09:44:49 -05:00
Nikolay Martynov ec24b8954a Update io.franzbecker.gradle-lombok plugin 2018-11-23 09:44:49 -05:00
Nikolay Martynov 23203fb659 Improve stability of ES tests by avoiding unpredictable spans 2018-11-23 09:43:41 -05:00
Nikolay Martynov 7dae6df890 In kafka latest deps test make sure that kafka version matches kafka client libs
This seems to help with compatibility
2018-11-22 21:02:05 -05:00
Nikolay Martynov e7f4385b0a
Merge pull request #592 from DataDog/mar-kolya/fix-springweb-tests-logs
Fix setup so springweb tests produce appropriate logs
2018-11-21 16:56:39 -05:00