Merge main 4 (open-telemetry#2236)

Author: ocelotl

tox.ini

@@ -99,7 +99,7 @@ changedir =
   exporter-zipkin-combined: exporter/opentelemetry-exporter-zipkin/tests
   exporter-zipkin-proto-http: exporter/opentelemetry-exporter-zipkin-proto-http/tests
   exporter-zipkin-json: exporter/opentelemetry-exporter-zipkin-json/tests
-
+  
   propagator-b3: propagator/opentelemetry-propagator-b3/tests
   propagator-jaeger: propagator/opentelemetry-propagator-jaeger/tests