Add telemetry for cloudevents

Author: AchoArnold

api/pkg/di/container.go

@@ -1018,6 +1018,7 @@ func (container *Container) OtelResources(version string, namespace string) *res
 		semconv.ServiceNameKey.String(namespace),
 		semconv.ServiceVersionKey.String(version),
 		semconv.ServiceInstanceIDKey.String(hostName()),
+		semconv.HostNameKey.String(hostName()),
 		semconv.DeploymentEnvironmentKey.String(os.Getenv("ENV")),
 	)
 }

api/pkg/handlers/events_handler.go

@@ -44,11 +44,9 @@ func (h *EventsHandler) RegisterRoutes(router fiber.Router, middlewares ...fiber
 // Dispatch a cloud event
 // This is an internal API so no documentation provided
 func (h *EventsHandler) Dispatch(c *fiber.Ctx) error {
-	ctx, span := h.tracer.StartFromFiberCtx(c)
+	ctx, span, ctxLogger := h.tracer.StartFromFiberCtxWithLogger(c, h.logger)
 	defer span.End()
 
-	ctxLogger := h.tracer.CtxLogger(h.logger, span)
-
 	var request cloudevents.Event
 	if err := c.BodyParser(&request); err != nil {
 		msg := fmt.Sprintf("cannot marshall params [%s] into %T", c.OriginalURL(), request)

api/pkg/repositories/billing_usage_repository.go

@@ -21,6 +21,6 @@ type BillingUsageRepository interface {
 	// GetHistory returns past billing usage by entities.UserID
 	GetHistory(ctx context.Context, userID entities.UserID, params IndexParams) (*[]entities.BillingUsage, error)
 
-	// DeleteForUser deletes all billing usage for an entities.UserID
+	// DeleteAllForUser deletes all billing usage for an entities.UserID
 	DeleteAllForUser(ctx context.Context, userID entities.UserID) error
 }

api/pkg/services/event_dispatcher_service.go

@@ -11,6 +11,7 @@ import (
 
 	"go.opentelemetry.io/otel/metric"
 	semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
+	"go.opentelemetry.io/otel/trace"
 
 	"github.com/NdoleStudio/httpsms/pkg/events"
 	"github.com/NdoleStudio/httpsms/pkg/telemetry"
@@ -119,12 +120,12 @@ func (dispatcher *EventDispatcher) Subscribe(eventType string, listener events.E
 
 // Publish an event to subscribers
 func (dispatcher *EventDispatcher) Publish(ctx context.Context, event cloudevents.Event) {
-	ctx, span := dispatcher.tracer.Start(ctx)
+	ctx, span, ctxLogger := dispatcher.tracer.StartWithLogger(ctx, dispatcher.logger)
 	defer span.End()
 
-	start := time.Now()
+	dispatcher.addCloudEventAttributes(span, event)
 
-	ctxLogger := dispatcher.tracer.CtxLogger(dispatcher.logger, span)
+	start := time.Now()
 
 	subscribers, ok := dispatcher.listeners[event.Type()]
 	if !ok {
@@ -156,6 +157,15 @@ func (dispatcher *EventDispatcher) Publish(ctx context.Context, event cloudevent
 	)
 }
 
+func (dispatcher *EventDispatcher) addCloudEventAttributes(span trace.Span, event cloudevents.Event) {
+	span.SetAttributes(
+		semconv.CloudeventsEventType(event.Type()),
+		semconv.CloudeventsEventID(event.ID()),
+		semconv.CloudeventsEventSource(event.Source()),
+		semconv.CloudeventsEventSpecVersion(event.SpecVersion()),
+	)
+}
+
 func (dispatcher *EventDispatcher) createCloudTask(event cloudevents.Event) (*PushQueueTask, error) {
 	eventContent, err := json.Marshal(event)
 	if err != nil {