Merge main 4 (open-telemetry#2236)

Author: ocelotl

CHANGELOG.md

@@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Populate `auto.version` in Resource if using auto-instrumentation
   ([#2243](https://github.com/open-telemetry/opentelemetry-python/pull/2243))
 - Return proxy instruments from ProxyMeter
-  [[#2169](https://github.com/open-telemetry/opentelemetry-python/pull/2169)]
+  ([#2169](https://github.com/open-telemetry/opentelemetry-python/pull/2169))
 - Make Measurement a concrete class
   ([#2153](https://github.com/open-telemetry/opentelemetry-python/pull/2153))
 - Add metrics API

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