Merge branch 'master' into update-change-log

go.mod

@@ -6,10 +6,10 @@ require (
 	bitbucket.org/bertimus9/systemstat v0.0.0-20180207000608-0eeff89b0690
 	github.com/diegoholiveira/jsonlogic v1.0.1-0.20200220175622-ab7989be08b9
 	github.com/eclipse/paho.mqtt.golang v1.3.5
-	github.com/edgexfoundry/go-mod-bootstrap/v2 v2.0.0-dev.63
+	github.com/edgexfoundry/go-mod-bootstrap/v2 v2.0.0-dev.67
 	github.com/edgexfoundry/go-mod-core-contracts/v2 v2.0.0-dev.100
 	github.com/edgexfoundry/go-mod-messaging/v2 v2.0.0-dev.16
-	github.com/edgexfoundry/go-mod-registry/v2 v2.0.0-dev.7
+	github.com/edgexfoundry/go-mod-registry/v2 v2.0.0-dev.8
 	github.com/fxamacker/cbor/v2 v2.2.0
 	github.com/gomodule/redigo v2.0.0+incompatible
 	github.com/google/uuid v1.2.0

internal/trigger/mqtt/mqtt.go

@@ -20,12 +20,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/edgexfoundry/app-functions-sdk-go/v2/pkg/interfaces"
 	"net/url"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/edgexfoundry/app-functions-sdk-go/v2/pkg/interfaces"
+
 	"github.com/edgexfoundry/app-functions-sdk-go/v2/internal/appfunction"
 	"github.com/edgexfoundry/app-functions-sdk-go/v2/internal/bootstrap/container"
 	"github.com/edgexfoundry/app-functions-sdk-go/v2/internal/runtime"
@@ -172,6 +173,7 @@ func (trigger *Trigger) messageHandler(client pahoMqtt.Client, message pahoMqtt.
 		CorrelationID: correlationID,
 		ContentType:   contentType,
 		Payload:       data,
+		ReceivedTopic: message.Topic(),
 	}
 
 	messageError := trigger.runtime.ProcessMessage(appContext, envelope)