add log at request start

grafana · Sep 25, 2024 · 22cb3d6 · 22cb3d6
1 parent d44c599
commit 22cb3d6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/backend/adapter_utils.go b/backend/adapter_utils.go
@@ -120,6 +120,11 @@ func tracingWrapper(next handlerWrapperFunc) handlerWrapperFunc {
 func logWrapper(next handlerWrapperFunc) handlerWrapperFunc {
 	return func(ctx context.Context) (RequestStatus, error) {
 		start := time.Now()
+
+		ctxLogger := Logger.FromContext(ctx)
+		logFunc := ctxLogger.Debug
+		logFunc("Plugin Request Started")
+
 		status, err := next(ctx)
 
 		logParams := []any{
@@ -133,8 +138,6 @@ func logWrapper(next handlerWrapperFunc) handlerWrapperFunc {
 
 		logParams = append(logParams, "statusSource", string(errorSourceFromContext(ctx)))
 
-		ctxLogger := Logger.FromContext(ctx)
-		logFunc := ctxLogger.Debug
 		if status > RequestStatusCancelled {
 			logFunc = ctxLogger.Error
 		}

diff --git a/backend/log.go b/backend/log.go
@@ -18,21 +18,21 @@ var NewLoggerWith = func(args ...interface{}) log.Logger {
 }
 
 func withContextualLogAttributes(ctx context.Context, pCtx PluginContext) context.Context {
-	args := []any{"pluginID", pCtx.PluginID}
+	args := []any{"pluginId", pCtx.PluginID}
 
 	endpoint := EndpointFromContext(ctx)
 	if !endpoint.IsEmpty() {
 		args = append(args, "endpoint", string(endpoint))
 	}
 
 	if tid := trace.SpanContextFromContext(ctx).TraceID(); tid.IsValid() {
-		args = append(args, "traceID", tid.String())
+		args = append(args, "traceId", tid.String())
 	}
 	if pCtx.DataSourceInstanceSettings != nil {
 		args = append(
 			args,
 			"dsName", pCtx.DataSourceInstanceSettings.Name,
-			"dsUID", pCtx.DataSourceInstanceSettings.UID,
+			"dsUid", pCtx.DataSourceInstanceSettings.UID,
 		)
 		if pCtx.User != nil {
 			args = append(args, "uname", pCtx.User.Name)