checking nil context in fctx

fault.go

@@ -21,10 +21,10 @@ func Wrap(err error, w ...Wrapper) error {
 		return nil
 	}
 
-	// the passed err might already have a location if it's a fault.New error, or it might not if it's another type of
+	// The passed err might already have a location if it's a fault. New error, or it might not if it's another type of
 	// error like one from the standard library. Wrapping it in a container with an empty location ensures that the
-	// location will be reset when we flatten the error chain. If the error is a fault.New error, it will itself be
-	// wrapped in a container which will have a location
+	// location will be reset when we flatten the error chain. If the error is a fault. New error, it will itself be
+	// wrapped in a container which will have a location.
 	if _, ok := err.(*container); !ok {
 		err = &container{
 			cause:    err,

fctx/fctx.go

@@ -44,6 +44,10 @@ func (e *withContext) String() string { return e.Error() }
 //		"post_id", postID,
 //	)
 func WithMeta(ctx context.Context, kv ...string) context.Context {
+	if ctx == nil {
+		return nil
+	}
+
 	data := make(map[string]string)
 
 	// overwrite any existing context metadata
@@ -90,8 +94,8 @@ func WithMeta(ctx context.Context, kv ...string) context.Context {
 //			"role", "admin")
 //	}
 func Wrap(err error, ctx context.Context, kv ...string) error {
-	if err == nil {
-		return nil
+	if err == nil || ctx == nil {
+		return err
 	}
 
 	meta := make(map[string]string)
@@ -107,17 +111,15 @@ func Wrap(err error, ctx context.Context, kv ...string) error {
 	}
 
 	l := len(kv)
-	if l >= 2 {
-		if l%2 != 0 {
-			l -= 1 // don't error on odd number of args
-		}
+	if l%2 != 0 {
+		l -= 1 // don't error on odd number of args
+	}
 
-		for i := 0; i < l; i += 2 {
-			k := kv[i]
-			v := kv[i+1]
+	for i := 0; i < l; i += 2 {
+		k := kv[i]
+		v := kv[i+1]
 
-			meta[k] = v
-		}
+		meta[k] = v
 	}
 
 	return &withContext{err, meta}
@@ -205,6 +207,10 @@ func Unwrap(err error) map[string]string {
 //
 // Which will flatten out the KV metadata from the context into the log entry.
 func GetMeta(ctx context.Context) map[string]string {
+	if ctx == nil {
+		return nil
+	}
+
 	meta, ok := ctx.Value(contextKey{}).(map[string]string)
 	if !ok {
 		return nil