using service.name for check error logs (#2944)

* using service.name for check error logs * remove scale tests from qa * added service.type to logs
elastic · Sep 4, 2023 · ffb5b8d · ffb5b8d
1 parent d216aa0
commit ffb5b8d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/.buildkite/pipeline.tests-qa.yaml b/.buildkite/pipeline.tests-qa.yaml
@@ -16,16 +16,11 @@ steps:
         CHECK_CONTAINER_RESTART_COUNT: true
         CONTAINER_NAME: fleet-server
         CHECK_API_REQUEST_METRICS: true
+        SERVICE_TYPE_FIELD: service.name
   - label: ":rocket: Run Smoke tests"
     trigger: "fleet-smoke-tests"
     build:
       message: "${BUILDKITE_MESSAGE}"
       env:
         ENVIRONMENT: ${ENVIRONMENT}
-  - label: ":rocket: Run Scale tests"
-    trigger: "fleet-scale-tests"
-    build:
-      message: "${BUILDKITE_MESSAGE}"
-      env:
-        ENVIRONMENT: ${ENVIRONMENT}
 
diff --git a/.buildkite/pipeline.tests-staging.yaml b/.buildkite/pipeline.tests-staging.yaml
@@ -15,4 +15,5 @@ steps:
         CHECK_LOG_ERROR_RATE: true
         CHECK_CONTAINER_RESTART_COUNT: true
         CONTAINER_NAME: fleet-server
-        CHECK_API_REQUEST_METRICS: true
+        CHECK_API_REQUEST_METRICS: true
+        SERVICE_TYPE_FIELD: service.name
diff --git a/internal/pkg/logger/ecs.go b/internal/pkg/logger/ecs.go
@@ -54,6 +54,7 @@ const (
 
 	// Service
 	ECSServiceName = "service.name"
+	ECSServiceType = "service.type"
 )
 
 // Non ECS compliant contants used in logging

diff --git a/internal/pkg/logger/logger.go b/internal/pkg/logger/logger.go
@@ -150,7 +150,7 @@ func configure(cfg *config.Config, svcName string) (lg zerolog.Logger, wr Writer
 	lg = lg.Level(zerolog.TraceLevel)
 
 	if svcName != "" {
-		lg = lg.With().Str(ECSServiceName, svcName).Logger()
+		lg = lg.With().Str(ECSServiceName, svcName).Str(ECSServiceType, svcName).Logger()
 	}
 
 	return //nolint:nakedret // short function