merge: retain PR history after rebase

# Conflicts:
#	packages/dd-trace/src/exporters/span-stats/index.js
#	packages/dd-trace/src/opentelemetry/metrics/index.js
#	packages/dd-trace/src/proxy.js
#	packages/dd-trace/src/span_stats.js
#	packages/dd-trace/test/exporters/span-stats/exporter.spec.js
#	packages/dd-trace/test/proxy.spec.js
#	packages/dd-trace/test/span_stats.spec.js

Author: wconti27