🔧 Add endTime field to access logs

Signed-off-by: Rintaro Okamura <[email protected]>
vdaas · Jan 25, 2021 · fc1e535 · fc1e535
1 parent 34e5a97
commit fc1e535
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/internal/net/grpc/interceptor/server/logging/accesslog.go b/internal/net/grpc/interceptor/server/logging/accesslog.go
@@ -37,6 +37,7 @@ const (
 type AccessLogEntity struct {
 	GRPC      *AccessLogGRPCEntity `json:"grpc,omitempty" yaml:"grpc"`
 	StartTime int64                `json:"startTime,omitempty" yaml:"startTime"`
+	EndTime   int64                `json:"endTime,omitempty" yaml:"endTime"`
 	Latency   int64                `json:"latency,omitempty" yaml:"latency"`
 	TraceID   string               `json:"traceID,omitempty" yaml:"traceID"`
 	Error     error                `json:"error,omitempty" yaml:"error"`
@@ -66,8 +67,7 @@ func AccessLogInterceptor() grpc.UnaryServerInterceptor {
 
 		resp, err = handler(ctx, req)
 
-		latency := time.Since(start).Nanoseconds()
-		startTime := start.UnixNano()
+		end := time.Now()
 
 		service, method := parseMethod(info.FullMethod)
 
@@ -77,8 +77,9 @@ func AccessLogInterceptor() grpc.UnaryServerInterceptor {
 				Service: service,
 				Method:  method,
 			},
-			StartTime: startTime,
-			Latency:   latency,
+			StartTime: start.UnixNano(),
+			EndTime:   end.UnixNano(),
+			Latency:   end.Sub(start).Nanoseconds(),
 		}
 
 		if traceID != "" {
@@ -114,8 +115,7 @@ func AccessLogStreamInterceptor() grpc.StreamServerInterceptor {
 
 		err := handler(srv, ss)
 
-		latency := time.Since(start).Nanoseconds()
-		startTime := start.UnixNano()
+		end := time.Now()
 
 		service, method := parseMethod(info.FullMethod)
 
@@ -125,8 +125,9 @@ func AccessLogStreamInterceptor() grpc.StreamServerInterceptor {
 				Service: service,
 				Method:  method,
 			},
-			StartTime: startTime,
-			Latency:   latency,
+			StartTime: start.UnixNano(),
+			EndTime:   end.UnixNano(),
+			Latency:   end.Sub(start).Nanoseconds(),
 		}
 
 		if traceID != "" {

diff --git a/k8s/metrics/loki/promtail.yaml b/k8s/metrics/loki/promtail.yaml
@@ -138,6 +138,8 @@ data:
                 grpcKind: details.grpc.kind
                 grpcService: details.grpc.service
                 grpcMethod: details.grpc.method
+                startTime: details.startTime
+                EndTime: details.endTime
                 latency: details.latency
                 traceID: details.traceID
           - labels: