[chore] Backport 0.120.1 into main#38057

jpkrohling wants to merge 3 commits into

open-telemetry:mainopen-telemetry/opentelemetry-collector-contrib:mainfrom

jpkrohling:jpkroehling/port-bugfix-from-0.120.1jpkrohling/opentelemetry-collector-contrib:jpkroehling/port-bugfix-from-0.120.1Copy head branch name to clipboard