Fix tests

Author: swiatekm

internal/pkg/otel/README.md

@@ -56,8 +56,8 @@ This section provides a summary of components included in the Elastic Distributi
 
 | Component | Version |
 |---|---|
-| [debugexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/debugexporter/v0.130.0/exporter/debugexporter/README.md) | v0.130.0 |
-| [elasticsearchexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/elasticsearchexporter/v0.130.0/exporter/elasticsearchexporter/README.md) | v0.130.0 |
+| [debugexporter](https://github.com/open-telemetry/opentelemetry-collector/blob/exporter/debugexporter/v0.132.0/exporter/debugexporter/README.md) | v0.132.0 |
+| [elasticsearchexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/elasticsearchexporter/v0.132.0/exporter/elasticsearchexporter/README.md) | v0.132.0 |
 | [fileexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/fileexporter/v0.130.0/exporter/fileexporter/README.md) | v0.130.0 |
 | [kafkaexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/kafkaexporter/v0.130.0/exporter/kafkaexporter/README.md) | v0.130.0 |
 | [loadbalancingexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/exporter/loadbalancingexporter/v0.130.0/exporter/loadbalancingexporter/README.md) | v0.130.0 |

internal/pkg/otel/translate/otelconfig_test.go

@@ -221,27 +221,35 @@ func TestGetOtelConfig(t *testing.T) {
 
 	expectedESConfig := map[string]any{
 		"elasticsearch/_agent-component/default": map[string]any{
-			"batcher": map[string]any{
-				"enabled":  true,
-				"max_size": 1600,
-				"min_size": 0,
-			},
 			"compression": "gzip",
 			"compression_params": map[string]any{
 				"level": 1,
 			},
 			"mapping": map[string]any{
 				"mode": "bodymap",
 			},
-			"endpoints": []string{"http://localhost:9200"},
-			"password":  "password",
-			"user":      "elastic",
+			"endpoints":          []string{"http://localhost:9200"},
+			"password":           "password",
+			"user":               "elastic",
+			"max_conns_per_host": 1,
 			"retry": map[string]any{
 				"enabled":          true,
 				"initial_interval": 1 * time.Second,
 				"max_interval":     1 * time.Minute,
 				"max_retries":      3,
 			},
+			"sending_queue": map[string]any{
+				"enabled":           true,
+				"num_consumers":     1,
+				"queue_size":        3200,
+				"block_on_overflow": true,
+				"wait_for_result":   true,
+				"batch": map[string]any{
+					"max_size": 1600,
+					"min_size": 0,
+					"sizer":    "items",
+				},
+			},
 			"logs_dynamic_id": map[string]any{
 				"enabled": true,
 			},

testing/integration/ess/beat_receivers_test.go

@@ -379,6 +379,9 @@ func TestClassicAndReceiverAgentMonitoring(t *testing.T) {
 			"data_stream.namespace",
 			"elastic_agent.id",
 			"event.ingested",
+
+			// only in receiver doc
+			"agent.otelcol",
 		}
 		switch tc.onlyCompareKeys {
 		case true:
@@ -585,6 +588,10 @@ outputs:
 			"data_stream.namespace",
 			"event.ingested",
 			"event.duration",
+
+			// only in receiver doc
+			"agent.otelcol.component.id",
+			"agent.otelcol.component.kind",
 		}
 
 		stripNondeterminism := func(m mapstr.M, mset string) {
@@ -668,7 +675,7 @@ outputs:
 				stripNondeterminism(agentDoc, tt.metricset)
 				stripNondeterminism(otelDoc, tt.metricset)
 
-				AssertMapstrKeysEqual(t, agentDoc, otelDoc, nil, "expected documents keys to be equal for metricset "+tt.metricset)
+				AssertMapstrKeysEqual(t, agentDoc, otelDoc, ignoredFields, "expected documents keys to be equal for metricset "+tt.metricset)
 				AssertMapsEqual(t, agentDoc, otelDoc, ignoredFields, "expected documents to be equal for metricset "+tt.metricset)
 			})
 		}

testing/integration/ess/otel_test.go

@@ -1635,6 +1635,10 @@ service:
 		"elastic_agent.id",
 		"elastic_agent.snapshot",
 		"elastic_agent.version",
+
+		// only in fbreceiver doc
+		"agent.otelcol.component.id",
+		"agent.otelcol.component.kind",
 	}
 
 	AssertMapsEqual(t, doc1, doc2, ignoredFields, "expected documents to be equal")