Merge main 4 (open-telemetry#2236)

Author: ocelotl

CHANGELOG.md

@@ -16,6 +16,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2153](https://github.com/open-telemetry/opentelemetry-python/pull/2153))
 - Add metrics API
   ([#1887](https://github.com/open-telemetry/opentelemetry-python/pull/1887))
+- Fix parental trace relationship for opentracing `follows_from` reference
+  ([#2180](https://github.com/open-telemetry/opentelemetry-python/pull/2180))
 
 ## [1.6.2-0.25b2](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.6.2-0.25b2) - 2021-10-19
 

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