Add changelog, log exception

Author: DylanRussell

opentelemetry-exporter-gcp-logging/CHANGELOG.md

@@ -2,8 +2,8 @@
 
 ## Unreleased
 
-- Added support for when a `Mapping[str, bytes]` or `Mapping[str, List[bytes]]` is in `LogRecord.body`.
-- Added support for when a `Mapping[str, List[Mapping]]` is in `LogRecord.body`.
+- Added support for when a `Mapping[str, bytes]` or `Mapping[str, List[bytes]]` is in `LogRecord.body` or `LogRecord.attributes`.
+- Added support for when a `Mapping[str, List[Mapping]]` is in `LogRecord.body` or `LogRecord.attributes`.
 - Do not call `logging.warning` when `LogRecord.body` is of None type, instead leave `LogEntry.payload` empty.
 - Update opentelemetry-api/sdk dependencies to 1.3.
 

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

@@ -113,7 +113,7 @@ def default(self, o: Any) -> Any:
         return super().default(o)
 
 
-def _convert_any_value_to_string(value: Any, debug_location: str) -> str:
+def _convert_any_value_to_string(value: Any) -> str:
     if isinstance(value, bool):
         return "true" if value else "false"
     if isinstance(value, bytes):
@@ -122,12 +122,14 @@ def _convert_any_value_to_string(value: Any, debug_location: str) -> str:
         return str(value)
     if isinstance(value, (list, tuple, Mapping)):
         return json.dumps(value, separators=(",", ":"), cls=_GenAiJsonEncoder)
-    logging.warning(
-        "Unexpected type %s found in %s, this field will not be added to the LogEntry.",
-        type(value),
-        debug_location,
-    )
-    return ""
+    try:
+        return str(value)
+    except Exception as exc: # pylint: disable=broad-except
+        logging.exception(
+            "Error mapping AnyValue to string, this field will not be added to the LogEntry: %s",
+            exc,
+        )
+        return ""
 
 
 # Be careful not to mutate original body. Make copies of anything that needs to change.
@@ -189,7 +191,7 @@ def _set_payload_in_log_entry(log_entry: LogEntry, body: AnyValue):
             log_entry.text_payload = base64.b64encode(body).decode()
     elif body is not None:
         log_entry.text_payload = _convert_any_value_to_string(
-            body, "LogRecord.body"
+            body
         )
 
 
@@ -279,7 +281,7 @@ def export(self, batch: Sequence[LogData]):
                 ]
             log_entry.labels = {
                 k: _convert_any_value_to_string(
-                    v, "LogRecord.Attribute {}".format(k)
+                    v
                 )
                 for k, v in attributes.items()
             }