From 0572d8e67880160315412a641ea122490ae838c1 Mon Sep 17 00:00:00 2001
From: Leighton Chen <lechen@microsoft.com>
Date: Tue, 2 Mar 2021 16:17:48 -0800
Subject: [PATCH 1/2] spa

---
 CHANGELOG.md                                       |  3 +++
 docs/examples/opentracing/main.py                  |  4 ++--
 docs/getting_started/jaeger_example.py             |  2 +-
 exporter/opentelemetry-exporter-jaeger/README.rst  |  2 +-
 .../examples/jaeger_exporter_example.py            |  8 ++++----
 exporter/opentelemetry-exporter-jaeger/setup.cfg   |  2 +-
 .../src/opentelemetry/exporter/jaeger/__init__.py  |  6 +++---
 .../tests/test_jaeger_exporter_protobuf.py         |  6 +++---
 .../tests/test_jaeger_exporter_thrift.py           | 10 +++++-----
 exporter/opentelemetry-exporter-zipkin/setup.cfg   |  2 +-
 .../src/opentelemetry/exporter/zipkin/__init__.py  |  6 +++---
 .../tests/test_zipkin_exporter.py                  | 14 +++++++-------
 12 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7fcb83e20a..5792b1e5901 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1656])(https://github.com/open-telemetry/opentelemetry-python/pull/1656)
 - Rename `DefaultSpan` to `NonRecordingSpan`
   ([#1661])(https://github.com/open-telemetry/opentelemetry-python/pull/1661)
+- Rename `JaegerSpanExporter` to `JaegerExporter`
+- Rename `ZipkinSpanExporter` to `ZipkinExporter`
+  ([#1651])(https://github.com/open-telemetry/opentelemetry-python/pull/1651)
 
 ## [0.18b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v0.18b0) - 2021-02-16
 
diff --git a/docs/examples/opentracing/main.py b/docs/examples/opentracing/main.py
index f997801aaa5..df5626b043f 100755
--- a/docs/examples/opentracing/main.py
+++ b/docs/examples/opentracing/main.py
@@ -3,7 +3,7 @@
 from rediscache import RedisCache
 
 from opentelemetry import trace
-from opentelemetry.exporter.jaeger import JaegerSpanExporter
+from opentelemetry.exporter.jaeger import JaegerExporter
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import SimpleSpanProcessor
 from opentelemetry.shim import opentracing_shim
@@ -13,7 +13,7 @@
 tracer_provider = trace.get_tracer_provider()
 
 # Configure the tracer to export traces to Jaeger
-jaeger_exporter = JaegerSpanExporter(
+jaeger_exporter = JaegerExporter(
     service_name="OpenTracing Shim Example",
     agent_host_name="localhost",
     agent_port=6831,
diff --git a/docs/getting_started/jaeger_example.py b/docs/getting_started/jaeger_example.py
index 0494333d2cf..79b22c5e770 100644
--- a/docs/getting_started/jaeger_example.py
+++ b/docs/getting_started/jaeger_example.py
@@ -20,7 +20,7 @@
 
 trace.set_tracer_provider(TracerProvider())
 
-jaeger_exporter = jaeger.JaegerSpanExporter(
+jaeger_exporter = jaeger.JaegerExporter(
     service_name="my-helloworld-service",
     agent_host_name="localhost",
     agent_port=6831,
diff --git a/exporter/opentelemetry-exporter-jaeger/README.rst b/exporter/opentelemetry-exporter-jaeger/README.rst
index 67798395a3f..2176b2a71d0 100644
--- a/exporter/opentelemetry-exporter-jaeger/README.rst
+++ b/exporter/opentelemetry-exporter-jaeger/README.rst
@@ -22,7 +22,7 @@ Installation
 Configuration
 -------------
 
-OpenTelemetry Jaeger Exporter can be configured by setting `JaegerSpanExporter parameters
+OpenTelemetry Jaeger Exporter can be configured by setting `JaegerExporter parameters
 <https://github.com/open-telemetry/opentelemetry-python/blob/main/exporter/opentelemetry-exporter-jaeger
 /src/opentelemetry/exporter/jaeger/__init__.py#L88>`_ or by setting
 `environment variables <https://github.com/open-telemetry/opentelemetry-specification/blob/main/
diff --git a/exporter/opentelemetry-exporter-jaeger/examples/jaeger_exporter_example.py b/exporter/opentelemetry-exporter-jaeger/examples/jaeger_exporter_example.py
index 0ebe1c874cf..8123963ce7d 100644
--- a/exporter/opentelemetry-exporter-jaeger/examples/jaeger_exporter_example.py
+++ b/exporter/opentelemetry-exporter-jaeger/examples/jaeger_exporter_example.py
@@ -8,8 +8,8 @@
 trace.set_tracer_provider(TracerProvider())
 tracer = trace.get_tracer(__name__)
 
-# create a JaegerSpanExporter
-jaeger_exporter = jaeger.JaegerSpanExporter(
+# create a JaegerExporter
+jaeger_exporter = jaeger.JaegerExporter(
     service_name="my-helloworld-service",
     # configure agent
     agent_host_name="localhost",
@@ -22,13 +22,13 @@
     # password=xxxx, # optional
 )
 
-# Create a JaegerSpanExporter to send spans with gRPC
+# Create a JaegerExporter to send spans with gRPC
 # If there is no encryption or authentication set `insecure` to True
 # If server has authentication with SSL/TLS you can set the
 # parameter credentials=ChannelCredentials(...) or the environment variable
 # `EXPORTER_JAEGER_CERTIFICATE` with file containing creds.
 
-# jaeger_exporter = jaeger.JaegerSpanExporter(
+# jaeger_exporter = jaeger.JaegerExporter(
 #     service_name="my-helloworld-service",
 #     collector_endpoint="localhost:14250",
 #     insecure=True,
diff --git a/exporter/opentelemetry-exporter-jaeger/setup.cfg b/exporter/opentelemetry-exporter-jaeger/setup.cfg
index 02dbd4597cc..d2a446a05f5 100644
--- a/exporter/opentelemetry-exporter-jaeger/setup.cfg
+++ b/exporter/opentelemetry-exporter-jaeger/setup.cfg
@@ -53,4 +53,4 @@ test =
 
 [options.entry_points]
 opentelemetry_exporter =
-    jaeger = opentelemetry.exporter.jaeger:JaegerSpanExporter
\ No newline at end of file
+    jaeger = opentelemetry.exporter.jaeger:JaegerExporter
\ No newline at end of file
diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py
index be81bfaf0bd..a98dca33edc 100644
--- a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py
+++ b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/__init__.py
@@ -34,8 +34,8 @@
     trace.set_tracer_provider(TracerProvider())
     tracer = trace.get_tracer(__name__)
 
-    # create a JaegerSpanExporter
-    jaeger_exporter = jaeger.JaegerSpanExporter(
+    # create a JaegerExporter
+    jaeger_exporter = jaeger.JaegerExporter(
         service_name='my-helloworld-service',
         # configure agent
         agent_host_name='localhost',
@@ -104,7 +104,7 @@
 logger = logging.getLogger(__name__)
 
 
-class JaegerSpanExporter(SpanExporter):
+class JaegerExporter(SpanExporter):
     """Jaeger span exporter for OpenTelemetry.
 
     Args:
diff --git a/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter_protobuf.py b/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter_protobuf.py
index eea3e54700c..11603a8f9e6 100644
--- a/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter_protobuf.py
+++ b/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter_protobuf.py
@@ -22,7 +22,7 @@
 import opentelemetry.exporter.jaeger.gen.model_pb2 as model_pb2
 import opentelemetry.exporter.jaeger.translate.protobuf as pb_translator
 from opentelemetry import trace as trace_api
-from opentelemetry.exporter.jaeger import JaegerSpanExporter
+from opentelemetry.exporter.jaeger import JaegerExporter
 from opentelemetry.exporter.jaeger.translate import (
     NAME_KEY,
     VERSION_KEY,
@@ -39,7 +39,7 @@
 
 
 # pylint:disable=no-member
-class TestJaegerSpanExporter(unittest.TestCase):
+class TestJaegerExporter(unittest.TestCase):
     def setUp(self):
         # create and save span to be used in tests
         context = trace_api.SpanContext(
@@ -71,7 +71,7 @@ def test_constructor_by_environment_variables(self):
 
         env_patch.start()
 
-        exporter = JaegerSpanExporter(
+        exporter = JaegerExporter(
             service_name=service, transport_format="protobuf"
         )
 
diff --git a/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter_thrift.py b/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter_thrift.py
index 0bee785760d..5b611093ae2 100644
--- a/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter_thrift.py
+++ b/exporter/opentelemetry-exporter-jaeger/tests/test_jaeger_exporter_thrift.py
@@ -37,7 +37,7 @@
 from opentelemetry.trace.status import Status, StatusCode
 
 
-class TestJaegerSpanExporter(unittest.TestCase):
+class TestJaegerExporter(unittest.TestCase):
     def setUp(self):
         # create and save span to be used in tests
         context = trace_api.SpanContext(
@@ -57,7 +57,7 @@ def test_constructor_default(self):
         service_name = "my-service-name"
         agent_host_name = "localhost"
         agent_port = 6831
-        exporter = jaeger_exporter.JaegerSpanExporter(service_name)
+        exporter = jaeger_exporter.JaegerExporter(service_name)
 
         self.assertEqual(exporter.service_name, service_name)
         self.assertEqual(exporter.agent_host_name, agent_host_name)
@@ -82,7 +82,7 @@ def test_constructor_explicit(self):
         password = "password"
         auth = (username, password)
 
-        exporter = jaeger_exporter.JaegerSpanExporter(
+        exporter = jaeger_exporter.JaegerExporter(
             service_name=service,
             agent_host_name=agent_host_name,
             agent_port=agent_port,
@@ -135,7 +135,7 @@ def test_constructor_by_environment_variables(self):
 
         environ_patcher.start()
 
-        exporter = jaeger_exporter.JaegerSpanExporter(service_name=service)
+        exporter = jaeger_exporter.JaegerExporter(service_name=service)
 
         self.assertEqual(exporter.service_name, service)
         self.assertEqual(exporter.agent_host_name, agent_host_name)
@@ -433,7 +433,7 @@ def test_translate_to_jaeger(self):
 
     def test_export(self):
         """Test that agent and/or collector are invoked"""
-        exporter = jaeger_exporter.JaegerSpanExporter(
+        exporter = jaeger_exporter.JaegerExporter(
             "test_export", agent_host_name="localhost", agent_port=6318
         )
 
diff --git a/exporter/opentelemetry-exporter-zipkin/setup.cfg b/exporter/opentelemetry-exporter-zipkin/setup.cfg
index 58cad78612d..f1a809be37c 100644
--- a/exporter/opentelemetry-exporter-zipkin/setup.cfg
+++ b/exporter/opentelemetry-exporter-zipkin/setup.cfg
@@ -53,4 +53,4 @@ test =
 
 [options.entry_points]
 opentelemetry_exporter =
-    zipkin = opentelemetry.exporter.zipkin:ZipkinSpanExporter
\ No newline at end of file
+    zipkin = opentelemetry.exporter.zipkin:ZipkinExporter
\ No newline at end of file
diff --git a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py
index 3dce5e4ed2c..6c8fea5ea03 100644
--- a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py
+++ b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py
@@ -39,8 +39,8 @@
     trace.set_tracer_provider(TracerProvider())
     tracer = trace.get_tracer(__name__)
 
-    # create a ZipkinSpanExporter
-    zipkin_exporter = zipkin.ZipkinSpanExporter(
+    # create a ZipkinExporter
+    zipkin_exporter = zipkin.ZipkinExporter(
         # protocol=Protocol.V2_PROTOBUF
         # optional:
         # endpoint="http://localhost:9411/api/v2/spans",
@@ -92,7 +92,7 @@
 logger = logging.getLogger(__name__)
 
 
-class ZipkinSpanExporter(SpanExporter):
+class ZipkinExporter(SpanExporter):
     def __init__(
         self,
         protocol: Protocol,
diff --git a/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py b/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py
index 43cbd25403f..93f4af8e452 100644
--- a/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py
+++ b/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py
@@ -18,7 +18,7 @@
 from unittest.mock import patch
 
 from opentelemetry import trace
-from opentelemetry.exporter.zipkin import DEFAULT_ENDPOINT, ZipkinSpanExporter
+from opentelemetry.exporter.zipkin import DEFAULT_ENDPOINT, ZipkinExporter
 from opentelemetry.exporter.zipkin.encoder import Protocol
 from opentelemetry.exporter.zipkin.encoder.v2.protobuf import ProtobufEncoder
 from opentelemetry.exporter.zipkin.node_endpoint import NodeEndpoint
@@ -38,7 +38,7 @@ def __init__(self, status_code):
         self.text = status_code
 
 
-class TestZipkinSpanExporter(unittest.TestCase):
+class TestZipkinExporter(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         trace.set_tracer_provider(
@@ -52,7 +52,7 @@ def tearDown(self):
             del os.environ[OTEL_EXPORTER_ZIPKIN_ENDPOINT]
 
     def test_constructor_default(self):
-        exporter = ZipkinSpanExporter(Protocol.V2_PROTOBUF)
+        exporter = ZipkinExporter(Protocol.V2_PROTOBUF)
         self.assertIsInstance(exporter.encoder, ProtobufEncoder)
         self.assertEqual(exporter.endpoint, DEFAULT_ENDPOINT)
         self.assertEqual(exporter.local_node.service_name, TEST_SERVICE_NAME)
@@ -64,7 +64,7 @@ def test_constructor_env_vars(self):
         os_endpoint = "https://foo:9911/path"
         os.environ[OTEL_EXPORTER_ZIPKIN_ENDPOINT] = os_endpoint
 
-        exporter = ZipkinSpanExporter(Protocol.V2_PROTOBUF)
+        exporter = ZipkinExporter(Protocol.V2_PROTOBUF)
 
         self.assertEqual(exporter.endpoint, os_endpoint)
         self.assertEqual(exporter.local_node.service_name, TEST_SERVICE_NAME)
@@ -78,7 +78,7 @@ def test_constructor_protocol_endpoint(self):
         protocol = Protocol.V2_PROTOBUF
         endpoint = "https://opentelemetry.io:15875/myapi/traces?format=zipkin"
 
-        exporter = ZipkinSpanExporter(protocol, endpoint)
+        exporter = ZipkinExporter(protocol, endpoint)
 
         self.assertIsInstance(exporter.encoder, ProtobufEncoder)
         self.assertEqual(exporter.endpoint, endpoint)
@@ -101,7 +101,7 @@ def test_constructor_all_params_and_env_vars(self):
         local_node_port = 30301
         max_tag_value_length = 56
 
-        exporter = ZipkinSpanExporter(
+        exporter = ZipkinExporter(
             constructor_param_protocol,
             constructor_param_endpoint,
             local_node_ipv4,
@@ -125,7 +125,7 @@ def test_constructor_all_params_and_env_vars(self):
     def test_invalid_response(self, mock_post):
         mock_post.return_value = MockResponse(404)
         spans = []
-        exporter = ZipkinSpanExporter(Protocol.V2_PROTOBUF)
+        exporter = ZipkinExporter(Protocol.V2_PROTOBUF)
         status = exporter.export(spans)
         self.assertEqual(SpanExportResult.FAILURE, status)
 

From e511460804ffc6380b41da3a1f639aec66ae3dd6 Mon Sep 17 00:00:00 2001
From: Leighton Chen <lechen@microsoft.com>
Date: Tue, 2 Mar 2021 16:26:54 -0800
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5792b1e5901..d9c48826ad9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1661])(https://github.com/open-telemetry/opentelemetry-python/pull/1661)
 - Rename `JaegerSpanExporter` to `JaegerExporter`
 - Rename `ZipkinSpanExporter` to `ZipkinExporter`
-  ([#1651])(https://github.com/open-telemetry/opentelemetry-python/pull/1651)
+  ([#1664])(https://github.com/open-telemetry/opentelemetry-python/pull/1664)
 
 ## [0.18b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v0.18b0) - 2021-02-16