Fix case where a list contains None values and make tests more clear

Author: aabmass

exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/_internal/__init__.py

@@ -84,7 +84,7 @@ def _encode_value(
     if isinstance(value, Sequence):
         return PB2AnyValue(
             array_value=PB2ArrayValue(
-                values=[_encode_value(v, allow_null=allow_null) for v in value]
+                values=_encode_array(value, allow_null=allow_null)
             )
         )
     elif isinstance(value, Mapping):
@@ -99,12 +99,27 @@ def _encode_value(
     raise Exception(f"Invalid type {type(value)} of value {value}")
 
 
-def _encode_key_value(key: str, value: Any, allow_null: bool = False) -> PB2KeyValue:
+def _encode_key_value(
+    key: str, value: Any, allow_null: bool = False
+) -> PB2KeyValue:
     return PB2KeyValue(
         key=key, value=_encode_value(value, allow_null=allow_null)
     )
 
 
+def _encode_array(
+    array: Sequence[Any], allow_null: bool = False
+) -> Sequence[PB2AnyValue]:
+    return [
+        _encode_value(v, allow_null=allow_null)
+        if v is not None
+        # Use an empty AnyValue to respresent None in an array. Behavior may change pending
+        # https://github.com/open-telemetry/opentelemetry-specification/issues/4392
+        else PB2AnyValue()
+        for v in array
+    ]
+
+
 def _encode_span_id(span_id: int) -> bytes:
     return span_id.to_bytes(length=8, byteorder="big", signed=False)
 

exporter/opentelemetry-exporter-otlp-proto-common/tests/test_log_encoder.py

@@ -27,10 +27,16 @@
     ExportLogsServiceRequest,
 )
 from opentelemetry.proto.common.v1.common_pb2 import AnyValue as PB2AnyValue
+from opentelemetry.proto.common.v1.common_pb2 import (
+    ArrayValue as PB2ArrayValue,
+)
 from opentelemetry.proto.common.v1.common_pb2 import (
     InstrumentationScope as PB2InstrumentationScope,
 )
 from opentelemetry.proto.common.v1.common_pb2 import KeyValue as PB2KeyValue
+from opentelemetry.proto.common.v1.common_pb2 import (
+    KeyValueList as PB2KeyValueList,
+)
 from opentelemetry.proto.logs.v1.logs_pb2 import LogRecord as PB2LogRecord
 from opentelemetry.proto.logs.v1.logs_pb2 import (
     ResourceLogs as PB2ResourceLogs,
@@ -163,7 +169,7 @@ def _get_sdk_log_data() -> List[LogData]:
                 trace_flags=TraceFlags(0x01),
                 severity_text="INFO",
                 severity_number=SeverityNumber.INFO,
-                body={"error": None},
+                body={"error": None, "array_with_nones": [1, None, 2]},
                 resource=SDKResource({}),
                 attributes={},
             ),
@@ -326,8 +332,28 @@ def get_test_logs(
                                     flags=int(TraceFlags(0x01)),
                                     severity_text="INFO",
                                     severity_number=SeverityNumber.INFO.value,
-                                    body=_encode_value(
-                                        {"error": None}, allow_null=True
+                                    body=PB2AnyValue(
+                                        kvlist_value=PB2KeyValueList(
+                                            values=[
+                                                PB2KeyValue(key="error"),
+                                                PB2KeyValue(
+                                                    key="array_with_nones",
+                                                    value=PB2AnyValue(
+                                                        array_value=PB2ArrayValue(
+                                                            values=[
+                                                                PB2AnyValue(
+                                                                    int_value=1
+                                                                ),
+                                                                PB2AnyValue(),
+                                                                PB2AnyValue(
+                                                                    int_value=2
+                                                                ),
+                                                            ]
+                                                        )
+                                                    ),
+                                                ),
+                                            ]
+                                        )
                                     ),
                                     attributes={},
                                 ),