[chore] Refactor azurelogs/testdata for different log types

pkg/translator/azurelogs/resourcelogs_to_logs_test.go

@@ -272,7 +272,7 @@ func TestExtractRawAttributes(t *testing.T) {
 func TestUnmarshalLogs_AzureCdnAccessLog(t *testing.T) {
 	t.Parallel()
 
-	dir := "testdata/azurecdnaccesslog"
+	dir := "testdata/cdnaccesslog"
 	tests := map[string]struct {
 		logFilename      string
 		expectedFilename string
@@ -408,58 +408,58 @@ func TestUnmarshalLogs_Files(t *testing.T) {
 	t.Parallel()
 
 	logsDir := "testdata"
-	expectedDir := "testdata/expected"
+	expectedDir := "testdata"
 	tests := map[string]struct {
 		logFilename      string
 		expectedFilename string
 	}{
 		"app_logs": {
-			logFilename:      "log-appserviceapplogs.json",
-			expectedFilename: "service-app-expected.yaml",
+			logFilename:      "appservicelog/appservice_applogs.json",
+			expectedFilename: "appservicelog/appservice_applogs_expected.yaml",
 		},
 		"audit_logs": {
-			logFilename:      "log-appserviceauditlogs.json",
-			expectedFilename: "audit-logs-expected.yaml",
+			logFilename:      "appservicelog/appservice_auditlogs.json",
+			expectedFilename: "appservicelog/appservice_auditlogs_expected.yaml",
 		},
 		"audit_logs_2": {
-			logFilename:      "log-appserviceipsecauditlogs.json",
-			expectedFilename: "audit-logs-2-expected.yaml",
+			logFilename:      "appservicelog/appservice_ipsecauditlogs.json",
+			expectedFilename: "appservicelog/appservice_ipsecauditlogs_expected.yaml",
 		},
 		"console_logs": {
-			logFilename:      "log-appserviceconsolelogs.json",
-			expectedFilename: "console-logs-expected.yaml",
+			logFilename:      "appservicelog/appservice_consolelogs.json",
+			expectedFilename: "appservicelog/appservice_consolelogs_expected.yaml",
 		},
 		"http_logs": {
-			logFilename:      "log-appservicehttplogs.json",
-			expectedFilename: "http-logs-expected.yaml",
+			logFilename:      "appservicelog/appservice_httplogs.json",
+			expectedFilename: "appservicelog/appservice_httplogs_expected.yaml",
 		},
 		"platform_logs": {
-			logFilename:      "log-appserviceplatformlogs.json",
-			expectedFilename: "platform-logs-expected.yaml",
+			logFilename:      "appservicelog/appservice_platformlogs.json",
+			expectedFilename: "appservicelog/appservice_platformlogs_expected.yaml",
 		},
 		"front_door_health_probe_logs": {
-			logFilename:      "log-frontdoorhealthprobelog.json",
-			expectedFilename: "front-door-health-probe-log-expected.yaml",
+			logFilename:      "frontdoorhealthprobelog/valid_1.json",
+			expectedFilename: "frontdoorhealthprobelog/valid_1_expected.yaml",
 		},
 		"log_bad_time": {
-			logFilename:      "log-bad-time.json",
-			expectedFilename: "log-bad-time-expected.yaml",
+			logFilename:      "cornercases/bad_time.json",
+			expectedFilename: "cornercases/bad_time_expected.yaml",
 		},
 		"log_bad_level": {
-			logFilename:      "log-bad-level.json",
-			expectedFilename: "log-bad-level-expected.yaml",
+			logFilename:      "cornercases/bad_level.json",
+			expectedFilename: "cornercases/bad_level_expected.yaml",
 		},
 		"log_maximum": {
-			logFilename:      "log-maximum.json",
-			expectedFilename: "log-maximum-expected.yaml",
+			logFilename:      "cornercases/maximum.json",
+			expectedFilename: "cornercases/maximum_expected.yaml",
 		},
 		"log_minimum": {
-			logFilename:      "log-minimum.json",
-			expectedFilename: "log-minimum-expected.yaml",
+			logFilename:      "cornercases/minimum.json",
+			expectedFilename: "cornercases/minimum_expected.yaml",
 		},
 		"log_minimum_2": {
-			logFilename:      "log-minimum-2.json",
-			expectedFilename: "log-minimum-2-expected.yaml",
+			logFilename:      "cornercases/minimum-2.json",
+			expectedFilename: "cornercases/minimum-2_expected.yaml",
 		},
 	}
 

pkg/translator/azurelogs/testdata/expected/service-app-expected.yaml → pkg/translator/azurelogs/testdata/appservicelog/appservice_applogs_expected.yaml

@@ -15,27 +15,27 @@ resourceLogs:
           - body:
               kvlistValue:
                 values:
-                  - key: container.id
-                    value:
-                      stringValue: CONTAINER_ID
-                  - key: exception.type
+                  - key: category
                     value:
-                      stringValue: EXCEPTION_CLASS
-                  - key: host.id
+                      stringValue: AppServiceAppLogs
+                  - key: code.filepath
                     value:
-                      stringValue: HOST
+                      stringValue: FILEPATH
                   - key: code.function
                     value:
                       stringValue: METHOD
-                  - key: code.filepath
+                  - key: container.id
                     value:
-                      stringValue: FILEPATH
+                      stringValue: CONTAINER_ID
                   - key: exception.stacktrace
                     value:
                       stringValue: STACKTRACE
-                  - key: category
+                  - key: exception.type
                     value:
-                      stringValue: AppServiceAppLogs
+                      stringValue: EXCEPTION_CLASS
+                  - key: host.id
+                    value:
+                      stringValue: HOST
                   - key: operation.name
                     value:
                       stringValue: AppLog