Merge branch 'main' into issue_2421

Author: ocelotl

.github/workflows/test.yml

@@ -10,7 +10,7 @@ env:
   # Otherwise, set variable to the commit of your branch on
   # opentelemetry-python-contrib which is compatible with these Core repo
   # changes.
-  CONTRIB_REPO_SHA: 23bfe9fcadc1e205fbce1b6cf58fc3004eecace3
+  CONTRIB_REPO_SHA: d5ada286e138e394593454e15f1b79e35149b83e
   # This is needed because we do not clone the core repo in contrib builds anymore.
   # When running contrib builds as part of core builds, we use actions/checkout@v2 which
   # does not set an environment variable (simply just runs tox), which is different when