Commit Graph

5671 Commits

Author SHA1 Message Date
Guillaume Polaert 3b8517e7ca adding mockito to the test scope 2017-05-02 10:24:33 +02:00
Guillaume Polaert c6391eaf7e standard gitignore 2017-05-02 10:23:03 +02:00
Guillaume Polaert 944b29dfcf Removing useless files 2017-05-02 10:21:27 +02:00
Guillaume Polaert 538f708d8e One more test 2017-04-28 12:18:15 +02:00
Guillaume Polaert ad8ad680bf Consolidation of the PR 2017-04-28 11:58:29 +02:00
renaudboutet 97f7ed4b50 fixed time measures + some comments 2017-04-28 11:05:17 +02:00
renaudboutet f9795220da serializer test 2017-04-28 10:27:04 +02:00
renaudboutet 9a95af86ab Merge branch 'dev' of github.com:DataDog/raclette-java into dev 2017-04-28 10:12:51 +02:00
Guillaume Polaert e165cd0b89 cleaning code for the PR 2017-04-28 10:08:25 +02:00
renaudboutet 02e7ed0087 serializer test 2017-04-27 19:28:16 +02:00
Guillaume Polaert bebf815781 simplifying the test 2017-04-27 19:21:07 +02:00
renaudboutet abdbfffdff Conflicts merging 2017-04-27 19:16:01 +02:00
renaudboutet 6af3f6129e Serializer test 2017-04-27 18:57:45 +02:00
Guillaume Polaert df4e0eb76f adding some tests 2017-04-27 18:45:20 +02:00
Guillaume Polaert 6ef772b7ac changing List<Span> for List<DDSpan> 2017-04-27 18:32:31 +02:00
Guillaume Polaert 403e340e42 fixing conflicts 2017-04-27 18:28:10 +02:00
Guillaume Polaert 49d7771348 adding tests 2017-04-27 18:26:27 +02:00
Guillaume Polaert 412cf7e67a adding the rateSampler 2017-04-27 17:54:14 +02:00
renaudboutet a30b13f9fa Fixed conflicts 2017-04-27 17:34:44 +02:00
renaudboutet 628f2eb483 Logging Writter + AllSampler + Tracer empty constructor 2017-04-27 17:30:34 +02:00
Guillaume Polaert 2273454fb7 fixing nano 2017-04-27 16:55:15 +02:00
renaudboutet b36a0f5c55 Test Writer 2017-04-27 16:42:29 +02:00
Guillaume Polaert f76da5df3c consoliding the merge 2017-04-27 16:23:34 +02:00
Guillaume Polaert 5846f45f4f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/datadoghq/trace/impl/DDSpan.java
#	src/main/java/com/datadoghq/trace/impl/DDSpanContext.java
#	src/main/java/com/datadoghq/trace/impl/DDTracer.java
2017-04-27 16:03:17 +02:00
Guillaume Polaert a6bcea9b3d cleaning and moving all att to the context 2017-04-27 16:00:25 +02:00
renaudboutet fd840abf26 toString, hashcode, equals 2017-04-27 15:42:19 +02:00
renaudboutet 348143967a Logging + comments 2017-04-27 15:22:29 +02:00
renaudboutet cf5f2541ca Rename DDTracer, DDSpanBuilder + Remove Arraylist externally 2017-04-27 10:53:08 +02:00
Guillaume Polaert b6632eef7b fixing some issue after the merge 2017-04-27 09:50:56 +02:00
Guillaume Polaert d364d10008 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/main/java/com/datadoghq/trace/impl/DDSpan.java
#	src/main/java/com/datadoghq/trace/writer/impl/DDApi.java
#	src/test/java/com/datadoghq/trace/impl/DDSpanTest.java
2017-04-27 09:45:37 +02:00
Guillaume Polaert 162656296f adding ability to report all span in the trace 2017-04-27 09:44:05 +02:00
Guillaume Polaert 1137854b41 logging in json 2017-04-27 09:43:30 +02:00
Guillaume Polaert 1852489b06 ignoring logs 2017-04-27 09:43:03 +02:00
renaudboutet 99977a036e Small fixes 2017-04-26 20:33:19 +02:00
renaudboutet 5c089cfb33 Merge branch 'dev' of github.com:DataDog/raclette-java into dev 2017-04-26 19:18:15 +02:00
renaudboutet 0663d34aeb First version of the writer working with the Agent API 2017-04-26 19:18:10 +02:00
Guillaume Polaert bc8395d66c end of day, enjoy the night 2017-04-26 18:46:20 +02:00
Guillaume Polaert 7e7700f1e2 adding a list of traces to rebuild the entire trace for DD 2017-04-26 18:37:14 +02:00
renaudboutet a3b1d24fa8 Conflicts resolution 2017-04-26 17:09:59 +02:00
renaudboutet 81656a2b20 Fixed serialization and send to DDagent 2017-04-26 17:07:16 +02:00
Guillaume Polaert 352e10e4c6 remove useless api method 2017-04-26 16:28:27 +02:00
Guillaume Polaert 445e9dac77 adding a logger conf 2017-04-26 16:23:55 +02:00
renaudboutet ef6dccc7ca Resolved conflicts 2017-04-26 16:19:59 +02:00
renaudboutet 09c0cbb7d2 API implem 2017-04-26 16:19:12 +02:00
Guillaume Polaert 52626f9dcb adding unsupported exceptions 2017-04-26 15:52:59 +02:00
Guillaume Polaert 588cfef4a4 fixing minor issues 2017-04-26 15:42:55 +02:00
renaudboutet dae7e563b7 Resolved conflicts 2017-04-26 15:33:00 +02:00
renaudboutet 7e38848abb Changed id generations + fixed serialization 2017-04-26 15:29:58 +02:00
Guillaume Polaert 4dd11b5946 fix issue w/ endTime and duration 2017-04-26 15:25:29 +02:00
Guillaume Polaert c9abfa670c fixing merge, todo: fix nano test 2017-04-26 15:20:56 +02:00