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

pull[bot] merged 2 commits into

Stars1233:mainStars1233/opentelemetry-collector:mainfrom

open-telemetry:mainopen-telemetry/opentelemetry-collector:mainCopy head branch name to clipboard