Respond to comments

Author: DylanRussell

opentelemetry-exporter-gcp-logging/src/opentelemetry/exporter/cloud_logging/__init__.py

@@ -117,19 +117,29 @@ def _convert_any_value_to_string(value: Any) -> str:
     return ""
 
 
-def _convert_bytes_to_b64(body: MutableMapping) -> MutableMapping:
+def _convert_bytes_to_b64(body: Mapping, new_body: dict) -> dict:
     for key, value in list(body.items()):
-        if isinstance(value, bytes):
-            body[key] = base64.b64encode(value).decode()
+        if (
+            isinstance(value, Sequence)
+            and len(value) > 0
+            and isinstance(value[0], bytes)
+        ):
+            new_body[key] = [base64.b64encode(v).decode() for v in value]
+        elif isinstance(value, bytes):
+            new_body[key] = base64.b64encode(value).decode()
         elif isinstance(value, MutableMapping):
-            body[key] = _convert_bytes_to_b64(value)
-    return body
+            new_subbody = {}
+            new_body[key] = _convert_bytes_to_b64(value, new_subbody)
+        else:
+            new_body[key] = value
+    return new_body
 
 
 def _set_payload_in_log_entry(log_entry: LogEntry, body: Any | None):
     struct = Struct()
-    if isinstance(body, MutableMapping):
-        struct.update(_convert_bytes_to_b64(body))
+    if isinstance(body, Mapping):
+        new_body = {}
+        struct.update(_convert_bytes_to_b64(body, new_body))
         log_entry.json_payload = struct
     elif isinstance(body, bytes):
         json_str = body.decode("utf-8", errors="replace")

opentelemetry-exporter-gcp-logging/tests/__snapshots__/test_cloud_logging/test_convert_otlp_dict_body.json

@@ -5,6 +5,11 @@
         "jsonPayload": {
           "kvlistValue": {
             "bytes_field": "Ynl0ZXM=",
+            "repeated_bytes_field": [
+              "Ynl0ZXM=",
+              "Ynl0ZXM=",
+              "Ynl0ZXM="
+            ],
             "values": [
               {
                 "key": "content",

opentelemetry-exporter-gcp-logging/tests/test_cloud_logging.py

@@ -94,6 +94,7 @@ def test_convert_otlp_dict_body(
                             }
                         ],
                         "bytes_field": b"bytes",
+                        "repeated_bytes_field": [b"bytes", b"bytes", b"bytes"],
                     }
                 },
             ),