Merge branch 'main' into main

Author: k-shaikh

pkg/ottl/ottlfuncs/func_insert_xml_test.go

@@ -107,6 +107,13 @@ func Test_InsertXML(t *testing.T) {
 			want:      `<a>foo</a>`,
 			expectErr: `InsertXML XPath selected non-element: "foo"`,
 		},
+		{
+			name:     "insert missing elements",
+			document: `<a><b>has b</b></a><a></a><a><b>also has b</b></a>`,
+			xPath:    "//a[not(b)]", // elements of a which do not have a b
+			subdoc:   `<b></b>`,
+			want:     `<a><b>has b</b></a><a><b></b></a><a><b>also has b</b></a>`,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

testbed/tests/log_test.go

@@ -372,24 +372,19 @@ func TestLargeFileOnce(t *testing.T) {
 
 func TestMemoryLimiterHit(t *testing.T) {
 	tests := []struct {
-		name     string
-		sender   func() testbed.DataSender
-		receiver func() testbed.DataReceiver
+		name   string
+		sender testbed.DataSender
 	}{
 		{
-			name: "otlp",
-			sender: func() testbed.DataSender {
-				return testbed.NewOTLPLogsDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t))
-			},
+			name:   "otlp",
+			sender: testbed.NewOTLPLogsDataSender(testbed.DefaultHost, testutil.GetAvailablePort(t)),
 		},
 		{
 			name: "filelog",
-			sender: func() testbed.DataSender {
-				return datasenders.NewFileLogWriter(t).WithRetry(`
+			sender: datasenders.NewFileLogWriter(t).WithRetry(`
     retry_on_failure:
       enabled: true
-`)
-			},
+`),
 		},
 	}
 	for _, test := range tests {
@@ -422,7 +417,7 @@ func TestMemoryLimiterHit(t *testing.T) {
 			}
 			ScenarioMemoryLimiterHit(
 				t,
-				test.sender(),
+				test.sender,
 				otlpreceiver,
 				testbed.LoadOptions{
 					DataItemsPerSecond: 100000,