Add instrumentation support for mac and solaris