Commit Graph

805 Commits

Author SHA1 Message Date
Tyler Benson ae3634d571 Merge pull request #120 from DataDog/tyler/split-manager
Split up manager responsibility by job
2017-09-06 07:49:32 -07:00
Tyler Benson c652aa262c Remove dependency on OpenTracing Agent
It brings in a bunch of duplicate and unnecessary dependencies since it also bundles them in its’ jar.  Copying the OpenTracingHelper class to our repo until we can refactor it away.  It also is Apache 2 licensed so I think we should be ok.
2017-09-05 16:48:22 -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 56fa0ac0fb Show stacktraces on error in CI. 2017-09-05 16:05:23 -07:00
Tyler Benson 3df63d9e53 Split up manager responsibility by job
`TraceAnnotationsManager` is responsible for generating the rules for `@Trace`ed methods, `InstrumentationRulesManager` is responsible for our custom built Integrations.
2017-09-05 13:52:11 -07:00
Tyler Benson 89f40e3276 Merge pull request #118 from DataDog/tyler/move-helpers
Move helpers to a separate project for future bundling
2017-09-05 13:49:32 -07:00
Tyler Benson a8908c06d8 Move helpers to a separate project for future bundling
This will allow us to eventually inject these classes in the correct classpath rather than having them on the system classpath.
2017-09-05 12:19:22 -07:00
Tyler Benson 4048e79d9b Merge pull request #119 from DataDog/tyler/jacoco
Fix jacoco for integration tests
2017-09-05 11:47:27 -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 c304bd5aea Merge pull request #117 from DataDog/tyler/misc
Turns out Byteman doesn’t like $this as a reference
2017-09-05 11:41:08 -07:00
Tyler Benson b85b7aed1d Turns out Byteman doesn’t like $this as a reference
Their docs were misleading.

Also fix the readme’s maven dependency.
2017-09-01 14:22:34 -07:00
Tyler Benson bc0bd51c8e Merge pull request #115 from DataDog/tyler/logging
Use package-renamed Simple SLF4J logger
2017-08-31 09:15:02 -07:00
Tyler Benson ec08b37757 Use package-renamed Simple SLF4J logger
This will prevent us from respecting any existing SLF4J implementation and just print to the console.  This is important for things like Spring Boot that never put a SLF4J implementation on the system classpath, but instead keep it inside the jar.
2017-08-28 14:57:46 -07:00
Tyler Benson 1808e38fd9 Merge pull request #114 from DataDog/tyler/version
Report version from main
2017-08-28 14:06:49 -07:00
Tyler Benson a0d4f2ca76 Report version from main
This allows running the agent as an executable jar to report the version number.

Also repot version scan errors better.
2017-08-28 13:39:19 -07:00
Tyler Benson 73f9dc823b Split out verifyVersionScan to speed build time 2017-08-25 15:14:24 -07:00
Tyler Benson f292baa4a4 Begin 0.2.2 2017-08-25 14:30:49 -07:00
Tyler Benson 6fd641b855 Skip verifyVersionScan for release build 2017-08-25 10:55:04 -07:00
Tyler Benson 307e774bb8 Version 0.2.1 2017-08-25 10:34:56 -07:00
Tyler Benson 10faa9ab89 Merge pull request #113 from DataDog/tyler/jetty
Add version checking via class/method for jetty
2017-08-24 17:41:13 -07:00
Tyler Benson 9a9da92b59 Add version checking via class/method for jetty 2017-08-24 17:38:16 -07:00
Tyler Benson 59d1be4ea7 Merge pull request #112 from DataDog/tyler/version-verify
Add version scan verification and test in CI
2017-08-24 17:20:48 -07:00
Tyler Benson 1b63a53167 Add version scan verification and test in CI 2017-08-24 17:15:22 -07:00
Tyler Benson 82a9c73c6b Merge pull request #111 from DataDog/tyler/servlet-async
Mark servlet trace filter as async supported
2017-08-24 07:47:15 -07:00
Tyler Benson 768e2bb52f Merge pull request #110 from DataDog/tyler/spring-boot
Ensure rules are loaded on the right classpath for Spring Boot
2017-08-24 07:46:37 -07:00
Tyler Benson 233d241e07 Mark servlet trace filter as async supported 2017-08-23 16:01:42 -07:00
Tyler Benson ab7598804e Update dropwizard and spring boot readmes. 2017-08-23 15:35:55 -07:00
Tyler Benson 9ff937557e Ensure rules are loaded on the right classpath for Spring Boot 2017-08-23 14:30:18 -07:00
Tyler Benson a89f417860 Merge pull request #104 from DataDog/tyler/versions
Replace version range scanning with classpath analysis
2017-08-23 09:14:51 -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 1104ab5dec Merge pull request #109 from DataDog/tyler/disable-relocation
Add property to gradle.properties for easier debugging
2017-08-23 08:38:12 -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 60cfb392c4 Fix grouping so any rule can allow module to be active. 2017-08-22 10:33:24 -07:00
Guillaume Polaert 82faf2dcb5 Merge pull request #107 from DataDog/gpolaert/more-log
Add more logs to debug
2017-08-22 15:36:01 +02:00
Guillaume Polaert 1086439da8 log as info level 2017-08-22 15:32:58 +02:00
Guillaume Polaert 78c99f4574 Add more logs to debug 2017-08-21 14:58:08 +02:00
Tyler Benson aad3746c2b Fix tests 2017-08-18 11:12:06 -06:00
Tyler Benson 988a3d0fdf Cleanup plugin and add identifying classes to config
Still missing jetty since that requires method level searching.
2017-08-18 11:11:37 -06:00
Tyler Benson d33b468096 Allow scanning for key identifying methods 2017-08-18 11:11:37 -06:00
Tyler Benson 860df9856c Enable instrumentation to scan for classes for version matching 2017-08-18 11:11:37 -06:00
Tyler Benson 03ca35426c Convert InstrumentationCheckerTest to Spock 2017-08-18 11:11:37 -06:00
Tyler Benson 9b73fed3c5 Add plugin that scans for classes unique to version range
Does not include method signatures yet.  Still a work in progress.

Execute with `./gradlew scanVersions --parallel`.
Using `--parallel` is strongly recommended.
2017-08-18 11:11:37 -06:00
Tyler Benson 797332caeb Merge pull request #105 from DataDog/gpolaert/msgpack
Send traces as msgpack instead of json
2017-08-18 11:10:48 -06:00
Guillaume Polaert 870a8e2b12 Fixing tests 2017-08-18 11:03:18 -06:00
Guillaume Polaert 6392999f97 Change Json for MsgPack 2017-08-18 10:49:49 -06:00
Tyler Benson f564161454 Merge pull request #100 from DataDog/gpolaert/extra-services
Ability to set extra service information
2017-08-18 10:26:33 -06:00