Commit Graph

1087 Commits

Author SHA1 Message Date
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 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 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 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 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 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
Guillaume Polaert 2f65e93167 Remove OTARULES from OT agent 2017-08-16 11:16:12 +02: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 f1f112ff5a Merge pull request #79 from gpolaert/resource-name
[servlet] resource name for HTTP frameworks
2017-08-03 13:03:50 +02:00
Tyler Benson effe6e8b04 Remove pom dependencies for shadow artifacts. 2017-08-02 12:48:48 -07:00
Emanuele Palazzetti c5c750bd49
[elasticsearch] remove auto instrumentation; will be added later 2017-08-02 17:42:01 +02:00
Guillaume Polaert d46099cbd9 adding tests 2017-08-02 14:22:20 +02:00
Guillaume Polaert 78b2faf03b typo 2017-08-02 13:38:14 +02:00
Guillaume Polaert aef9ebec9a change span.type value 2017-08-02 13:35:37 +02:00
Guillaume Polaert 16aba0ac7a [servlet] change the resource name for servlet integration (404 grouping) 2017-08-02 11:17:05 +02:00
Guillaume Polaert 402e4978e2 [core] cosmetics 2017-08-02 11:07:59 +02:00
Tyler Benson b371b59ce2 Don’t exclude the wrapper jar 2017-08-01 15:09:51 -07:00
Tyler Benson c5f57151c0 Use a factory to create TracingCommandListener
This bypasses the inexplicable change in visibility of the constructor.
2017-08-01 11:44:29 -07:00
Emanuele Palazzetti e236f44b12 [mongo] update the db.statement tag to use the quantized query 2017-08-01 12:28:28 +02:00
Tyler Benson 61c3729f72 Attempt to load config files with both `yaml` and `yml` suffix 2017-07-31 13:08:58 -07:00
Guillaume Polaert dad74d0c63 more robust and recursive 2017-07-28 13:47:56 +02:00
Guillaume Polaert 58cb653d41 improving the normalizer 2017-07-28 12:36:24 +02:00
Guillaume Polaert e830e1b7e6 fix the operation name 2017-07-28 09:20:40 +02:00
Guillaume Polaert f20ed93741 formatting 2017-07-28 09:20:40 +02:00
Guillaume Polaert 7dc170cc6f mongo helper for norm 2017-07-28 09:20:32 +02:00
Guillaume Polaert 864db966f1 Close span when exception exit (#66) 2017-07-27 21:09:25 +02:00
Kent Shultz f3e55d2d69 Update documentation (#67) 2017-07-27 21:08:35 +02:00
Guillaume Polaert a58f797fd1 moving files to dd-trace 2017-07-24 13:41:40 +02:00
Guillaume Polaert 7c5fd24a14 Moving decorators config to the dd-trace project + default service name 2017-07-24 13:36:44 +02:00
Tyler Benson 8e4e9fe0ac Clean up version and include git sha in reported number
Exclude lombok from being included in the shadow jar.
2017-07-21 08:52:17 -07:00
Tyler Benson 8f794f8364 Merge pull request #59 from DataDog/tyler/shadow-artifacts
Fix jar uploading to use shadow jar instead of unbundled jar
2017-07-20 10:11:12 -07: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 d6271d866e Use lombok @Slf4j annotation for declaring loggers 2017-07-19 11:24:41 -07:00
Guillaume Polaert e80b7580c8 Refactoring the logging, use slf4j 2017-07-19 08:16:42 -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 e1696aeee0 Update link that will automatically download the latest version 2017-07-18 15:53:53 -07:00
Tyler Benson f48f2bbc53 Add link to snapshot repo for beta. 2017-07-18 09:21:45 -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 d2009ef9da Fix excludes by adding group 2017-07-11 17:12:27 -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 95c7a5ac08 Finish updating gradle and remove maven pom's. 2017-07-06 15:56:32 -07:00
Tyler Benson ca36e9fbc1 Exclude java 9 compiled files from shadow jar. 2017-07-06 12:10:14 -07:00
Guillaume Polaert 78cd9d118d Shading shades too much things (OT Agent for instance) 2017-07-06 11:23:37 +02: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
Tyler Benson 07b23249d7 Merge pull request #27 from DataDog/tyler/add-gradle
Add gradle build scripts.
2017-07-03 10:40:05 -07:00
Guillaume Polaert a150548a72 CircleCi 2017-07-03 10:34:34 -07:00
Guillaume Polaert 1dc7d5a9b7 AutoService is used by the deps, need to compile with maven 2017-07-03 10:34:34 -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
Guillaume Polaert 94018ff596 fix artifact id 2017-06-29 10:57:57 +02: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 e77b8dd90a Merge pull request #22 from DataDog/tyler/circle-ci
Add circleci config file
2017-06-27 16:00:27 -04:00
Tyler Benson b9690f9db8 Add circleci config file 2017-06-27 15:54:40 -04:00
Guillaume Polaert 9ee1b8204b Adding a bit of documentation for the dev. 2017-06-27 10:28:09 -04:00
Guillaume Polaert aadc526338 refactoring the version checker 2017-06-26 16:55:54 -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 a9623a6ba4 Add comments and explanation on strategies used 2017-06-20 10:21:21 -04:00
Guillaume Polaert 6107454e30 be more readable 2017-06-20 09:15:51 -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 2cca7b0be5 fixing things for the release 2017-06-15 17:38:40 +02:00
Guillaume Polaert 265f6d6411 Oops, reverting name 2017-06-15 17:36:50 +02:00
Guillaume Polaert a3b5c5a194 Merge pull request #14 from DataDog/refactoring-integrations
Refactoring integrations
2017-06-15 17:16:07 +02:00
Guillaume Polaert 4186f67100 Reverting the file 2017-06-15 17:09:17 +02:00
Guillaume Polaert 7f48045da9 Refactoring DDAgentTracingHelper, better log, better catch ... 2017-06-15 17:08:56 +02:00
Emeric Planet 79e98f43c0 Correct typo (#15) 2017-06-15 16:35:59 +02:00
Guillaume Polaert fd759df803 Refactoring OkHttp 2017-06-15 16:27:52 +02:00
Guillaume Polaert 9e92f65da4 Refactoring Jetty and Tomcat 2017-06-15 15:51:50 +02:00
Guillaume Polaert e9c41f54bb Update README 2017-06-15 14:42:09 +02:00
Guillaume Polaert 610dc6531e Remove JAR checker cause we have a graceful exception 2017-06-15 14:34:14 +02:00
Guillaume Polaert e5887e24dc Fixing ES 2017-06-15 14:30:16 +02:00
Guillaume Polaert e632705140 Fixing AWS 2017-06-14 19:28:33 +02:00
Guillaume Polaert 305e7aeefb still issues on ES and AWS 2017-06-14 17:36:46 +02:00
Guillaume Polaert 41f6e66b2e first review for @renaud 2017-06-14 15:01:33 +02:00
Guillaume Polaert 9e6ea73e4c [maven-release-plugin] prepare for next development iteration 2017-06-13 17:28:34 +02:00
Guillaume Polaert fdf4b7af28 [maven-release-plugin] prepare release v0.0.7 2017-06-13 17:28:28 +02:00
Guillaume Polaert 862e143db0 Adding version control 2017-06-13 16:31:35 +02:00
Guillaume Polaert 557f7d1dd3 Preparing the release 2017-06-13 16:29:50 +02:00
Guillaume Polaert 0385e4819b Refactor helper 2017-06-13 16:03:19 +02:00
Guillaume Polaert de53b007d6 Help some lost souls 2017-06-13 14:23:51 +02:00
Guillaume Polaert 2e693a41db Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	dd-java-agent/pom.xml
2017-06-13 14:20:06 +02:00
Guillaume Polaert 143d1265f9 fix conflict 2017-06-12 09:12:31 +02:00
Guillaume Polaert 296aa426d7 working on Cassandra Contrib 2017-06-12 09:03:18 +02:00
renaudboutet 953c32b05c DDActiveSpan made closeable + Improvements & tests of the TracedClient 2017-06-09 22:51:53 +02:00
renaudboutet b12dcb53b4 Loaded new contribution versions + migration of instrumentation rules 2017-06-09 22:19:50 +02:00
renaudboutet 1618e4f006 [maven-release-plugin] prepare for next development iteration 2017-06-09 16:20:09 +02:00
renaudboutet 9500b9fe2e [maven-release-plugin] prepare release v0.0.6 2017-06-09 16:19:58 +02:00
renaudboutet 2583432737 By default custom annotations are disabled 2017-06-08 16:04:39 +02:00
renaudboutet d4925f8494 [maven-release-plugin] prepare for next development iteration 2017-06-07 19:05:01 +02:00
renaudboutet c5dd057312 [maven-release-plugin] prepare release v0.0.5 2017-06-07 19:04:55 +02:00
renaudboutet 5123574203 Enable custom tracing with annotations over a subset of packages + documentation modified accordingly 2017-06-07 18:56:21 +02:00
renaudboutet 39a9eb7763 Refine AWS SDK allowed dependencies 2017-06-07 13:43:00 +02:00
renaudboutet 2e0e6de196 Move annotations to a dedicated Jar + change the doc to depend on it 2017-06-07 11:26:48 +02:00
renaudboutet e1b43837bb [maven-release-plugin] prepare for next development iteration 2017-06-06 18:59:37 +02:00
renaudboutet 07fc589595 [maven-release-plugin] prepare release v0.0.4 2017-06-06 18:51:19 +02:00
renaudboutet e48c2b8f63 Prepare release 0.0.4 + move to a global.version unique parameter for all projects 2017-06-06 18:31:21 +02:00
renaudboutet e3f0f3a5a9 Add configuration file by system property 2017-06-02 23:20:30 +02:00
Guillaume Polaert 09721bb8ca Merge remote-tracking branch 'origin/dev' into dev 2017-06-02 16:33:21 +02:00
Guillaume Polaert bd6eb7d725 Improving pom.xnml (shade) 2017-06-02 16:14:34 +02:00
renaudboutet 96d4f10c87 Resolve conflicts 2017-06-01 18:39:49 +02:00
renaudboutet a48ff4c3c9 Refine HTTP client instrumentation versions + finner logging 2017-06-01 18:38:08 +02:00
Guillaume Polaert db2a59fea7 [maven-release-plugin] prepare for next development iteration 2017-06-01 15:18:24 +02:00
Guillaume Polaert b24a186cba [maven-release-plugin] prepare release v0.0.3 2017-06-01 15:18:18 +02:00
Guillaume Polaert 913acc9ec7 clean config 2017-06-01 15:16:02 +02:00
renaudboutet 470ddac5fb Fix logging 2017-06-01 15:12:34 +02:00
renaudboutet cf90b839d2 Added JarVersions sanity check with auto-disabling capabilities 2017-06-01 15:05:34 +02:00
Guillaume Polaert fcb214b921 fix version deps 2017-05-31 15:37:06 +02:00
Guillaume Polaert 1bb36a82af [maven-release-plugin] prepare for next development iteration 2017-05-31 15:31:26 +02:00
Guillaume Polaert 69b620725e [maven-release-plugin] prepare release v0.0.2 2017-05-31 15:31:09 +02:00
Guillaume Polaert 1a41751e34 refactoring skel 2017-05-31 15:25:02 +02:00
Guillaume Polaert 83a30ad181 Merge remote-tracking branch 'origin/master' into dev 2017-05-31 13:06:25 +02:00
Guillaume Polaert 78baebe447 [maven-release-plugin] prepare for next development iteration 2017-05-31 12:30:48 +02:00
Guillaume Polaert 9e0077d46a [maven-release-plugin] prepare release v0.0.1 2017-05-31 12:30:42 +02:00
Guillaume Polaert eeab45af29 fix javadocs issues 2017-05-31 12:28:51 +02:00
Guillaume Polaert 667111582c fixing ossrh issues again 2017-05-31 12:22:38 +02:00
Guillaume Polaert b11bc289fe fixing version issue 2017-05-31 12:05:57 +02:00
Guillaume Polaert 34d07b1a75 fixing ossrh issues 2017-05-31 12:02:40 +02:00
Guillaume Polaert 376baf03c6 [maven-release-plugin] prepare release v0.0.1 2017-05-31 11:44:47 +02:00
Guillaume Polaert eecf93be0e fixing pom issues for the release 2017-05-31 09:58:36 +02:00
Albert Wang d7b4751376 more grammar changes 2017-05-30 07:14:48 -10:00
Albert Wang 9552ad3618 small grammar changes 2017-05-30 07:08:44 -10:00
Guillaume Polaert dad2391838 fix issues on pom 2017-05-30 16:51:39 +02:00
renaudboutet 8950008357 Merge remote-tracking branch 'origin/merge-validation' into dev 2017-05-30 15:13:10 +02:00
renaudboutet 96e98e3567 New feature: disabling instrumentations 2017-05-30 15:12:18 +02:00
Guillaume Polaert 9c38391a58 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerFactory.java
2017-05-30 14:12:35 +02:00
renaudboutet 7587b284df Move back resolver in core + added the skipTagsPatterns option over samplers (+tests & examples) 2017-05-30 12:44:10 +02:00
Guillaume Polaert b3d7f3afc6 Remove ES 2017-05-30 11:51:27 +02:00
renaudboutet 26342e48d9 Fix refactored decorators + ErrorFlag + DBStatement decorator + DDapi is streaming JSON (optim) 2017-05-29 19:17:44 +02:00
renaudboutet 8e14d51d58 Merge branch 'dev' of github.com:DataDog/dd-trace-java into dev 2017-05-29 17:33:13 +02:00
renaudboutet 29d2ab8aca Enable custom tracing in dd-trace.yaml 2017-05-29 17:22:28 +02:00
Guillaume Polaert 5e92d19114 Merge remote-tracking branch 'origin/dev' into dev 2017-05-29 17:12:43 +02:00
renaudboutet b91420c512 Merge branch 'dev' of github.com:DataDog/dd-trace-java into dev 2017-05-29 16:28:38 +02:00
renaudboutet 5e957558e3 Moving resolver in agent 2017-05-29 16:28:32 +02:00
Guillaume Polaert 0b6ff99aac removing some files 2017-05-29 16:11:41 +02:00
Guillaume Polaert d1ef5c274b updating to 0.0.1 2017-05-29 16:10:57 +02:00
Guillaume Polaert 2952299401 Merge remote-tracking branch 'origin/dev' into dev 2017-05-29 16:10:26 +02:00
Guillaume Polaert cc3b394bd7 updating to 0.0.1 2017-05-29 16:10:19 +02:00
renaudboutet aecaca6309 Review configuration POJOs + created factories 2017-05-29 16:00:41 +02:00
Guillaume Polaert 227f3e3130 Updating readme 2017-05-29 15:01:04 +02:00
Guillaume Polaert 45c9676e92 Adding java version supported 2017-05-29 09:32:17 +02:00
Guillaume Polaert 4ac06482be Removing buggy es contrib 2017-05-24 16:09:02 +02:00
renaudboutet c2019381df Added configuration section in doc 2017-05-24 13:51:29 +02:00
renaudboutet 8e165f37f0 added decorators default config files 2017-05-24 13:45:54 +02:00
renaudboutet 3f7d852a65 Rename HTTP & DB decorators + seggregate configurtions of decorators in dd-trace-decorators.yaml 2017-05-24 13:44:35 +02:00
renaudboutet ee9e0626df First version of the agent documentation 2017-05-24 13:31:24 +02:00
renaudboutet b880e29ab9 First version of the agent documentation 2017-05-24 13:14:21 +02:00
renaudboutet 2870d0ba34 First version of the agent documentation 2017-05-24 13:12:44 +02:00
renaudboutet 515015968e First version of the agent documentation 2017-05-24 13:11:08 +02:00
renaudboutet b59551390f First version of the agent documentation 2017-05-24 13:06:20 +02:00
renaudboutet 2d06f7d271 First version of the agent documentation 2017-05-24 12:42:36 +02:00
renaudboutet 84c96efef1 First version of the agent documentation 2017-05-24 12:31:41 +02:00
renaudboutet e0b85ef79e First version of the agent documentation 2017-05-24 12:27:41 +02:00
renaudboutet f8e725ef33 First version of the agent documentation 2017-05-24 12:25:34 +02:00
renaudboutet 5239736d14 small fixes due to ES instrumentation 2017-05-24 09:21:41 +02:00
renaudboutet 1cd1183f07 Resolve conflicts + improve surefire test isolation using fork + tests logging less verbous 2017-05-23 21:07:47 +02:00
renaudboutet de338dd821 Small bug fixes on core + Apache HTTP Client auto instrumentation on agent 2017-05-23 19:38:10 +02:00
Guillaume Polaert fe667ece29 Merge remote-tracking branch 'origin/dev' into dev 2017-05-23 17:40:28 +02:00
Guillaume Polaert ca32835ff7 Adding ES instrumentation 2017-05-23 17:40:18 +02:00
renaudboutet c7353c827f Trace annotations JUnit tests 2017-05-23 15:57:59 +02:00
renaudboutet c89db2592c small fixes 2017-05-23 14:47:02 +02:00
Guillaume Polaert d07bf6cfb4 Removeing old ref to raclette 2017-05-23 14:24:20 +02:00
Guillaume Polaert fe73a08ece Refactoring project skel 2017-05-23 14:08:55 +02:00