diff --git a/README.md b/README.md index ec79403..ca1a09f 100644 --- a/README.md +++ b/README.md @@ -99,14 +99,14 @@ curl --location --request POST '0.0.0.0:8080/calculator' \ } ``` -# Jaeger +# Jaeger and Zipkin ## Using Tracing between services -To use jaeger tracing you can specify environment variable called `JAEGER_COLLECTOR_ENDPOINT`. +To use jaeger tracing with zipkin you can specify environment variable called `ZIPKIN_COLLECTOR_ENDPOINT`. ```bash -export JAEGER_COLLECTOR_ENDPOINT=http://jaeger:14268/api/traces +export ZIPKIN_COLLECTOR_ENDPOINT=http://jaeger:9411/api/v2/spans ``` ![Jaeger Tracing](.github/images/jaeger-tracing.png) diff --git a/docker-compose.yml b/docker-compose.yml index 067d064..ae89bbc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -45,17 +45,13 @@ services: - IMC_SERVICE_ENDPOINT=imc-grpc:30000 - RECOMMENDATIONS_SERVICE_ENDPOINT=recommendations-grpc:30000 - ZIPKIN_COLLECTOR_ENDPOINT=http://jaeger:9411/api/v2/spans - - NATS_ENABLED=false - - NATS_URI=nats://nats-1:4222,nats://nats-2:4222 ports: - 8080:8080 volumes: - ./health-api:/go/src/health-api networks: - health - # depends_on: - # - nats-1 - # - nats-2 + bmr-grpc: build: diff --git a/health-api/controllers/calculator/main.go b/health-api/controllers/calculator/main.go index a57fdb6..698919e 100644 --- a/health-api/controllers/calculator/main.go +++ b/health-api/controllers/calculator/main.go @@ -1,9 +1,7 @@ package calculator import ( - "encoding/json" "net/http" - "os" "github.com/gin-gonic/gin" "github.com/msfidelis/health-api/pkg/logger" @@ -15,8 +13,6 @@ import ( guuid "github.com/google/uuid" "go.opentelemetry.io/otel/attribute" - - "github.com/nats-io/nats.go" ) type Request struct { @@ -269,46 +265,5 @@ func Post(c *gin.Context) { attribute.String("http.response.Recomendations.Calories.Loss.Unit", response.Basal.Necessity.Unit), ) - _, spanNatsPublich := tr.Start(c.Request.Context(), "NATS Publish") - defer spanNatsPublich.End() - - log.Info(). - Str("Service", "nats"). - Str("Queue", "nutrition"). - Msg("Sending message to NATS Server") - - // Publish on Nats to Save Data - nc, err := nats.Connect(os.Getenv("NATS_URI")) - defer nc.Close() - if err != nil { - log.Error(). - Str("Error", err.Error()). - Msg("Error to connect to Nats") - } - - // Create JetStream Context - js, err := nc.JetStream() - - if err != nil { - log.Error(). - Str("Error", err.Error()). - Msg("Error to create jetstream to Nats") - } - - if err != nil { - log.Error(). - Str("Error", err.Error()). - Msg("Error to convert response to json") - } - - b, err := json.Marshal(response) - _, err = js.Publish("ORDERS.scratch", b) - - if err != nil { - log.Error(). - Str("Error", err.Error()). - Msg("Error to publish message on jetstream") - } - c.JSON(http.StatusOK, response) } diff --git a/health-api/go.mod b/health-api/go.mod index 34a30a1..2bde805 100644 --- a/health-api/go.mod +++ b/health-api/go.mod @@ -10,7 +10,6 @@ require ( github.com/gin-gonic/gin v1.10.0 github.com/google/uuid v1.6.0 github.com/msfidelis/gin-chaos-monkey v0.0.6 - github.com/nats-io/nats.go v1.35.0 github.com/patrickmn/go-cache v2.1.0+incompatible github.com/rs/zerolog v1.33.0 github.com/swaggo/files v1.0.1 @@ -53,7 +52,6 @@ require ( github.com/goccy/go-json v0.10.2 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.8 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mailru/easyjson v0.7.6 // indirect @@ -62,8 +60,6 @@ require ( github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/nats-io/nkeys v0.4.7 // indirect - github.com/nats-io/nuid v1.0.1 // indirect github.com/openzipkin/zipkin-go v0.4.3 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/prometheus/client_golang v1.18.0 // indirect diff --git a/health-api/go.sum b/health-api/go.sum index 2dc4ef5..9ccf3ba 100644 --- a/health-api/go.sum +++ b/health-api/go.sum @@ -79,8 +79,6 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/klauspost/compress v1.17.8 h1:YcnTYrq7MikUT7k0Yb5eceMmALQPYBW/Xltxn0NAMnU= -github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= @@ -116,12 +114,6 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/msfidelis/gin-chaos-monkey v0.0.6 h1:cxxyj9ZNvUpKkp/lZlqeUfVnRs0Vl6iRSwnjcZwYmOs= github.com/msfidelis/gin-chaos-monkey v0.0.6/go.mod h1:Gl1jwZ8jcJEH7SCQR2oogFT5Stwjvs3taWykF6fJzUw= -github.com/nats-io/nats.go v1.35.0 h1:XFNqNM7v5B+MQMKqVGAyHwYhyKb48jrenXNxIU20ULk= -github.com/nats-io/nats.go v1.35.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= -github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= -github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc= -github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= -github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg= github.com/openzipkin/zipkin-go v0.4.3/go.mod h1:M9wCJZFWCo2RiY+o1eBCEMe0Dp2S5LDHcMZmk3RmK7c=