#579 adds enhancements for instrumentation (for supporting programmatic instrumentation to be specific) but also adds changes for Flask instrumentation. Move these Flask instrumentation changes in a different PR, since they need further discussion and are holding back the general instrumentation mechanism enhancements.