renamed server package to metricsendpoint (#268)

annactl/service_collection.go

@@ -16,7 +16,6 @@ import (
 	"github.com/xh3b4sd/anna/service/network"
 	"github.com/xh3b4sd/anna/service/permutation"
 	"github.com/xh3b4sd/anna/service/random"
-	"github.com/xh3b4sd/anna/service/server"
 	"github.com/xh3b4sd/anna/service/spec"
 	"github.com/xh3b4sd/anna/service/textendpoint"
 	"github.com/xh3b4sd/anna/service/textinput"
@@ -37,7 +36,6 @@ func (a *annactl) newServiceCollection() spec.Collection {
 	collection.SetNetwork(a.newNetworkService())
 	collection.SetPermutation(a.newPermutationService())
 	collection.SetRandom(a.newRandomService())
-	collection.SetServer(a.newServerService())
 	collection.SetTextEndpoint(a.newTextEndpointService())
 	collection.SetTextInput(a.newTextInputService())
 	collection.SetTextOutput(a.newTextOutputService())
@@ -52,7 +50,6 @@ func (a *annactl) newServiceCollection() spec.Collection {
 	collection.Network().SetServiceCollection(collection)
 	collection.Permutation().SetServiceCollection(collection)
 	collection.Random().SetServiceCollection(collection)
-	collection.Server().SetServiceCollection(collection)
 	collection.TextEndpoint().SetServiceCollection(collection)
 	collection.TextInput().SetServiceCollection(collection)
 	collection.TextOutput().SetServiceCollection(collection)
@@ -70,7 +67,6 @@ func (a *annactl) newServiceCollection() spec.Collection {
 	panicOnError(collection.Network().Validate())
 	panicOnError(collection.Permutation().Validate())
 	panicOnError(collection.Random().Validate())
-	panicOnError(collection.Server().Validate())
 	panicOnError(collection.TextEndpoint().Validate())
 	panicOnError(collection.TextInput().Validate())
 	panicOnError(collection.TextOutput().Validate())
@@ -88,7 +84,6 @@ func (a *annactl) newServiceCollection() spec.Collection {
 	panicOnError(collection.Network().Configure())
 	panicOnError(collection.Permutation().Configure())
 	panicOnError(collection.Random().Configure())
-	panicOnError(collection.Server().Configure())
 	panicOnError(collection.TextEndpoint().Configure())
 	panicOnError(collection.TextInput().Configure())
 	panicOnError(collection.TextOutput().Configure())
@@ -144,14 +139,6 @@ func (a *annactl) newRandomService() spec.Random {
 	return newService
 }
 
-func (a *annactl) newServerService() spec.Server {
-	newService := server.New()
-
-	newService.SetHTTPAddress(a.flags.HTTPAddr)
-
-	return newService
-}
-
 func (a *annactl) newTextEndpointService() spec.TextEndpoint {
 	newService := textendpoint.New()
 

annad/annad.go

@@ -51,9 +51,8 @@ func (a *annad) ExecAnnadCmd(cmd *cobra.Command, args []string) {
 	a.Service().Log().Line("msg", "booting network")
 	go a.Service().Network().Boot()
 
-	// TODO rename to instrumentation endpoint
-	a.Service().Log().Line("msg", "booting server")
-	go a.Service().Server().Boot()
+	a.Service().Log().Line("msg", "booting metrics endpoint")
+	go a.Service().MetricsEndpoint().Boot()
 
 	a.Service().Log().Line("msg", "booting text endpoint")
 	go a.Service().TextEndpoint().Boot()

annad/main.go

@@ -102,8 +102,8 @@ func (a *annad) Shutdown() {
 
 		wg.Add(1)
 		go func() {
-			a.Service().Log().Line("msg", "shutting down server")
-			a.Service().Server().Shutdown()
+			a.Service().Log().Line("msg", "shutting down metrics endpoint")
+			a.Service().MetricsEndpoint().Shutdown()
 			wg.Done()
 		}()
 

annad/service_collection.go

@@ -14,10 +14,10 @@ import (
 	"github.com/xh3b4sd/anna/service/id"
 	"github.com/xh3b4sd/anna/service/instrumentor/prometheus"
 	"github.com/xh3b4sd/anna/service/log"
+	"github.com/xh3b4sd/anna/service/metricsendpoint"
 	"github.com/xh3b4sd/anna/service/network"
 	"github.com/xh3b4sd/anna/service/permutation"
 	"github.com/xh3b4sd/anna/service/random"
-	"github.com/xh3b4sd/anna/service/server"
 	"github.com/xh3b4sd/anna/service/spec"
 	"github.com/xh3b4sd/anna/service/storage"
 	"github.com/xh3b4sd/anna/service/storage/memory"
@@ -39,10 +39,10 @@ func (a *annad) newServiceCollection() spec.Collection {
 	collection.SetID(a.newIDService())
 	collection.SetInstrumentor(a.newInstrumentorService())
 	collection.SetLog(a.newLogService())
+	collection.SetMetricsEndpoint(a.newMetricsEndpointService())
 	collection.SetNetwork(a.newNetworkService())
 	collection.SetPermutation(a.newPermutationService())
 	collection.SetRandom(a.newRandomService())
-	collection.SetServer(a.newServerService())
 	collection.SetStorageCollection(a.newStorageCollection())
 	collection.SetTextEndpoint(a.newTextEndpointService())
 	collection.SetTextInput(a.newTextInputService())
@@ -56,10 +56,10 @@ func (a *annad) newServiceCollection() spec.Collection {
 	collection.ID().SetServiceCollection(collection)
 	collection.Instrumentor().SetServiceCollection(collection)
 	collection.Log().SetServiceCollection(collection)
+	collection.MetricsEndpoint().SetServiceCollection(collection)
 	collection.Network().SetServiceCollection(collection)
 	collection.Permutation().SetServiceCollection(collection)
 	collection.Random().SetServiceCollection(collection)
-	collection.Server().SetServiceCollection(collection)
 	collection.Storage().Connection().SetServiceCollection(collection)
 	collection.Storage().Feature().SetServiceCollection(collection)
 	collection.Storage().General().SetServiceCollection(collection)
@@ -78,10 +78,10 @@ func (a *annad) newServiceCollection() spec.Collection {
 	panicOnError(collection.ID().Validate())
 	panicOnError(collection.Instrumentor().Validate())
 	panicOnError(collection.Log().Validate())
+	panicOnError(collection.MetricsEndpoint().Validate())
 	panicOnError(collection.Network().Validate())
 	panicOnError(collection.Permutation().Validate())
 	panicOnError(collection.Random().Validate())
-	panicOnError(collection.Server().Validate())
 	panicOnError(collection.Storage().Validate())
 	panicOnError(collection.Storage().Connection().Validate())
 	panicOnError(collection.Storage().Feature().Validate())
@@ -101,10 +101,10 @@ func (a *annad) newServiceCollection() spec.Collection {
 	panicOnError(collection.ID().Configure())
 	panicOnError(collection.Instrumentor().Configure())
 	panicOnError(collection.Log().Configure())
+	panicOnError(collection.MetricsEndpoint().Configure())
 	panicOnError(collection.Network().Configure())
 	panicOnError(collection.Permutation().Configure())
 	panicOnError(collection.Random().Configure())
-	panicOnError(collection.Server().Configure())
 	panicOnError(collection.Storage().Configure())
 	panicOnError(collection.Storage().Connection().Configure())
 	panicOnError(collection.Storage().Feature().Configure())
@@ -156,6 +156,14 @@ func (a *annad) newLogService() spec.Log {
 	return newService
 }
 
+func (a *annad) newMetricsEndpointService() spec.MetricsEndpoint {
+	newService := metricsendpoint.New()
+
+	newService.SetHTTPAddress(a.flags.HTTPAddr)
+
+	return newService
+}
+
 func (a *annad) newNetworkService() spec.Network {
 	return network.New()
 }
@@ -172,14 +180,6 @@ func (a *annad) newRandomService() spec.Random {
 	return newService
 }
 
-func (a *annad) newServerService() spec.Server {
-	newService := server.New()
-
-	newService.SetHTTPAddress(a.flags.HTTPAddr)
-
-	return newService
-}
-
 func (a *annad) newStorageCollection() spec.StorageCollection {
 	newCollection := storage.NewCollection()
 

service/collection.go

@@ -21,10 +21,10 @@ type collection struct {
 	id                spec.ID
 	instrumentor      spec.Instrumentor
 	log               spec.Log
+	metricsEndpoint   spec.MetricsEndpoint
 	network           spec.Network
 	permutation       spec.Permutation
 	random            spec.Random
-	server            spec.Server
 	storageCollection spec.StorageCollection
 	textEndpoint      spec.TextEndpoint
 	textInput         spec.TextInput
@@ -84,14 +84,18 @@ func (c *collection) Log() spec.Log {
 	return c.log
 }
 
-func (c *collection) Network() spec.Network {
-	return c.network
-}
-
 func (c *collection) Metadata() map[string]string {
 	return c.metadata
 }
 
+func (c *collection) MetricsEndpoint() spec.MetricsEndpoint {
+	return c.metricsEndpoint
+}
+
+func (c *collection) Network() spec.Network {
+	return c.network
+}
+
 func (c *collection) Permutation() spec.Permutation {
 	return c.permutation
 }
@@ -100,10 +104,6 @@ func (c *collection) Random() spec.Random {
 	return c.random
 }
 
-func (c *collection) Server() spec.Server {
-	return c.server
-}
-
 func (c *collection) Storage() spec.StorageCollection {
 	return c.storageCollection
 }
@@ -136,6 +136,10 @@ func (c *collection) SetLog(l spec.Log) {
 	c.log = l
 }
 
+func (c *collection) SetMetricsEndpoint(s spec.MetricsEndpoint) {
+	c.metricsEndpoint = s
+}
+
 func (c *collection) SetNetwork(n spec.Network) {
 	c.network = n
 }
@@ -148,10 +152,6 @@ func (c *collection) SetRandom(r spec.Random) {
 	c.random = r
 }
 
-func (c *collection) SetServer(s spec.Server) {
-	c.server = s
-}
-
 func (c *collection) SetStorageCollection(sc spec.StorageCollection) {
 	c.storageCollection = sc
 }
@@ -231,15 +231,15 @@ func (c *collection) Validate() error {
 	if c.log == nil {
 		return maskAnyf(invalidConfigError, "log service must not be empty")
 	}
+	if c.metricsEndpoint == nil {
+		return maskAnyf(invalidConfigError, "metricsEndpoint service must not be empty")
+	}
 	if c.permutation == nil {
 		return maskAnyf(invalidConfigError, "permutation service must not be empty")
 	}
 	if c.random == nil {
 		return maskAnyf(invalidConfigError, "random service must not be empty")
 	}
-	if c.server == nil {
-		return maskAnyf(invalidConfigError, "server service must not be empty")
-	}
 	if c.storageCollection == nil {
 		return maskAnyf(invalidConfigError, "storage collection must not be empty")
 	}

service/server/error.go → service/metricsendpoint/error.go

@@ -1,4 +1,4 @@
-package server
+package metricsendpoint
 
 import (
 	"fmt"

service/server/service.go → service/metricsendpoint/service.go

@@ -1,5 +1,6 @@
-// Package server implements a HTTP server to provide Anna's API over network.
-package server
+// Package metricsendpoint implements a HTTP server to provide Anna's metrics
+// over network.
+package metricsendpoint
 
 import (
 	"net/http"
@@ -11,8 +12,8 @@ import (
 	servicespec "github.com/xh3b4sd/anna/service/spec"
 )
 
-// New creates a new server service.
-func New() servicespec.Server {
+// New creates a new metricsendpoint service.
+func New() servicespec.MetricsEndpoint {
 	return &service{}
 }
 
@@ -69,7 +70,7 @@ func (s *service) Configure() error {
 	}
 	s.metadata = map[string]string{
 		"id":   id,
-		"name": "server",
+		"name": "metricsendpoint",
 		"type": "service",
 	}
 

service/spec/collection.go

@@ -19,6 +19,8 @@ type Collection interface {
 
 	Instrumentor() Instrumentor
 
+	MetricsEndpoint() MetricsEndpoint
+
 	// Log returns a log service. It is used to print log messages.
 	Log() Log
 
@@ -31,8 +33,6 @@ type Collection interface {
 	// Random returns a random service. It is used to create random numbers.
 	Random() Random
 
-	Server() Server
-
 	Storage() StorageCollection
 
 	// Shutdown ends all processes of the service collection like shutting down a
@@ -47,10 +47,10 @@ type Collection interface {
 	SetID(id ID)
 	SetInstrumentor(i Instrumentor)
 	SetLog(l Log)
+	SetMetricsEndpoint(s MetricsEndpoint)
 	SetNetwork(n Network)
 	SetPermutation(p Permutation)
 	SetRandom(r Random)
-	SetServer(s Server)
 	SetStorageCollection(sc StorageCollection)
 	SetTextEndpoint(te TextEndpoint)
 	SetTextInput(ti TextInput)

service/spec/server.go → service/spec/metrics_endpoint.go

@@ -1,8 +1,8 @@
 package spec
 
-// Server represents a simple bootable object being able to serve network
-// resources.
-type Server interface {
+// MetricsEndpoint represents a simple bootable object being able to serve
+// network resources.
+type MetricsEndpoint interface {
 	// Boot initializes and starts the whole server like booting a machine.
 	// Listening to a socket should be done here internally. The call to Boot
 	// blocks forever.