From 764ead9ce19b07e039947a0c8f7d16f5765b9a65 Mon Sep 17 00:00:00 2001
From: alrex <alrex.boten@gmail.com>
Date: Thu, 22 Oct 2020 21:08:24 -0700
Subject: [PATCH] Revert "Zipkin: Fix OTLP events to Zipkin annotations
 translation (#1161)"

This reverts commit 6222b2aabe3ac174d11b8fcfe70dafd0573d0a4e.
---
 .../CHANGELOG.md                              |  1 -
 .../opentelemetry/exporter/zipkin/__init__.py | 29 ++++++++-----------
 .../tests/test_zipkin_exporter.py             | 10 +------
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md b/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md
index 3801c81dc..a980e3456 100644
--- a/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md
+++ b/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md
@@ -4,7 +4,6 @@
 
 - Zipkin exporter now accepts a ``max_tag_value_length`` attribute to customize the
   maximum allowed size a tag value can have. ([#1151](https://github.com/open-telemetry/opentelemetry-python/pull/1151)) 
-- Fixed OTLP events to Zipkin annotations translation. ([#1161](https://github.com/open-telemetry/opentelemetry-python/pull/1161))
 
 ## Version 0.13b0
 
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 bacfcc278..5e544275b 100644
--- a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py
+++ b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/__init__.py
@@ -237,25 +237,20 @@ class ZipkinSpanExporter(SpanExporter):
             tags.update(self._extract_tags_from_dict(span.resource.attributes))
         return tags
 
-    def _extract_annotations_from_events(self, events):
-        if not events:
-            return None
-
-        annotations = []
-        for event in events:
-            attrs = {}
-            for key, value in event.attributes.items():
-                if isinstance(value, str):
-                    value = value[: self.max_tag_value_length]
-                attrs[key] = value
-
-            annotations.append(
+    def _extract_annotations_from_events(
+        self, events
+    ):  # pylint: disable=R0201
+        return (
+            [
                 {
-                    "timestamp": _nsec_to_usec_round(event.timestamp),
-                    "value": json.dumps({event.name: attrs}),
+                    "timestamp": _nsec_to_usec_round(e.timestamp),
+                    "value": e.name,
                 }
-            )
-        return annotations
+                for e in events
+            ]
+            if events
+            else None
+        )
 
 
 def _nsec_to_usec_round(nsec):
diff --git a/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py b/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py
index 1979d8459..635594868 100644
--- a/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py
+++ b/exporter/opentelemetry-exporter-zipkin/tests/test_zipkin_exporter.py
@@ -223,15 +223,7 @@ class TestZipkinSpanExporter(unittest.TestCase):
                 "annotations": [
                     {
                         "timestamp": event_timestamp // 10 ** 3,
-                        "value": json.dumps(
-                            {
-                                "event0": {
-                                    "annotation_bool": True,
-                                    "annotation_string": "annotation_test",
-                                    "key_float": 0.3,
-                                }
-                            }
-                        ),
+                        "value": "event0",
                     }
                 ],
                 "debug": True,