refactor: Removed client monitoring

closes edgexfoundry#2594

Signed-off-by: lenny <leonard.goodell@intel.com>

api/raml/system-agent.raml

@@ -51,7 +51,7 @@ schemas:
                 body:
                     application/json:
                         schema: config
-                        example: '{"Service":"edgex-support-notifications","Config":{"Clients":{"Logging":{"Host":"localhost","Port":48061,"Protocol":"http"}},"Databases":{"Primary":{"Host":"localhost","Name":"notifications","Password":"","Port":27017,"Timeout":5000,"Type":"mongodb","Username":""}},"Logging":{"EnableRemote":false,"File":"./logs/edgex-support-notifications.log"},"Registry":{"Host":"localhost","Port":8500,"Type":"consul"},"ResendLimit":2,"Service":{"BootTimeout":30000,"CheckInterval":"10s","ClientMonitor":15000,"Host":"localhost","Port":48060,"Protocol":"http","MaxResultCount":1000,"StartupMsg":"This is the Support Notifications Microservice","Timeout":5000},"Smtp":{"Host":"smtp.gmail.com","Password":"mypassword","Port":587,"Sender":"jdoe@gmail.com","Subject":"EdgeX Notification"}}}'
+                        example: '{"Service":"edgex-support-notifications","Config":{"Clients":{"Logging":{"Host":"localhost","Port":48061,"Protocol":"http"}},"Databases":{"Primary":{"Host":"localhost","Name":"notifications","Password":"","Port":27017,"Timeout":5000,"Type":"mongodb","Username":""}},"Logging":{"EnableRemote":false,"File":"./logs/edgex-support-notifications.log"},"Registry":{"Host":"localhost","Port":8500,"Type":"consul"},"ResendLimit":2,"Service":{"BootTimeout":30000,"CheckInterval":"10s","Host":"localhost","Port":48060,"Protocol":"http","MaxResultCount":1000,"StartupMsg":"This is the Support Notifications Microservice","Timeout":5000},"Smtp":{"Host":"smtp.gmail.com","Password":"mypassword","Port":587,"Sender":"jdoe@gmail.com","Subject":"EdgeX Notification"}}}'
             "500":
                 description: for unknown or unanticipated issues.
 /v1/metrics/{services}:

cmd/core-command/res/configuration.toml

@@ -3,7 +3,6 @@ LogLevel = 'INFO'
 
 [Service]
 BootTimeout = 30000
-ClientMonitor = 15000
 CheckInterval = '10s'
 Host = 'localhost'
 Port = 48082

cmd/core-data/res/configuration.toml

@@ -9,7 +9,6 @@ ChecksumAlgo = 'xxHash'
 
 [Service]
 BootTimeout = 30000
-ClientMonitor = 15000
 CheckInterval = '10s'
 Host = 'localhost'
 Port = 48080

cmd/core-metadata/res/configuration.toml

@@ -4,7 +4,6 @@ EnableValueDescriptorManagement = false
 
 [Service]
 BootTimeout = 30000
-ClientMonitor = 15000
 CheckInterval = '10s'
 Host = 'localhost'
 Port = 48081

cmd/support-logging/res/configuration.toml

@@ -4,7 +4,6 @@ LogLevel = 'INFO'
 
 [Service]
 BootTimeout = 30000
-ClientMonitor = 15000
 CheckInterval = '10s'
 Host = 'localhost'
 Port = 48061

cmd/support-notifications/res/configuration.toml

@@ -4,7 +4,6 @@ LogLevel = 'INFO'
 
 [Service]
 BootTimeout = 30000
-ClientMonitor = 15000
 CheckInterval = '10s'
 Host = 'localhost'
 Port = 48060

cmd/support-scheduler/res/configuration.toml

@@ -4,7 +4,6 @@ LogLevel = 'INFO'
 
 [Service]
 BootTimeout = 30000
-ClientMonitor = 15000
 CheckInterval = '10s'
 Host = 'localhost'
 Port = 48085

cmd/sys-mgmt-agent/res/configuration.toml

@@ -17,7 +17,6 @@ LogLevel = 'INFO'
 
 [Service]
 BootTimeout = 30000
-ClientMonitor = 15000
 CheckInterval = '10s'
 Host = 'localhost'
 Port = 48090

internal/constants.go

@@ -17,7 +17,6 @@ const (
 	BootTimeoutDefault        = BootTimeoutSecondsDefault * 1000
 	BootTimeoutSecondsDefault = 30
 	BootRetrySecondsDefault   = 1
-	ClientMonitorDefault      = 15000
 	ConfigFileName            = "configuration.toml"
 	ConfigStemCore            = "edgex/core/"
 	ConfigStemSecurity        = "edgex/security/"

internal/core/command/init.go

@@ -19,15 +19,16 @@ import (
 	"context"
 	"sync"
 
-	"github.com/edgexfoundry/edgex-go/internal/core/command/container"
-	errorContainer "github.com/edgexfoundry/edgex-go/internal/pkg/container"
-	"github.com/edgexfoundry/edgex-go/internal/pkg/errorconcept"
-	"github.com/edgexfoundry/edgex-go/internal/pkg/urlclient"
+	"github.com/edgexfoundry/go-mod-core-contracts/clients/urlclient/local"
 
 	bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/bootstrap/container"
 	"github.com/edgexfoundry/go-mod-bootstrap/bootstrap/startup"
 	"github.com/edgexfoundry/go-mod-bootstrap/di"
 
+	"github.com/edgexfoundry/edgex-go/internal/core/command/container"
+	errorContainer "github.com/edgexfoundry/edgex-go/internal/pkg/container"
+	"github.com/edgexfoundry/edgex-go/internal/pkg/errorconcept"
+
 	"github.com/edgexfoundry/go-mod-core-contracts/clients"
 	"github.com/edgexfoundry/go-mod-core-contracts/clients/metadata"
 	"github.com/gorilla/mux"
@@ -56,24 +57,13 @@ func (b *Bootstrap) BootstrapHandler(ctx context.Context, wg *sync.WaitGroup, _
 	// 		than the configured client time out would still be present.
 	// 		Until that problem is addressed by larger architectural changes, if you are experiencing a bug similar to
 	//		https://github.com/edgexfoundry/edgex-go/issues/2421, the correct fix is to bump up the client timeout.
-	registryClient := bootstrapContainer.RegistryFrom(dic.Get)
 	configuration := container.ConfigurationFrom(dic.Get)
 	lc := bootstrapContainer.LoggingClientFrom(dic.Get)
 
 	// initialize clients required by the service
 	dic.Update(di.ServiceConstructorMap{
 		container.MetadataDeviceClientName: func(get di.Get) interface{} {
-			return metadata.NewDeviceClient(
-				urlclient.New(
-					ctx,
-					wg,
-					registryClient,
-					clients.CoreMetaDataServiceKey,
-					clients.ApiDeviceRoute,
-					configuration.Service.ClientMonitor,
-					configuration.Clients["Metadata"].Url()+clients.ApiDeviceRoute,
-				),
-			)
+			return metadata.NewDeviceClient(local.New(configuration.Clients["Metadata"].Url() + clients.ApiDeviceRoute))
 		},
 		errorContainer.ErrorHandlerName: func(get di.Get) interface{} {
 			return errorconcept.NewErrorHandler(lc)

internal/core/data/init.go

@@ -19,15 +19,16 @@ import (
 	"fmt"
 	"sync"
 
-	dataContainer "github.com/edgexfoundry/edgex-go/internal/core/data/container"
-	errorContainer "github.com/edgexfoundry/edgex-go/internal/pkg/container"
-	"github.com/edgexfoundry/edgex-go/internal/pkg/errorconcept"
-	"github.com/edgexfoundry/edgex-go/internal/pkg/urlclient"
+	"github.com/edgexfoundry/go-mod-core-contracts/clients/urlclient/local"
 
 	"github.com/edgexfoundry/go-mod-bootstrap/bootstrap/container"
 	"github.com/edgexfoundry/go-mod-bootstrap/bootstrap/startup"
 	"github.com/edgexfoundry/go-mod-bootstrap/di"
 
+	dataContainer "github.com/edgexfoundry/edgex-go/internal/core/data/container"
+	errorContainer "github.com/edgexfoundry/edgex-go/internal/pkg/container"
+	"github.com/edgexfoundry/edgex-go/internal/pkg/errorconcept"
+
 	"github.com/edgexfoundry/go-mod-core-contracts/clients"
 	"github.com/edgexfoundry/go-mod-core-contracts/clients/metadata"
 	"github.com/edgexfoundry/go-mod-messaging/messaging"
@@ -53,31 +54,10 @@ func (b *Bootstrap) BootstrapHandler(ctx context.Context, wg *sync.WaitGroup, _
 	loadRestRoutes(b.router, dic)
 
 	configuration := dataContainer.ConfigurationFrom(dic.Get)
-	registryClient := container.RegistryFrom(dic.Get)
 	lc := container.LoggingClientFrom(dic.Get)
 
-	mdc := metadata.NewDeviceClient(
-		urlclient.New(
-			ctx,
-			wg,
-			registryClient,
-			clients.CoreMetaDataServiceKey,
-			clients.ApiDeviceRoute,
-			configuration.Service.ClientMonitor,
-			configuration.Clients["Metadata"].Url()+clients.ApiDeviceRoute,
-		),
-	)
-	msc := metadata.NewDeviceServiceClient(
-		urlclient.New(
-			ctx,
-			wg,
-			registryClient,
-			clients.CoreMetaDataServiceKey,
-			clients.ApiDeviceServiceRoute,
-			configuration.Service.ClientMonitor,
-			configuration.Clients["Metadata"].Url()+clients.ApiDeviceRoute,
-		),
-	)
+	mdc := metadata.NewDeviceClient(local.New(configuration.Clients["Metadata"].Url() + clients.ApiDeviceRoute))
+	msc := metadata.NewDeviceServiceClient(local.New(configuration.Clients["Metadata"].Url() + clients.ApiDeviceRoute))
 
 	// Create the messaging client
 	msgClient, err := messaging.NewMessageClient(

internal/core/metadata/init.go

@@ -18,10 +18,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/edgexfoundry/edgex-go/internal/core/metadata/container"
-	errorContainer "github.com/edgexfoundry/edgex-go/internal/pkg/container"
-	"github.com/edgexfoundry/edgex-go/internal/pkg/errorconcept"
-	"github.com/edgexfoundry/edgex-go/internal/pkg/urlclient"
+	"github.com/edgexfoundry/go-mod-core-contracts/clients/urlclient/local"
 
 	bootstrapContainer "github.com/edgexfoundry/go-mod-bootstrap/bootstrap/container"
 	"github.com/edgexfoundry/go-mod-bootstrap/bootstrap/startup"
@@ -30,6 +27,10 @@ import (
 	"github.com/edgexfoundry/go-mod-core-contracts/clients/coredata"
 	"github.com/edgexfoundry/go-mod-core-contracts/clients/notifications"
 	"github.com/gorilla/mux"
+
+	"github.com/edgexfoundry/edgex-go/internal/core/metadata/container"
+	errorContainer "github.com/edgexfoundry/edgex-go/internal/pkg/container"
+	"github.com/edgexfoundry/edgex-go/internal/pkg/errorconcept"
 )
 
 // Bootstrap contains references to dependencies required by the BootstrapHandler.
@@ -56,7 +57,6 @@ func (b *Bootstrap) BootstrapHandler(ctx context.Context, wg *sync.WaitGroup, _
 	// 		Until that problem is addressed by larger architectural changes, if you are experiencing a bug similar to
 	//		https://github.com/edgexfoundry/edgex-go/issues/2421, the correct fix is to bump up the client timeout.
 	configuration := container.ConfigurationFrom(dic.Get)
-	registryClient := bootstrapContainer.RegistryFrom(dic.Get)
 
 	// add dependencies to container
 	dic.Update(di.ServiceConstructorMap{
@@ -65,29 +65,12 @@ func (b *Bootstrap) BootstrapHandler(ctx context.Context, wg *sync.WaitGroup, _
 		},
 		container.CoreDataValueDescriptorClientName: func(get di.Get) interface{} {
 			return coredata.NewValueDescriptorClient(
-				urlclient.New(
-					ctx,
-					wg,
-					registryClient,
-					clients.CoreDataServiceKey,
-					clients.ApiValueDescriptorRoute,
-					configuration.Service.ClientMonitor,
-					configuration.Clients["CoreData"].Url()+clients.ApiValueDescriptorRoute,
-				),
-			)
+				local.New(configuration.Clients["CoreData"].Url() + clients.ApiValueDescriptorRoute))
 		},
 		container.NotificationsClientName: func(get di.Get) interface{} {
 			return notifications.NewNotificationsClient(
-				urlclient.New(
-					ctx,
-					wg,
-					registryClient,
-					clients.SupportNotificationsServiceKey,
-					clients.ApiNotificationRoute,
-					configuration.Service.ClientMonitor,
-					configuration.Clients["Notifications"].Url()+clients.ApiNotificationRoute,
-				),
-			)
+				local.New(configuration.Clients["Notifications"].Url() + clients.ApiNotificationRoute))
+
 		},
 	})