fix: add new env var

eminetto · Aug 22, 2023 · ad971a7 · ad971a7
1 parent 77b0414
commit ad971a7
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 4 deletions.
diff --git a/.env b/.env
@@ -20,6 +20,7 @@ GRAFANA_SERVICE_HOST=grafana
 # Jaeger
 JAEGER_SERVICE_PORT=16686
 JAEGER_SERVICE_HOST=jaeger
+JAEGER_TRACEPROVIDER=http://${JAEGER_SERVICE_HOST}:14268/api/traces
 
 # Prometheus
 PROMETHEUS_SERVICE_PORT=9090

diff --git a/auth/go.mod b/auth/go.mod
@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/eminetto/api-o11y v0.0.12
+	github.com/eminetto/api-o11y v0.0.13
 	github.com/go-chi/chi/v5 v5.0.8
 	github.com/go-chi/httplog v0.3.0
 	github.com/go-chi/telemetry v0.2.0

diff --git a/auth/go.sum b/auth/go.sum
@@ -63,6 +63,8 @@ github.com/eminetto/api-o11y v0.0.11 h1:PbFfGp1Cy7QaR55OBsTE1kovkJw+CT7ZBPeICfiP
 github.com/eminetto/api-o11y v0.0.11/go.mod h1:BVyINe/YXuOod6cx9t46GBxnZ5ugi+oGHC59sMThk7Y=
 github.com/eminetto/api-o11y v0.0.12 h1:Ek/ycnazLv66Qlj8/LoeDeNG1/ljXwq+DhjMcHXOzG4=
 github.com/eminetto/api-o11y v0.0.12/go.mod h1:BVyINe/YXuOod6cx9t46GBxnZ5ugi+oGHC59sMThk7Y=
+github.com/eminetto/api-o11y v0.0.13 h1:ueo421MfT+0H5xrXyqXHz6zI4h0bR2enTRzorbGa+UM=
+github.com/eminetto/api-o11y v0.0.13/go.mod h1:BVyINe/YXuOod6cx9t46GBxnZ5ugi+oGHC59sMThk7Y=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -61,6 +61,7 @@ services:
       DB_PORT: "3306"
       PORT: "8081"
       OTEL_EXPORTER_OTLP_ENDPOINT: "${OTEL_EXPORTER_OTLP_ENDPOINT}"
+      JAEGER_TRACEPROVIDER: "${JAEGER_TRACEPROVIDER}"
     ports:
       - "8081:8081"
     container_name: auth
@@ -81,6 +82,7 @@ services:
       PORT: "8082"
       AUTH_URL: "http://auth:8081"
       OTEL_EXPORTER_OTLP_ENDPOINT: "${OTEL_EXPORTER_OTLP_ENDPOINT}"
+      JAEGER_TRACEPROVIDER: "${JAEGER_TRACEPROVIDER}"
     ports:
       - "8082:8082"
     container_name: feedbacks
@@ -101,6 +103,7 @@ services:
       PORT: "8083"
       AUTH_URL: "http://auth:8081"
       OTEL_EXPORTER_OTLP_ENDPOINT: "${OTEL_EXPORTER_OTLP_ENDPOINT}"
+      JAEGER_TRACEPROVIDER: "${JAEGER_TRACEPROVIDER}"
     ports:
       - "8083:8083"
     container_name: votes

diff --git a/feedbacks/go.mod b/feedbacks/go.mod
@@ -3,7 +3,7 @@ module github.com/eminetto/api-o11y/feedbacks
 go 1.20
 
 require (
-	github.com/eminetto/api-o11y v0.0.12
+	github.com/eminetto/api-o11y v0.0.13
 	github.com/go-chi/chi/v5 v5.0.8
 	github.com/go-chi/httplog v0.3.0
 	github.com/go-chi/telemetry v0.2.0

diff --git a/feedbacks/go.sum b/feedbacks/go.sum
@@ -61,6 +61,8 @@ github.com/eminetto/api-o11y v0.0.11 h1:PbFfGp1Cy7QaR55OBsTE1kovkJw+CT7ZBPeICfiP
 github.com/eminetto/api-o11y v0.0.11/go.mod h1:BVyINe/YXuOod6cx9t46GBxnZ5ugi+oGHC59sMThk7Y=
 github.com/eminetto/api-o11y v0.0.12 h1:Ek/ycnazLv66Qlj8/LoeDeNG1/ljXwq+DhjMcHXOzG4=
 github.com/eminetto/api-o11y v0.0.12/go.mod h1:BVyINe/YXuOod6cx9t46GBxnZ5ugi+oGHC59sMThk7Y=
+github.com/eminetto/api-o11y v0.0.13 h1:ueo421MfT+0H5xrXyqXHz6zI4h0bR2enTRzorbGa+UM=
+github.com/eminetto/api-o11y v0.0.13/go.mod h1:BVyINe/YXuOod6cx9t46GBxnZ5ugi+oGHC59sMThk7Y=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=

diff --git a/internal/telemetry/jaeger.go b/internal/telemetry/jaeger.go
@@ -57,7 +57,7 @@ func createJaegerTraceProvider(ctx context.Context, serviceName string) (*sdktra
 
 	exp, err := jaeger.New(
 		jaeger.WithCollectorEndpoint(
-			jaeger.WithEndpoint(os.Getenv("JAEGER_SERVICE_HOST") + ":" + os.Getenv("JAEGER_SERVICE_PORT")),
+			jaeger.WithEndpoint(os.Getenv("JAEGER_TRACEPROVIDER")),
 		),
 	)
 	if err != nil {

diff --git a/votes/go.mod b/votes/go.mod
@@ -3,7 +3,7 @@ module github.com/eminetto/api-o11y/votes
 go 1.20
 
 require (
-	github.com/eminetto/api-o11y v0.0.12
+	github.com/eminetto/api-o11y v0.0.13
 	github.com/go-chi/chi/v5 v5.0.8
 	github.com/go-chi/httplog v0.3.0
 	github.com/go-chi/telemetry v0.2.0

diff --git a/votes/go.sum b/votes/go.sum
@@ -61,6 +61,8 @@ github.com/eminetto/api-o11y v0.0.11 h1:PbFfGp1Cy7QaR55OBsTE1kovkJw+CT7ZBPeICfiP
 github.com/eminetto/api-o11y v0.0.11/go.mod h1:BVyINe/YXuOod6cx9t46GBxnZ5ugi+oGHC59sMThk7Y=
 github.com/eminetto/api-o11y v0.0.12 h1:Ek/ycnazLv66Qlj8/LoeDeNG1/ljXwq+DhjMcHXOzG4=
 github.com/eminetto/api-o11y v0.0.12/go.mod h1:BVyINe/YXuOod6cx9t46GBxnZ5ugi+oGHC59sMThk7Y=
+github.com/eminetto/api-o11y v0.0.13 h1:ueo421MfT+0H5xrXyqXHz6zI4h0bR2enTRzorbGa+UM=
+github.com/eminetto/api-o11y v0.0.13/go.mod h1:BVyINe/YXuOod6cx9t46GBxnZ5ugi+oGHC59sMThk7Y=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=