Commit Graph

176 Commits

Author SHA1 Message Date
Andrew Kent d703095717 Patch getLogger calls to safe logger. 2018-02-04 12:09:11 -08:00
Andrew Kent 8d53e4703d Set span.type for all integrations. 2018-01-31 16:13:41 -08:00
Andrew Kent 7920cc9d8e Set span.type tag 2018-01-31 12:22:43 -08:00
Tyler Benson c1f73c194e Prevent headers from being added for AWS client calls 2018-01-30 11:20:17 +10:00
Andrew Kent 09d4cc4f6d Use datadog prefix to configure test logger. 2018-01-24 14:01:23 -08:00
Tyler Benson 6fbe494934 Exclude tests that are Java 9 incompatible. 2018-01-23 14:59:10 -05:00
Tyler Benson 64d39030e5 Use workflows in Circle to test Java 7 and 8
Java 9 is commented out because there are some test failures that will be investigated later.

Some tests had to be excluded from Java 7 because they don’t have a Java 7 compatible version.
2018-01-22 13:46:50 -05:00
Tyler Benson b2b61e0c8c Changes required for supporting OT 0.31.0
Also updates all the contrib versions that we currently depend on to their 0.31.0 supporting versions.
2018-01-16 09:52:28 -05:00
Tyler Benson 6d3d88987b Rename dd-trace-annotations to dd-trace-api
And move DDTags over to it.
Move some `datadog.trace.api` classes over to `datadog.trace.common`.
Other misc renaming.
2018-01-09 10:07:36 +10:00
Tyler Benson becf2a5862 Lots of renaming
Module:
dd-trace -> dd-trace-ot

Packages:
Standardize on `datadog.trace` and `datadog.opentracing` as the package prefixes.
2018-01-09 10:02:06 +10:00
Andrew Kent 9437c8c2db Remove ExpensiveTest 2017-12-28 09:46:58 -08:00
Andrew Kent d0658085bf Convert Cassandra IntegrationTest to AgentTestRunner+spock 2017-12-28 09:46:58 -08:00
Andrew Kent ca574071ff New AgentTestRunner to auto-instrument spock tests 2017-12-28 09:46:58 -08:00
Tyler Benson e17660203f Missed one…
Also don’t need DDTracerFactoryTest anymore…
2017-12-21 16:47:41 -08:00
Tyler Benson 02460060bc Misc cleanup
Remove out of date “async-tracing” example since it’s more about byteman and no longer relevant.

Minor changes to improve the code test coverage…
2017-12-21 16:31:03 -08:00
Tyler Benson 4822c19c5d Remove legacy config references. 2017-12-21 16:28:18 -08:00
Andrew Kent f68406113a Remove helpers from agent 2017-12-18 16:44:12 -08:00
Andrew Kent 7f643ab680 Move jar utils to TestUtils 2017-12-14 18:40:40 -08:00
Andrew Kent 4d5c06b0e5 Fix codenarc 2017-12-11 08:17:59 -08:00
Andrew Kent 95550ac9d6 Save connection info after connection construction. 2017-12-11 08:17:59 -08:00
Andrew Kent 6a646009fa Test system class sibling classloader
Test cases where the classloader of the instrumented class cannot
resolve agent advice classes.
2017-12-08 09:34:16 -08:00
Tyler Benson 6f985c15bf Remove Byteman now that instrumentation is migrated
At some point, we should refactor the managers since this leaves them in an awkward state.
2017-12-07 13:11:26 -08:00
Tyler Benson 2e6ff44976 misc cleanup 2017-12-07 12:06:58 -08:00
Tyler Benson d933a4049a Move OkHttp instrumentation to byte buddy 2017-12-06 18:07:17 -08:00
Andrew Kent 4ebadf19de Use ratpack to implemented embedded http test util 2017-12-04 13:13:25 -08:00
Andrew Kent a7bfd1c4f5 Use CodeSource to test shadow package renames.
Forcing guava to version 18 prevented running the embedded ratpack
http server. Using codesource for the shadow test has the same effect
and doesn't require forcing a version of guava.
2017-12-04 11:42:26 -08:00
Andrew Kent cbd1d3c794 Convert Junit tests to Spock 2017-12-01 16:38:57 -08:00
Andrew Kent 6fa303058f ApacheHttpClient bytebuddy instrumentation and tests. 2017-12-01 10:54:32 -08:00
Andrew Kent f48b793cb4 TestHttpServer for http client testing. 2017-12-01 10:34:40 -08:00
Andrew Kent 54a830ba9e Enhance Cassandra trace testing. 2017-11-28 17:01:04 -08:00
Andrew Kent 637e27e88a Explicitly inject on httpclientbuilder's classloader 2017-11-28 14:27:46 -08:00
Andrew Kent 47b1eec6da Mongo Async Instrumentation and embedded mongo tests. 2017-11-27 09:18:49 -08:00
Tyler Benson 871ce37f80 Migrate JMS to Byte Buddy and add JMS 1 support
This does not yet include instrumentation for MessageListener.
I think there is actually no difference between the instrumentation so we should combine them.
I also added TEXT_MAP as a format that maps to the HTTP Codec.  There is some remapping inside the instrumentation to remove dashes before setting as a property.  This should also be changed when an official format is defined.

This also currently has a problem with Spring Boot applications as the JMS Util references classes not on the system classpath (it needs to be injected into the child classpath)
2017-11-17 12:06:30 -08:00
Andrew Kent 9cb097b783 Replace TracingCommandListener with DDTracingCommandListener 2017-11-13 10:34:07 -05:00
Tyler Benson 51f903acd6 Ensure helpers are injected on a classloader that has instrumented code. 2017-11-09 15:34:05 -05:00
Tyler Benson c2d1ebab17 Run cassandra test last in separate vm
It’s super slow and uses a lot of memory.
2017-10-30 14:48:49 -07:00
Tyler Benson cacba43435 Use byte buddy for @Trace instead of byteman. 2017-10-26 14:45:16 -07:00
Tyler Benson 25029b4109 Add integration tests for in-memory jdbc drivers. 2017-10-25 10:37:37 -07:00
Tyler Benson 526d7def3b Hardcode tag names, improve formatting 2017-10-13 16:32:13 +02:00
Tyler Benson f2d1f0c209 Capture and report errors and stacktraces 2017-10-13 16:32:13 +02:00
Tyler Benson 2775dd988e Hardcode additional tag names 2017-10-13 16:03:19 +02:00
Tyler Benson cffde51b9e Add funky locking to ensure consistent execution for jetty test. 2017-09-21 13:47:28 -07:00
Tyler Benson fb133c8905 Update servlet operation name. 2017-09-21 08:12:44 -07:00
Tyler Benson 30721d00dc Replace tomcat/jetty specific integ with generic servlet integ.
This should also work with things like Weblogic and Websphere with the main requirement being Servlet 2.3 or above compatibility.
2017-09-20 16:39:43 -07:00
Tyler Benson 9c39bb64ae Fix aws version in readme, add finals and reformatting 2017-09-18 10:49:08 -07:00
Tyler Benson b430eedb27 Prevent NPE for double registrations
When using jetty with spring boot, the helper is being called more than once, the second time resulting in null being returned by `addFilter`.  This should prevent an error from being thrown.
2017-09-13 13:00:25 -07:00
Tyler Benson 4e106679a7 Move packages around and rename dd-trace inside agent
This avoids conflicts if the user already has dd-trace included in their app.
2017-09-11 15:00:00 -07:00
Tyler Benson 3bc153241b Abstract core dependencies for central management 2017-09-07 16:38:21 -07:00
Tyler Benson 62c167de16 Inject helper classes into application’s classloader
This is important for things like Spring Boot’s executable jar classloader which keeps all the jars individually rather than on the system classloader.
2017-09-06 11:08:28 -07:00
Tyler Benson c238b9d25f Merge pull request #121 from DataDog/tyler/reduce-package-scan-scope
Speed up integ tests by reducing scope for annotation scan.
2017-09-06 07:51:50 -07:00
Tyler Benson a437b6d946 Log each test starting. 2017-09-05 16:44:55 -07:00
Tyler Benson 2d3a12f3f1 Speed up integ tests by reducing scope for annotation scan. 2017-09-05 16:35:32 -07:00
Tyler Benson 8ba3c0f156 Fix jacoco for integration tests
Also change slf4j package since it’s important for configuring log levels.
2017-09-05 11:43:37 -07:00
Tyler Benson db2758af19 Merge branch 'master' into tyler/versions
# Conflicts:
#	dd-java-agent/src/main/java/com/datadoghq/trace/agent/InstrumentationChecker.java
2017-08-23 09:08:40 -07:00
Tyler Benson bcb4aa5aa3 Merge pull request #108 from DataDog/tyler/ddja-test-deps
Remove dd-java-agent as a dependency for the integ test
2017-08-23 08:50:38 -07:00
Tyler Benson 0debc82d74 Remove dd-java-agent as a dependency for the integ test
This better simulates the classpath for an application where the agent is only added via the commandline.
2017-08-23 08:35:50 -07:00
Tyler Benson 55edba486a Order rules alphabetically and ensure matches. 2017-08-22 17:25:45 -07:00
Tyler Benson 34f0922740 Add property to gradle.properties for easier debugging
When using a jar with packages renamed, the line numbers don’t match the classes in the IDE.
2017-08-22 17:23:28 -07:00
Tyler Benson 5dff2f1249 Rename google and byteman dependencies
But exclude the ones that cause the tests to fail.
Also add a test to verify the correct version of guava is loaded with the agent running.
2017-08-08 12:29:14 -07:00
Emanuele Palazzetti c5c750bd49
[elasticsearch] remove auto instrumentation; will be added later 2017-08-02 17:42:01 +02:00
Tyler Benson ab791179ad Generate a random trace ID instead of copying the span ID 2017-07-31 11:45:56 -07:00
Guillaume Polaert 864db966f1 Close span when exception exit (#66) 2017-07-27 21:09:25 +02:00
Tyler Benson 02d8f153a6 Fix jar uploading to use shadow jar instead of default
Rename default jar to be explicit that no dependencies are embedded.
2017-07-20 09:58:22 -07:00
Tyler Benson 8420855deb Apply some additional inspections and quick-fixs 2017-07-19 08:09:19 -07:00
Tyler Benson e8dbc34bea Apply consistent formatting to other files 2017-07-19 08:09:19 -07:00
Tyler Benson 1edf4af213 Fix formatting 2017-07-17 12:01:36 -07:00
Tyler Benson 24bcb929c4 Merge branch 'master' into gpolaert/es 2017-07-17 11:28:09 -07:00
Guillaume Polaert b5051ae7c0 Disabling ES because the contribution throws a NPE. Waiting for the 0.0.3 release of the ES contrib (it's fixed) 2017-07-13 12:09:21 +02:00
Guillaume Polaert 4edff21599 Add test and support for ES 2017-07-13 11:18:19 +02:00
Tyler Benson 232801ab62 Another pass on improving the docs 2017-07-12 14:30:08 -07:00
Tyler Benson 2d89ee0d54 Apply automatic formatting
via `./gradlew googleJavaFormat`
2017-07-12 07:47:19 -07:00
Tyler Benson 840ada4650 Enable uploading to local artifactory. 2017-07-11 17:12:27 -07:00
Tyler Benson 8d9bdef4b7 Rename build.gradle scripts to match project name.
This will help in finding build scripts inside the IDE.
2017-07-10 16:12:15 -07:00
Tyler Benson b422ec7663 Apply minimum code coverage assertions
Improved the test coverage slightly in the process.
2017-07-10 14:24:11 -07:00
Tyler Benson dcdf6deb64 Ensure headers are never null
Null tracer version results in the request being rejected by the agent.

Also make the DDSpanBuilderTest.shouldBuildSpanTimestampInNano more reliable.
2017-07-07 16:42:27 -07:00
Guillaume Polaert 98a0c0d38b Typo 2017-07-07 12:15:19 +02:00
Guillaume Polaert f9b15a8d4c Fixing failling tests on CircleCi 2017-07-07 12:12:03 +02:00
Tyler Benson 5014eb4f8f Ignore failing test 2017-07-06 16:14:56 -07:00
Tyler Benson 95c7a5ac08 Finish updating gradle and remove maven pom's. 2017-07-06 15:56:32 -07:00
Guillaume Polaert 73ab3d36ab Keep sync Maven and Gradle 2017-07-04 10:57:47 +02:00
Guillaume Polaert 399c4cab80 Merge branch 'master' into gpolaert/new-shading 2017-07-04 10:15:51 +02:00
Tyler Benson bf15a139d5 Remove tagsKV from @Trace annotation 2017-07-03 16:14:35 -07:00
Guillaume Polaert f7b34d7deb Path has been changed. Fixing 2017-07-03 10:34:34 -07:00
Guillaume Polaert e0e808e4c4 Force skipping tests for the moment 2017-07-03 10:34:34 -07:00
Guillaume Polaert 5a582842ff fix shapping issues and pom refactoring 2017-07-03 10:34:34 -07:00
Guillaume Polaert 3159cef4ea Force skipping tests for the moment 2017-07-03 10:33:05 -07:00
Guillaume Polaert 359c0879f0 fix shapping issues and pom refactoring 2017-07-03 10:33:05 -07:00
Guillaume Polaert d3ce6b1a3e shading all stuff and removing from the scope all libs which can crash the app 2017-07-03 10:33:05 -07:00
Tyler Benson 5a6bd2d002 Add gradle build scripts.
Currently has issues with shadow jar due to Java 9 compiled classes inside byteman used by dd-java-agent.
2017-06-30 11:35:57 -07:00
Tyler Benson 050f73c55d Disable publish for non-artifact modules. 2017-06-28 11:57:46 -04:00
Tyler Benson 4de69c36b8 Review Fixes
Fix package names.
Revert oddness in pom file.
2017-06-28 11:14:32 -04:00
Tyler Benson cee31b4067 Rename packages for consistency 2017-06-27 16:34:32 -04:00
Tyler Benson b9690f9db8 Add circleci config file 2017-06-27 15:54:40 -04:00
Guillaume Polaert b824be1295 Adding JMS version + fix some previous artifacts 2017-06-20 18:24:47 -04:00
Guillaume Polaert ccb7904ccb [maven-release-plugin] prepare for next development iteration 2017-06-20 10:29:08 -04:00
Guillaume Polaert 40bb03fb96 [maven-release-plugin] prepare release v0.1.1 2017-06-20 10:29:03 -04:00
Guillaume Polaert 1a0df4c907 [maven-release-plugin] prepare for next development iteration 2017-06-15 17:51:12 +02:00
Guillaume Polaert 003bfa1eb2 [maven-release-plugin] prepare release v0.1.0 2017-06-15 17:51:05 +02:00
Guillaume Polaert 2b87051731 fixing things for the release 2017-06-15 17:45:48 +02:00
Guillaume Polaert 2cca7b0be5 fixing things for the release 2017-06-15 17:38:40 +02:00