Added ServiceInstanceID options to resource

Author: nexcode

internal/grpcinject/opentelemetry.go

@@ -33,7 +33,7 @@ import (
 	"google.golang.org/grpc"
 )
 
-func OpenTelemetry(config *config.Config, localAddr net.Addr, publicAddr string) error {
+func OpenTelemetry(config *config.Config, instanceID string, localAddr net.Addr, publicAddr string) error {
 	resOptions := []resource.Option{
 		resource.WithHost(),
 		resource.WithOS(),
@@ -42,6 +42,7 @@ func OpenTelemetry(config *config.Config, localAddr net.Addr, publicAddr string)
 		resource.WithTelemetrySDK(),
 		resource.WithSchemaURL(semconv.SchemaURL),
 		resource.WithAttributes(semconv.ServiceName(config.OpenTelemetry.ServiceName)),
+		resource.WithAttributes(semconv.ServiceInstanceID(instanceID)),
 	}
 
 	if localAddr != nil {

rpcplatform_grpcinject.go

@@ -22,9 +22,9 @@ import (
 	"github.com/nexcode/rpcplatform/internal/grpcinject"
 )
 
-func (p *RPCPlatform) grpcinject(localAddr net.Addr, publicAddr string) error {
+func (p *RPCPlatform) grpcinject(instanceID string, localAddr net.Addr, publicAddr string) error {
 	if p.config.OpenTelemetry != nil {
-		if err := grpcinject.OpenTelemetry(p.config, localAddr, publicAddr); err != nil {
+		if err := grpcinject.OpenTelemetry(p.config, instanceID, localAddr, publicAddr); err != nil {
 			return err
 		}
 	}

rpcplatform_newclient.go

@@ -40,7 +40,7 @@ func (p *RPCPlatform) NewClient(target string, attributes *ClientAttributes) (*C
 		grpc.WithDefaultServiceConfig(`{"loadBalancingConfig":[{"`+balancerName+`":{}}]}`),
 	)
 
-	if err := p.grpcinject(nil, ""); err != nil {
+	if err := p.grpcinject(gears.UID(), nil, ""); err != nil {
 		return nil, err
 	}
 

rpcplatform_newserver.go

@@ -42,11 +42,14 @@ func (p *RPCPlatform) NewServer(name, addr string, attributes *ServerAttributes,
 		addr = listener.Addr().String()
 	}
 
-	if err = p.grpcinject(listener.Addr(), addr); err != nil {
+	id := gears.UID()
+
+	if err = p.grpcinject(id, listener.Addr(), addr); err != nil {
 		return nil, err
 	}
 
 	return &Server{
+		id:         id,
 		name:       p.config.EtcdPrefix + gears.FixPath(name),
 		etcd:       p.config.EtcdClient,
 		server:     grpc.NewServer(p.config.GRPCOptions.Server...),

server.go

@@ -24,6 +24,7 @@ import (
 )
 
 type Server struct {
+	id         string
 	name       string
 	etcd       *etcd.Client
 	server     *grpc.Server

server_serve.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/nexcode/rpcplatform/internal/gears"
 	etcd "go.etcd.io/etcd/client/v3"
 )
 
@@ -36,7 +35,7 @@ func (s *Server) Serve() error {
 	}()
 
 	go func() {
-		path := s.name + "/" + gears.UID()
+		path := s.name + "/" + s.id
 
 		for {
 			if !serving {