Allow inline context information in log calls

blackbox_test.go

@@ -73,3 +73,18 @@ func TestLoggerCtxToReturnLogger(t *testing.T) {
 	assert.Equal(t, "Message", logged.Values[0].(string))
 	assert.Equal(t, blackbox.Ctx{"key": "value"}, logged.Context)
 }
+
+func TestLoggerInlineCtx(t *testing.T) {
+	logger := blackbox.New()
+	testTarget := blackbox.NewTestTarget()
+	logger.AddTarget(testTarget)
+
+	logger.Log(blackbox.Info, "Message", blackbox.Ctx{"key": "value"})
+
+	logged, ok := testTarget.LastLogged()
+
+	assert.Equal(t, true, ok)
+	assert.Equal(t, blackbox.Info, logged.Level)
+	assert.Equal(t, "Message", logged.Values[0].(string))
+	assert.Equal(t, blackbox.Ctx{"key": "value"}, logged.Context)
+}

target.go

@@ -11,6 +11,13 @@ type targetSet struct {
 }
 
 func (t *targetSet) log(level Level, values []interface{}, context Ctx) {
+	for index, value := range values {
+		if ctx, ok := value.(Ctx); ok {
+			context = context.Extend(ctx)
+			values = append(values[:index], values[index+1:]...)
+		}
+	}
+
 	for _, target := range t.targets {
 		target.Log(level, values, context)
 	}