testbed: logs: add cri containerd test (no k8s metadata)

Signed-off-by: Dominik Rosiek <[email protected]>
open-telemetry · Mar 8, 2021 · c945b11 · c945b11
1 parent ef406d6
commit c945b11
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 0 deletions.
diff --git a/testbed/datasenders/k8s.go b/testbed/datasenders/k8s.go
@@ -270,3 +270,49 @@ func NewKubernetesCRIContainerdWriter() *FileLogK8sWriter {
           - remove: uid
   `)
 }
+
+// NewKubernetesCRIContainerdNoAttributesOpsWriter returns FileLogK8sWriter with configuration
+// to parse only CRI-Containerd kubernetes logs without reformatting attributes
+func NewKubernetesCRIContainerdNoAttributesOpsWriter() *FileLogK8sWriter {
+	return NewFileLogK8sWriter(`
+  filelog:
+    include: [ %s ]
+    start_at: beginning
+    include_file_path: true
+    include_file_name: false
+    operators:
+      # Parse CRI-Containerd format
+      - type: regex_parser
+        id: parser-containerd
+        regex: '^(?P<time>[^ ^Z]+Z) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) (?P<log>.*)$'
+        output: extract_metadata_from_filepath
+        timestamp:
+          parse_from: time
+          layout: '%%Y-%%m-%%dT%%H:%%M:%%S.%%LZ'
+      # Extract metadata from file path
+      - type: regex_parser
+        id: extract_metadata_from_filepath
+        regex: '^.*\/(?P<namespace>[^_]+)_(?P<pod_name>[^_]+)_(?P<uid>[a-f0-9\-]{36})\/(?P<container_name>[^\._]+)\/(?P<run_id>\d+)\.log$'
+        parse_from: $$attributes.file_path
+  `)
+}
+
+// NewCRIContainerdWriter returns FileLogK8sWriter with configuration
+// to parse only CRI-Containerd logs (no extracting metadata from filename)
+func NewCRIContainerdWriter() *FileLogK8sWriter {
+	return NewFileLogK8sWriter(`
+  filelog:
+    include: [ %s ]
+    start_at: beginning
+    include_file_path: true
+    include_file_name: false
+    operators:
+      # Parse CRI-Containerd format
+      - type: regex_parser
+        id: parser-containerd
+        regex: '^(?P<time>[^ ^Z]+Z) (?P<stream>stdout|stderr) (?P<logtag>[^ ]*) (?P<log>.*)$'
+        timestamp:
+          parse_from: time
+          layout: '%%Y-%%m-%%dT%%H:%%M:%%S.%%LZ'
+  `)
+}
diff --git a/testbed/tests/log_test.go b/testbed/tests/log_test.go
@@ -70,6 +70,24 @@ func TestLog10kDPS(t *testing.T) {
 				ExpectedMaxRAM: 150,
 			},
 		},
+		{
+			name:     "k8s CRI-Containerd no attr ops",
+			sender:   datasenders.NewKubernetesCRIContainerdNoAttributesOpsWriter(),
+			receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)),
+			resourceSpec: testbed.ResourceSpec{
+				ExpectedMaxCPU: 100,
+				ExpectedMaxRAM: 150,
+			},
+		},
+		{
+			name:     "CRI-Containerd",
+			sender:   datasenders.NewCRIContainerdWriter(),
+			receiver: testbed.NewOTLPDataReceiver(testbed.GetAvailablePort(t)),
+			resourceSpec: testbed.ResourceSpec{
+				ExpectedMaxCPU: 100,
+				ExpectedMaxRAM: 150,
+			},
+		},
 	}
 
 	processors := map[string]string{