Refactor code using pyupgrade for Python 3.6 (#2238)

* Refactor code using pyupgrade for Python 3.6

This diff is the result of applying the following command to the project:

```shell
find . -type f -name "*.py" -exec pyupgrade --py36-plus '{}' +
```

* Revert changes in autogenerated files

* Remove changes on autogenerated files

Co-authored-by: Owais Lone <[email protected]>

Author: adamantike

docs/examples/basic_context/implicit_context.py

@@ -21,5 +21,5 @@
 with tracer.start_span(name="root span") as root_span:
     ctx = baggage.set_baggage("foo", "bar")
 
-print("Global context baggage: {}".format(baggage.get_all()))
-print("Span context baggage: {}".format(baggage.get_all(context=ctx)))
+print(f"Global context baggage: {baggage.get_all()}")
+print(f"Span context baggage: {baggage.get_all(context=ctx)}")

docs/examples/datadog_exporter/server.py

@@ -56,7 +56,7 @@ def server_request():
     with tracer.start_as_current_span("server-inner"):
         if param == "error":
             raise ValueError("forced server error")
-        return "served: {}".format(param)
+        return f"served: {param}"
 
 
 if __name__ == "__main__":

docs/examples/fork-process-model/flask-gunicorn/app.py

@@ -52,7 +52,7 @@ def fibonacci():
             fast_span.set_attribute("n", n)
             fast_span.set_attribute("nth_fibonacci", ans)
 
-    return "F({}) is: ({})".format(n, ans)
+    return f"F({n}) is: ({ans})"
 
 
 if __name__ == "__main__":

docs/examples/fork-process-model/flask-uwsgi/app.py

@@ -72,7 +72,7 @@ def fibonacci():
             fast_span.set_attribute("n", n)
             fast_span.set_attribute("nth_fibonacci", ans)
 
-    return "F({}) is: ({})".format(n, ans)
+    return f"F({n}) is: ({ans})"
 
 
 if __name__ == "__main__":

docs/examples/opentracing/rediscache.py

@@ -45,7 +45,7 @@ def inner(*args, **kwargs):
 
                 scope1.span.log_kv({"msg": "Cache miss, calling function"})
                 with self.tracer.start_active_span(
-                    'Call "{}"'.format(func.__name__)
+                    f'Call "{func.__name__}"'
                 ) as scope2:
                     scope2.span.set_tag("func", func.__name__)
                     scope2.span.set_tag("args", str(args))

docs/getting_started/tests/test_flask.py

@@ -25,7 +25,7 @@
 class TestFlask(unittest.TestCase):
     def test_flask(self):
         dirpath = os.path.dirname(os.path.realpath(__file__))
-        server_script = "{}/../flask_example.py".format(dirpath)
+        server_script = f"{dirpath}/../flask_example.py"
         server = subprocess.Popen(
             [sys.executable, server_script],
             stdout=subprocess.PIPE,

docs/getting_started/tests/test_tracing.py

@@ -20,7 +20,7 @@
 class TestBasicTracerExample(unittest.TestCase):
     def test_basic_tracer(self):
         dirpath = os.path.dirname(os.path.realpath(__file__))
-        test_script = "{}/../tracing_example.py".format(dirpath)
+        test_script = f"{dirpath}/../tracing_example.py"
         output = subprocess.check_output(
             (sys.executable, test_script)
         ).decode()

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/exporter.py

@@ -21,7 +21,7 @@
 from time import sleep
 from typing import Any, Callable, Dict, Generic, List, Optional
 from typing import Sequence as TypingSequence
-from typing import Text, TypeVar
+from typing import TypeVar
 from urllib.parse import urlparse
 
 from backoff import expo
@@ -115,14 +115,12 @@ def _translate_value(value: Any) -> KeyValue:
     #     )
 
     else:
-        raise Exception(
-            "Invalid type {} of value {}".format(type(value), value)
-        )
+        raise Exception(f"Invalid type {type(value)} of value {value}")
 
     return any_value
 
 
-def _translate_key_values(key: Text, value: Any) -> KeyValue:
+def _translate_key_values(key: str, value: Any) -> KeyValue:
     return KeyValue(key=key, value=_translate_value(value))
 
 

exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/trace_exporter/__init__.py

@@ -147,7 +147,7 @@ def _translate_context_trace_state(self, sdk_span: ReadableSpan) -> None:
         if sdk_span.context.trace_state is not None:
             self._collector_span_kwargs["trace_state"] = ",".join(
                 [
-                    "{}={}".format(key, value)
+                    f"{key}={value}"
                     for key, value in (sdk_span.context.trace_state.items())
                 ]
             )
@@ -302,7 +302,7 @@ def _translate_data(
 
             self._collector_span_kwargs["kind"] = getattr(
                 CollectorSpan.SpanKind,
-                "SPAN_KIND_{}".format(sdk_span.kind.name),
+                f"SPAN_KIND_{sdk_span.kind.name}",
             )
 
             instrumentation_library_spans.spans.append(

exporter/opentelemetry-exporter-otlp-proto-grpc/tests/performance/benchmarks/test_benchmark_trace_exporter.py

@@ -33,7 +33,7 @@ def get_tracer_with_processor(span_processor_class):
     return tracer
 
 
-class MockTraceServiceStub(object):
+class MockTraceServiceStub:
     def __init__(self, channel):
         self.Export = lambda *args, **kwargs: None
 
@@ -51,8 +51,8 @@ def create_spans_to_be_exported():
         )
         for i in range(10):
             span.set_attribute(
-                "benchmarkAttribute_{}".format(i),
-                "benchmarkAttrValue_{}".format(i),
+                f"benchmarkAttribute_{i}",
+                f"benchmarkAttrValue_{i}",
             )
         span.end()
 
@@ -79,8 +79,8 @@ def create_spans_to_be_exported():
         )
         for i in range(10):
             span.set_attribute(
-                "benchmarkAttribute_{}".format(i),
-                "benchmarkAttrValue_{}".format(i),
+                f"benchmarkAttribute_{i}",
+                f"benchmarkAttrValue_{i}",
             )
         span.end()