[pull] main from open-telemetry:main

[pull] main from open-telemetry:main #1308