add otel instance id

Author: dobrac

packages/api/main.go

@@ -162,7 +162,7 @@ func run() int {
 	flag.Parse()
 
 	if !env.IsLocal() {
-		otlpCleanup := telemetry.InitOTLPExporter(ctx, serviceName, commitSHA)
+		otlpCleanup := telemetry.InitOTLPExporter(ctx, serviceName, commitSHA, "no")
 		defer otlpCleanup(ctx)
 	}
 

packages/client-proxy/main.go

@@ -148,7 +148,7 @@ func run() int {
 	signalCtx, sigCancel := signal.NotifyContext(ctx, syscall.SIGTERM, syscall.SIGINT)
 	defer sigCancel()
 
-	stopOtlp := telemetry.InitOTLPExporter(ctx, ServiceName, commitSHA)
+	stopOtlp := telemetry.InitOTLPExporter(ctx, ServiceName, commitSHA, "no")
 	defer func() {
 		err := stopOtlp(ctx)
 		if err != nil {

packages/orchestrator/main.go

@@ -50,8 +50,10 @@ func main() {
 	// there's a panic.
 	defer wg.Wait()
 
+	clientID := consul.GetClientID()
+
 	if !env.IsLocal() {
-		shutdown := telemetry.InitOTLPExporter(ctx, server.ServiceName, "no")
+		shutdown := telemetry.InitOTLPExporter(ctx, server.ServiceName, commitSHA, clientID)
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
@@ -96,8 +98,6 @@ func main() {
 
 	log.Println("Starting orchestrator", "commit", commitSHA)
 
-	clientID := consul.GetClientID()
-
 	srv, err := server.New(ctx, port, clientID, commitSHA)
 	if err != nil {
 		zap.L().Fatal("failed to create server", zap.Error(err))

packages/shared/pkg/telemetry/otel.go

@@ -37,10 +37,11 @@ type client struct {
 }
 
 // InitOTLPExporter initializes an OTLP exporter, and configures the corresponding trace providers.
-func InitOTLPExporter(ctx context.Context, serviceName, serviceVersion string) func(ctx context.Context) error {
+func InitOTLPExporter(ctx context.Context, serviceName, serviceVersion string, instanceID string) func(ctx context.Context) error {
 	attributes := []attribute.KeyValue{
 		semconv.ServiceName(serviceName),
 		semconv.ServiceVersion(serviceVersion),
+		semconv.ServiceInstanceID(instanceID),
 		semconv.TelemetrySDKName("otel"),
 		semconv.TelemetrySDKLanguageGo,
 	}

packages/template-manager/main.go

@@ -49,7 +49,7 @@ func main() {
 	}
 
 	if !env.IsLocal() {
-		shutdown := telemetry.InitOTLPExporter(ctx, constants.ServiceName, "no")
+		shutdown := telemetry.InitOTLPExporter(ctx, constants.ServiceName, "no", "no")
 		defer shutdown(context.TODO())
 	}