Merge branch 'main' into tracker-final

open-telemetry · VihasMakwana · Jan 7, 2025 · Feb 25, 2025 · Feb 28, 2025 · Feb 28, 2025
commit ec2bafbf51bc1774eab899f73024b919e49958df
@@ -1581,81 +1581,6 @@ func TestReadGzipCompressedLogsFromEnd(t *testing.T) {
 	sink.ExpectToken(t, []byte("testlog4"))
 }
 
-func TestIncludeFileRecordNumber(t *testing.T) {
-	t.Parallel()
-
-	tempDir := t.TempDir()
-	cfg := NewConfig().includeDir(tempDir)
-	cfg.StartAt = "beginning"
-	cfg.IncludeFileRecordNumber = true
-	operator, sink := testManager(t, cfg)
-
-	// Create a file, then start
-	temp := filetest.OpenTemp(t, tempDir)
-	filetest.WriteString(t, temp, "testlog1\n")
-
-	require.NoError(t, operator.Start(testutil.NewUnscopedMockPersister()))
-	defer func() {
-		require.NoError(t, operator.Stop())
-	}()
-
-	sink.ExpectCall(t, []byte("testlog1"), map[string]any{
-		attrs.LogFileName:         filepath.Base(temp.Name()),
-		attrs.LogFileRecordNumber: int64(1),
-	})
-}
-
-func TestIncludeFileRecordNumberWithHeaderConfigured(t *testing.T) {
-	t.Parallel()
-
-	tempDir := t.TempDir()
-	cfg := NewConfig().includeDir(tempDir)
-	cfg.StartAt = "beginning"
-	cfg.IncludeFileRecordNumber = true
-	cfg = cfg.withHeader("^#", "(?P<header_attr>[A-z]+)")
-	operator, sink := testManager(t, cfg)
-
-	// Create a file, then start
-	temp := filetest.OpenTemp(t, tempDir)
-	filetest.WriteString(t, temp, "#abc\n#xyz: headerValue2\ntestlog1\n")
-
-	require.NoError(t, operator.Start(testutil.NewUnscopedMockPersister()))
-	defer func() {
-		require.NoError(t, operator.Stop())
-	}()
-
-	sink.ExpectCall(t, []byte("testlog1"), map[string]any{
-		attrs.LogFileName:         filepath.Base(temp.Name()),
-		attrs.LogFileRecordNumber: int64(1),
-		"header_attr":             "xyz",
-	})
-}
-
-func TestIncludeFileRecordNumberWithHeaderConfiguredButMissing(t *testing.T) {
-	t.Parallel()
-
-	tempDir := t.TempDir()
-	cfg := NewConfig().includeDir(tempDir)
-	cfg.StartAt = "beginning"
-	cfg.IncludeFileRecordNumber = true
-	cfg = cfg.withHeader("^#", "(?P<header_key>[A-z]+): (?P<header_value>[A-z]+)")
-	operator, sink := testManager(t, cfg)
-
-	// Create a file, then start
-	temp := filetest.OpenTemp(t, tempDir)
-	filetest.WriteString(t, temp, "testlog1\n")
-
-	require.NoError(t, operator.Start(testutil.NewUnscopedMockPersister()))
-	defer func() {
-		require.NoError(t, operator.Stop())
-	}()
-
-	sink.ExpectCall(t, []byte("testlog1"), map[string]any{
-		attrs.LogFileName:         filepath.Base(temp.Name()),
-		attrs.LogFileRecordNumber: int64(1),
-	})
-}
-
 func TestArchive(t *testing.T) {
 	t.Skip("Time sensitive tests disabled for now on Windows. See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32715#issuecomment-2107737828")