Merge branch 'main' into nicholas.hulston/fix-span-link-optional-fields

Author: nhulston

data-pipeline-ffi/src/error.rs

@@ -119,7 +119,7 @@ impl From<TraceExporterError> for ExporterError {
                     ExporterErrorCode::HttpUnknown
                 }
             }
-            TraceExporterError::Serde(_) => ExporterErrorCode::Serde,
+            TraceExporterError::Serialization(_) => ExporterErrorCode::Serde,
         };
         ExporterError::new(code, &value.to_string())
     }