Enhance OpenTelemetry configuration by adding a filter for session tokens and updating processors. Modify server registration to include configuration parameters. Update session token handler to utilize dynamic base URL for OTLP endpoints.

Author: heynedim

cmd/server/main.go

@@ -60,7 +60,7 @@ func main() {
 
 	e := echo.New()
 	otelTracer := otel.Tracer(cfg.ServiceName)
-	httpserver.Register(e, database, otelTracer)
+	httpserver.Register(e, database, otelTracer, &cfg)
 
 	srv := &http.Server{
 		Addr:              ":" + cfg.Port,

internal/config/config.go

@@ -12,6 +12,7 @@ type Config struct {
 	LogLevel         string        `env:"LOG_LEVEL" envDefault:"info"`
 	ServiceName      string        `env:"SERVICE_NAME" envDefault:"default"`
 	ShutdownTimeoutS int           `env:"SHUTDOWN_TIMEOUT_SECONDS" envDefault:"10"`
+	BaseURL          string        `env:"BASE_URL" envDefault:"otelmap.com"`
 	ShutdownTimeout  time.Duration `env:"-"`
 }
 

internal/handlers/session_token.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/google/uuid"
+	"github.com/jack5341/otel-map-server/internal/config"
 	errorz "github.com/jack5341/otel-map-server/internal/errors"
 	"github.com/jack5341/otel-map-server/internal/models"
 	"github.com/labstack/echo/v4"
@@ -14,10 +15,11 @@ import (
 type SessionTokenHandler struct {
 	db         *gorm.DB
 	otelTracer trace.Tracer
+	config     *config.Config
 }
 
-func NewSessionTokenHandler(db *gorm.DB, otelTracer trace.Tracer) *SessionTokenHandler {
-	return &SessionTokenHandler{db: db, otelTracer: otelTracer}
+func NewSessionTokenHandler(db *gorm.DB, otelTracer trace.Tracer, config *config.Config) *SessionTokenHandler {
+	return &SessionTokenHandler{db: db, otelTracer: otelTracer, config: config}
 }
 
 func (h *SessionTokenHandler) Create(c echo.Context) error {
@@ -31,7 +33,8 @@ func (h *SessionTokenHandler) Create(c echo.Context) error {
 	resp := map[string]any{
 		"token": token.String(),
 		"ingest": map[string]any{
-			"otlp_http_url": "https://collector.example.com/v1/traces",
+			"otlp_http_url": "https://" + h.config.BaseURL + "/v1/traces",
+			"otlp_grpc_url": "https://" + h.config.BaseURL + "/opentelemetry.proto",
 			"header_key":    "X-OTEL-SESSION",
 			"header_value":  token.String(),
 			"resource_attribute": map[string]any{

internal/http/server.go

@@ -6,11 +6,12 @@ import (
 
 	"github.com/labstack/echo/v4"
 
+	"github.com/jack5341/otel-map-server/internal/config"
 	"github.com/jack5341/otel-map-server/internal/handlers"
 	imw "github.com/jack5341/otel-map-server/internal/http/middleware"
 )
 
-func Register(e *echo.Echo, db *gorm.DB, otelTracer trace.Tracer) {
+func Register(e *echo.Echo, db *gorm.DB, otelTracer trace.Tracer, config *config.Config) {
 	imw.Apply(e, otelTracer)
 
 	api := e.Group("/api")
@@ -19,7 +20,7 @@ func Register(e *echo.Echo, db *gorm.DB, otelTracer trace.Tracer) {
 	// Handlers
 	health := handlers.NewHealthHandler(db, otelTracer)
 	serviceMap := handlers.NewServiceMapHandler(db, otelTracer)
-	sessionToken := handlers.NewSessionTokenHandler(db, otelTracer)
+	sessionToken := handlers.NewSessionTokenHandler(db, otelTracer, config)
 
 	// Health endpoints
 	v1.GET("/healthz", health.Liveness)

otel-config.yml

@@ -22,6 +22,10 @@ processors:
       - key: service.name
         value: "serviceName"
         action: upsert
+  filter:
+    traces:
+      span:
+        - 'resource.attributes["otelmap.session_token"] != nil'
 exporters:
   clickhouse:
     endpoint: tcp://clickhouse:9000
@@ -61,7 +65,7 @@ service:
       exporters: [clickhouse]
     traces:
       receivers: [otlp]
-      processors: [memory_limiter, resourcedetection/system, resource, batch]
+      processors: [memory_limiter, resourcedetection/system, resource, filter, batch]
       exporters: [clickhouse]
     metrics:
       receivers: [otlp]