feat: Add pipeline IDs as tags to the metris collected for each pipel…

…ine.

Signed-off-by: Leonard Goodell <[email protected]>

app-service-template/go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/diegoholiveira/jsonlogic v1.0.1-0.20200220175622-ab7989be08b9 // indirect
 	github.com/eclipse/paho.mqtt.golang v1.3.5 // indirect
-	github.com/edgexfoundry/go-mod-bootstrap/v2 v2.2.0-dev.18 // indirect
+	github.com/edgexfoundry/go-mod-bootstrap/v2 v2.2.0-dev.19 // indirect
 	github.com/edgexfoundry/go-mod-configuration/v2 v2.2.0-dev.3 // indirect
 	github.com/edgexfoundry/go-mod-messaging/v2 v2.2.0-dev.12 // indirect
 	github.com/edgexfoundry/go-mod-registry/v2 v2.2.0-dev.3 // indirect

app-service-template/go.sum

@@ -32,8 +32,8 @@ github.com/diegoholiveira/jsonlogic v1.0.1-0.20200220175622-ab7989be08b9 h1:NAHC
 github.com/diegoholiveira/jsonlogic v1.0.1-0.20200220175622-ab7989be08b9/go.mod h1:9STzWAIpeXT1gYFvw0JM+BkyMmPKYv/ztBNgXX4hAOw=
 github.com/eclipse/paho.mqtt.golang v1.3.5 h1:sWtmgNxYM9P2sP+xEItMozsR3w0cqZFlqnNN1bdl41Y=
 github.com/eclipse/paho.mqtt.golang v1.3.5/go.mod h1:eTzb4gxwwyWpqBUHGQZ4ABAV7+Jgm1PklsYT/eo8Hcc=
-github.com/edgexfoundry/go-mod-bootstrap/v2 v2.2.0-dev.18 h1:6QR9vgrk9cunfWPe2sYMrWBIgSgcCSagQ9IE3ZropLE=
-github.com/edgexfoundry/go-mod-bootstrap/v2 v2.2.0-dev.18/go.mod h1:6Q+rUmzAizdpU3sqnzMzSHmX7Z69qN69xxl0up/mQQA=
+github.com/edgexfoundry/go-mod-bootstrap/v2 v2.2.0-dev.19 h1:WdrAEuZIvgyHZhhHpLhlTaamcpj5Vi9W/ApJKGc+8ak=
+github.com/edgexfoundry/go-mod-bootstrap/v2 v2.2.0-dev.19/go.mod h1:6Q+rUmzAizdpU3sqnzMzSHmX7Z69qN69xxl0up/mQQA=
 github.com/edgexfoundry/go-mod-configuration/v2 v2.2.0-dev.3 h1:dTTExUFHza9eJmTABr8G4KOE8JKBMzZCVC3wARiwIg4=
 github.com/edgexfoundry/go-mod-configuration/v2 v2.2.0-dev.3/go.mod h1:YP17JhMnXTitowXE13QJwFaKo0oc03iyoKLjWAYl4FE=
 github.com/edgexfoundry/go-mod-core-contracts/v2 v2.2.0-dev.26 h1:YebVI3gAJwFTMXKzB2erUonBC8eNrr+qLUGdtXFMjKs=

go.mod

@@ -6,7 +6,7 @@ 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.2.0-dev.18
+	github.com/edgexfoundry/go-mod-bootstrap/v2 v2.2.0-dev.19
 	github.com/edgexfoundry/go-mod-core-contracts/v2 v2.2.0-dev.26
 	github.com/edgexfoundry/go-mod-messaging/v2 v2.2.0-dev.12
 	github.com/edgexfoundry/go-mod-registry/v2 v2.2.0-dev.3

go.sum

@@ -32,8 +32,8 @@ github.com/diegoholiveira/jsonlogic v1.0.1-0.20200220175622-ab7989be08b9 h1:NAHC
 github.com/diegoholiveira/jsonlogic v1.0.1-0.20200220175622-ab7989be08b9/go.mod h1:9STzWAIpeXT1gYFvw0JM+BkyMmPKYv/ztBNgXX4hAOw=
 github.com/eclipse/paho.mqtt.golang v1.3.5 h1:sWtmgNxYM9P2sP+xEItMozsR3w0cqZFlqnNN1bdl41Y=
 github.com/eclipse/paho.mqtt.golang v1.3.5/go.mod h1:eTzb4gxwwyWpqBUHGQZ4ABAV7+Jgm1PklsYT/eo8Hcc=
-github.com/edgexfoundry/go-mod-bootstrap/v2 v2.2.0-dev.18 h1:6QR9vgrk9cunfWPe2sYMrWBIgSgcCSagQ9IE3ZropLE=
-github.com/edgexfoundry/go-mod-bootstrap/v2 v2.2.0-dev.18/go.mod h1:6Q+rUmzAizdpU3sqnzMzSHmX7Z69qN69xxl0up/mQQA=
+github.com/edgexfoundry/go-mod-bootstrap/v2 v2.2.0-dev.19 h1:WdrAEuZIvgyHZhhHpLhlTaamcpj5Vi9W/ApJKGc+8ak=
+github.com/edgexfoundry/go-mod-bootstrap/v2 v2.2.0-dev.19/go.mod h1:6Q+rUmzAizdpU3sqnzMzSHmX7Z69qN69xxl0up/mQQA=
 github.com/edgexfoundry/go-mod-configuration/v2 v2.2.0-dev.3 h1:dTTExUFHza9eJmTABr8G4KOE8JKBMzZCVC3wARiwIg4=
 github.com/edgexfoundry/go-mod-configuration/v2 v2.2.0-dev.3/go.mod h1:YP17JhMnXTitowXE13QJwFaKo0oc03iyoKLjWAYl4FE=
 github.com/edgexfoundry/go-mod-core-contracts/v2 v2.2.0-dev.26 h1:YebVI3gAJwFTMXKzB2erUonBC8eNrr+qLUGdtXFMjKs=

internal/app/triggerfactory.go

@@ -106,7 +106,7 @@ func (svc *Service) RegisterCustomTriggerFactory(name string,
 		if err := svc.MetricsManager().Register(internal.MessagesReceivedName, messageProcessor.messagesReceived, nil); err != nil {
 			svc.lc.Warnf("%s metric failed to register and will not be reported: %s", internal.MessagesReceivedName, err.Error())
 		} else {
-			svc.lc.Infof("%s metric has been registered and will be reported", internal.MessagesReceivedName)
+			svc.lc.Infof("%s metric has been registered and will be reported (if enabled)", internal.MessagesReceivedName)
 		}
 
 		cfg := interfaces.TriggerConfig{

internal/runtime/runtime.go

@@ -28,14 +28,14 @@ import (
 	"strings"
 	"sync"
 
-	bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container"
 	gometrics "github.com/rcrowley/go-metrics"
 
+	bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/v2/bootstrap/container"
+
 	"github.com/edgexfoundry/app-functions-sdk-go/v2/internal"
 	"github.com/edgexfoundry/app-functions-sdk-go/v2/internal/appfunction"
 	"github.com/edgexfoundry/app-functions-sdk-go/v2/pkg/interfaces"
 
-	"github.com/edgexfoundry/go-mod-bootstrap/v2/di"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/clients/logger"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/common"
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/dtos"
@@ -44,6 +44,8 @@ import (
 	"github.com/edgexfoundry/go-mod-core-contracts/v2/models"
 	"github.com/edgexfoundry/go-mod-messaging/v2/pkg/types"
 
+	"github.com/edgexfoundry/go-mod-bootstrap/v2/di"
+
 	"github.com/fxamacker/cbor/v2"
 )
 
@@ -148,19 +150,19 @@ func (gr *GolangRuntime) addFunctionsPipeline(id string, topics []string, transf
 	lc := bootstrapContainer.LoggingClientFrom(gr.dic.Get)
 	metricManager := bootstrapContainer.MetricsManagerFrom(gr.dic.Get)
 	name := strings.Replace(internal.PipelineMessagesProcessedName, internal.PipelineIdTxt, pipeline.Id, 1)
-	err := metricManager.Register(name, pipeline.MessagesProcessed, nil)
+	err := metricManager.Register(name, pipeline.MessagesProcessed, map[string]string{"pipeline": pipeline.Id})
 	if err != nil {
 		lc.Warnf("Unable to register %s metric. Metric will not be reported : %s", name, err.Error())
 	} else {
-		lc.Infof("%s metric has been registered and will be reported", name)
+		lc.Infof("%s metric has been registered and will be reported (if enabled)", name)
 	}
 
 	name = strings.Replace(internal.PipelineMessageProcessingTimeName, internal.PipelineIdTxt, pipeline.Id, 1)
-	err = metricManager.Register(name, pipeline.MessageProcessingTime, nil)
+	err = metricManager.Register(name, pipeline.MessageProcessingTime, map[string]string{"pipeline": pipeline.Id})
 	if err != nil {
 		lc.Warnf("Unable to register %s metric. Metric will not be reported : %s", name, err.Error())
 	} else {
-		lc.Infof("%s metric has been registered and will be reported", name)
+		lc.Infof("%s metric has been registered and will be reported (if enabled)", name)
 	}
 
 	return &pipeline