Merge pull request #324 from bryannaegele/master
Conform telemetry middleware to established patterns