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 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								ee9f91219b
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/datadoghq/trace/impl/DDSpan.java 
							
						 | 
						
							2017-04-26 15:16:30 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								1955dcd65c
								
							
						 | 
						
							
							
								
								trying to fix inherits
							
							
							
							
							
						 | 
						
							2017-04-26 15:14:50 +02:00 | 
						
					
				
					
						
							
							
								 
								renaudboutet
							
						 | 
						
							
							
							
							
							
								
							
							
								638f303d76
								
							
						 | 
						
							
							
								
								Resolved conflicts
							
							
							
							
							
						 | 
						
							2017-04-26 14:42:18 +02:00 | 
						
					
				
					
						
							
							
								 
								renaudboutet
							
						 | 
						
							
							
							
							
							
								
							
							
								0399cb03e3
								
							
						 | 
						
							
							
								
								Serialization of spans
							
							
							
							
							
						 | 
						
							2017-04-26 14:38:25 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								df1c528c6d
								
							
						 | 
						
							
							
								
								firsts integration
							
							
							
							
							
						 | 
						
							2017-04-26 13:03:11 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								8b66116aeb
								
							
						 | 
						
							
							
								
								chaining props and context
							
							
							
							
							
						 | 
						
							2017-04-26 12:38:19 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								299cc57fc1
								
							
						 | 
						
							
							
								
								And, ... Voilà
							
							
							
							
							
						 | 
						
							2017-04-26 10:55:33 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								69ea8573b9
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into dev
							
							
							
							
							
							
							
							# Conflicts:
#	src/main/java/com/datadoghq/trace/impl/Tracer.java 
							
						 | 
						
							2017-04-26 10:50:05 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								c769fa6386
								
							
						 | 
						
							
							
								
								pre merge
							
							
							
							
							
						 | 
						
							2017-04-26 10:46:59 +02:00 | 
						
					
				
					
						
							
							
								 
								renaudboutet
							
						 | 
						
							
							
							
							
							
								
							
							
								1a981bb9f3
								
							
						 | 
						
							
							
								
								Added writer, serialisation, API + changed some types
							
							
							
							
							
						 | 
						
							2017-04-26 10:33:26 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								af244a039d
								
							
						 | 
						
							
							
								
								delete the notion of parentContext for the span
							
							
							
							
							
						 | 
						
							2017-04-26 09:54:07 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								a8535a0365
								
							
						 | 
						
							
							
								
								sync w/ @renaud.boutet
							
							
							
							
							
						 | 
						
							2017-04-26 09:48:19 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								7f0a2d643e
								
							
						 | 
						
							
							
								
								filling the Span Pojo
							
							
							
							
							
						 | 
						
							2017-04-26 09:45:31 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								580a0d2b1c
								
							
						 | 
						
							
							
								
								filling the SpanContext Pojo
							
							
							
							
							
						 | 
						
							2017-04-26 09:40:18 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								7ee51d005e
								
							
						 | 
						
							
							
								
								implementing a first version of span
							
							
							
							
							
						 | 
						
							2017-04-25 16:56:01 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								c9c53c976c
								
							
						 | 
						
							
							
								
								adding first tests
							
							
							
							
							
						 | 
						
							2017-04-25 16:55:39 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								fdd653d4fe
								
							
						 | 
						
							
							
								
								java 1.8
							
							
							
							
							
						 | 
						
							2017-04-25 15:57:23 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								8c242ad283
								
							
						 | 
						
							
							
								
								init struct with files :'(
							
							
							
							
							
						 | 
						
							2017-04-25 12:25:39 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								c0a0b6d630
								
							
						 | 
						
							
							
								
								init struct
							
							
							
							
							
						 | 
						
							2017-04-25 12:24:53 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								c8659e4494
								
							
						 | 
						
							
							
								
								Create README.md
							
							
							
							
							
						 | 
						
							2017-04-24 11:47:28 +02:00 | 
						
					
				
					
						
							
							
								 
								Guillaume Polaert
							
						 | 
						
							
							
							
							
							
								
							
							
								59499f6956
								
							
						 | 
						
							
							
								
								add a gitignore file
							
							
							
							
							
						 | 
						
							2017-04-24 11:40:31 +02:00 |