Rework data generator to start to include fake trace data into event stream