Skip to content

Commit

Permalink
chore: drop OTEL
Browse files Browse the repository at this point in the history
  • Loading branch information
MarioCarrion committed Feb 27, 2025
1 parent d2e56c8 commit 430e82d
Show file tree
Hide file tree
Showing 19 changed files with 7 additions and 782 deletions.
45 changes: 1 addition & 44 deletions cmd/cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,11 @@ import (
"net/http"
"time"

"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/exporters/jaeger"
"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
"go.opentelemetry.io/otel/propagation"
"go.opentelemetry.io/otel/sdk/resource"
"go.opentelemetry.io/otel/sdk/trace"
semconv "go.opentelemetry.io/otel/semconv/v1.7.0"

"github.com/MarioCarrion/todo-api-microservice-example/pkg/openapi3"
)

func main() {
initTracer()

//-

clientOA3 := http.Client{Transport: otelhttp.NewTransport(http.DefaultTransport)}
clientOA3 := http.Client{}

client, err := openapi3.NewClientWithResponses("http://0.0.0.0:9234", openapi3.WithHTTPClient(&clientOA3))
if err != nil {
Expand Down Expand Up @@ -61,32 +47,3 @@ func main() {
count++
}
}

func initTracer() {
jaegerEndpoint := "http://localhost:14268/api/traces"

jaegerExporter, err := jaeger.New(
jaeger.WithCollectorEndpoint(jaeger.WithEndpoint(jaegerEndpoint)),
)
if err != nil {
log.Fatalln("Couldn't initialize exporter", err)
}

// Create stdout exporter to be able to retrieve the collected spans.
_, err = stdouttrace.New(stdouttrace.WithPrettyPrint())
if err != nil {
log.Fatalln("Couldn't initialize exporter", err)
}

tp := trace.NewTracerProvider(
trace.WithSampler(trace.AlwaysSample()),
trace.WithBatcher(jaegerExporter),
trace.WithResource(resource.NewSchemaless(attribute.KeyValue{
Key: semconv.ServiceNameKey,
Value: attribute.StringValue("rest-server"),
})),
)

otel.SetTracerProvider(tp)
otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}))
}
7 changes: 0 additions & 7 deletions cmd/elasticsearch-indexer-kafka/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,6 @@ func run(env string) (<-chan error, error) {

//-

_, err = internal.NewOTExporter(conf)
if err != nil {
return nil, internaldomain.WrapErrorf(err, internaldomain.ErrorCodeUnknown, "internal.newOTExporter ")
}

//-

srv := &Server{
logger: logger,
kafka: kafka,
Expand Down
7 changes: 0 additions & 7 deletions cmd/elasticsearch-indexer-rabbitmq/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,6 @@ func run(env string) (<-chan error, error) {

//-

_, err = internal.NewOTExporter(conf)
if err != nil {
return nil, internaldomain.WrapErrorf(err, internaldomain.ErrorCodeUnknown, "newOTExporter")
}

//-

srv := &Server{
logger: logger,
rmq: rmq,
Expand Down
7 changes: 0 additions & 7 deletions cmd/elasticsearch-indexer-redis/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,6 @@ func run(env string) (<-chan error, error) {

//-

_, err = internal.NewOTExporter(conf)
if err != nil {
return nil, internaldomain.WrapErrorf(err, internaldomain.ErrorCodeUnknown, "newOTExporter")
}

//-

srv := &Server{
logger: logger,
rdb: rdb,
Expand Down
74 changes: 0 additions & 74 deletions cmd/internal/opentelemetry.go

This file was deleted.

12 changes: 1 addition & 11 deletions cmd/rest-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"github.com/go-chi/chi/v5"
"github.com/go-chi/render"
"github.com/jackc/pgx/v5/pgxpool"
"github.com/riandyrn/otelchi"
"go.uber.org/zap"

"github.com/MarioCarrion/todo-api-microservice-example/cmd/internal"
Expand Down Expand Up @@ -100,11 +99,6 @@ func run(env, address string) (<-chan error, error) {

//-

promExporter, err := internal.NewOTExporter(conf)
if err != nil {
return nil, internaldomain.WrapErrorf(err, internaldomain.ErrorCodeUnknown, "internal.NewOTExporter")
}

logging := func(h http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
logger.Info(r.Method,
Expand All @@ -122,8 +116,7 @@ func run(env, address string) (<-chan error, error) {
Address: address,
DB: pool,
ElasticSearch: esClient,
Metrics: promExporter,
Middlewares: []func(next http.Handler) http.Handler{otelchi.Middleware("todo-api-server"), logging},
Middlewares: []func(next http.Handler) http.Handler{logging},
Logger: logger,
Memcached: memcached,
MessageBroker: msgBroker,
Expand Down Expand Up @@ -185,7 +178,6 @@ type serverConfig struct {
DB *pgxpool.Pool
ElasticSearch *esv7.Client
Memcached *memcache.Client
Metrics http.Handler
Middlewares []func(next http.Handler) http.Handler
Logger *zap.Logger
MessageBroker MessageBrokerPublisher
Expand Down Expand Up @@ -217,8 +209,6 @@ func newServer(conf serverConfig) (*http.Server, error) {
fsys, _ := fs.Sub(content, "static")
router.Handle("/static/*", http.StripPrefix("/static/", http.FileServer(http.FS(fsys))))

router.Handle("/metrics", conf.Metrics)

//-

lmt := tollbooth.NewLimiter(3, &limiter.ExpirableOptions{DefaultExpirationTTL: time.Second})
Expand Down
25 changes: 0 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,7 @@ require (
github.com/mercari/go-circuitbreaker v0.0.2
github.com/oapi-codegen/runtime v1.1.1
github.com/ory/dockertest/v3 v3.11.0
github.com/riandyrn/otelchi v0.5.1
github.com/streadway/amqp v1.1.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0
go.opentelemetry.io/contrib/instrumentation/runtime v0.27.0
go.opentelemetry.io/otel v1.14.0
go.opentelemetry.io/otel/exporters/jaeger v1.11.2
go.opentelemetry.io/otel/exporters/prometheus v0.26.0
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.11.2
go.opentelemetry.io/otel/metric v0.27.0
go.opentelemetry.io/otel/sdk v1.13.0
go.opentelemetry.io/otel/sdk/export/metric v0.26.0
go.opentelemetry.io/otel/sdk/metric v0.26.0
go.opentelemetry.io/otel/trace v1.14.0
go.uber.org/zap v1.27.0
goa.design/model v1.8.0
)
Expand All @@ -50,7 +38,6 @@ require (
github.com/ajg/form v1.5.1 // indirect
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v3 v3.1.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
Expand All @@ -62,15 +49,11 @@ require (
github.com/docker/docker v27.1.1+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/swag v0.21.1 // indirect
github.com/go-pkgz/expirable-cache v0.0.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand All @@ -90,7 +73,6 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/manveru/faker v0.0.0-20171103152722-9fbc68a78c4d // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
Expand All @@ -103,10 +85,6 @@ require (
github.com/opencontainers/runc v1.1.14 // indirect
github.com/perimeterx/marshmallow v1.1.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.11.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.30.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
Expand All @@ -116,8 +94,6 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/zach-klippenstein/goregen v0.0.0-20160303162051-795b5e3961ea // indirect
go.opentelemetry.io/contrib v1.0.0 // indirect
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
go.uber.org/multierr v1.10.0 // indirect
goa.design/goa/v3 v3.10.2 // indirect
golang.org/x/crypto v0.32.0 // indirect
Expand All @@ -128,7 +104,6 @@ require (
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.5.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit 430e82d

Please sign in to comment.