remove id attribute from the final document

open-telemetry · Jan 9, 2025 · 9e0ad2f · 9e0ad2f
1 parent 1080790
commit 9e0ad2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/exporter/elasticsearchexporter/exporter.go b/exporter/elasticsearchexporter/exporter.go
@@ -178,12 +178,12 @@ func (e *elasticsearchExporter) pushLogRecord(
 		fIndex = formattedIndex
 	}
 
+	docID := e.extractDocumentIDAttribute(record.Attributes())
 	document, err := e.model.encodeLog(resource, resourceSchemaURL, record, scope, scopeSchemaURL)
 	if err != nil {
 		return fmt.Errorf("failed to encode log event: %w", err)
 	}
 
-	docID := e.getDocumentIDAttribute(record.Attributes())
 	return bulkIndexerSession.Add(ctx, fIndex, docID, bytes.NewReader(document), nil)
 }
 
@@ -460,9 +460,10 @@ func (e *elasticsearchExporter) pushSpanEvent(
 	return bulkIndexerSession.Add(ctx, fIndex, "", bytes.NewReader(docBytes), nil)
 }
 
-func (e *elasticsearchExporter) getDocumentIDAttribute(m pcommon.Map) string {
+func (e *elasticsearchExporter) extractDocumentIDAttribute(m pcommon.Map) string {
 	if e.config.LogsDynamicID.Enabled {
 		docID, ok := getFromAttributes(documentIDAttributeName, "", m)
+		m.Remove(documentIDAttributeName)
 		if docID != "" && ok {
 			return docID
 		}

diff --git a/exporter/elasticsearchexporter/exporter_test.go b/exporter/elasticsearchexporter/exporter_test.go
@@ -787,10 +787,14 @@ func TestExporterLogs(t *testing.T) {
 						} else {
 							assert.Equal(t, tt.expectedDocID, actionJSONToID(t, docs[0].Action), "expected _id to be set")
 						}
+
+						// Ensure the document id attribute is removed from the final document.
+						assert.NotContains(t, docs[0].Document, documentIDAttributeName, "expected document id attribute to be removed")
 						return itemsAllOK(docs)
 					})
 
 					exporter := newTestLogsExporter(t, server.URL, func(cfg *Config) {
+						cfg.Mapping.Mode = "otel"
 						cfg.LogsDynamicID.Enabled = true
 						cfgFn(cfg)
 					})