Changes to enable Zipkin tracing
changes to enable Zipkin tracing