Skip to content

Feature: Move from Datadog to OpenTelemetry #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rafaeljusto wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Feature: Move from Datadog to OpenTelemetry #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions cmd/mcp-http/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ import (
"syscall"
"time"

ddhttp "github.com/DataDog/dd-trace-go/contrib/net/http/v2"
"github.com/DataDog/dd-trace-go/v2/ddtrace/tracer"
"github.com/getsentry/sentry-go"
"github.com/modelcontextprotocol/go-sdk/mcp"
"github.com/teamwork/mcp/internal/auth"
Expand All @@ -26,6 +24,9 @@ import (
"github.com/teamwork/mcp/internal/twdesk"
"github.com/teamwork/mcp/internal/twprojects"
"github.com/teamwork/twapi-go-sdk/session"
"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
otelattr "go.opentelemetry.io/otel/attribute"
oteltrace "go.opentelemetry.io/otel/trace"
)

var reBearerToken = regexp.MustCompile(`^Bearer (.+)$`)
Expand Down Expand Up @@ -318,26 +319,23 @@ func sentryMiddleware(resources config.Resources, next http.Handler) http.Handle
}

func tracerMiddleware(resources config.Resources, next http.Handler) http.Handler {
if !resources.Info.DatadogAPM.Enabled {
if !resources.Info.OTel.Enabled {
return next
}
skipPaths := map[string]struct{}{
"/favicon.ico": {}, // avoid logging browser favicon requests
"/api/health": {}, // health checks can be very noisy
"/sse": {}, // long-lived connections don't work well with tracing
}
return ddhttp.WrapHandler(next, resources.Info.DatadogAPM.Service, "http.request",
ddhttp.WithResourceNamer(func(req *http.Request) string {
return otelhttp.NewHandler(next, "http.request",
otelhttp.WithSpanNameFormatter(func(_ string, req *http.Request) string {
return fmt.Sprintf("%s_%s", req.Method, req.URL.Path)
}),
ddhttp.WithIgnoreRequest(func(req *http.Request) bool {
otelhttp.WithFilter(func(req *http.Request) bool {
if _, skip := skipPaths[req.URL.Path]; skip {
return true
return false
}
if strings.HasPrefix(req.URL.Path, "/.well-known") {
return true
}
return false
return !strings.HasPrefix(req.URL.Path, "/.well-known")
}),
)
}
Expand Down Expand Up @@ -424,11 +422,12 @@ func authMiddleware(resources config.Resources, next http.Handler) http.Handler
return
}

if span, ok := tracer.SpanFromContext(r.Context()); ok {
span.SetTag("user.id", info.UserID)
span.SetTag("installation.id", info.InstallationID)
span.SetTag("installation.url", info.URL)
}
span := oteltrace.SpanFromContext(r.Context())
span.SetAttributes(
otelattr.Int64("user.id", info.UserID),
otelattr.Int64("installation.id", info.InstallationID),
otelattr.String("installation.url", info.URL),
)
if requestInfo, ok := request.InfoFromContext(r.Context()); ok {
requestInfo.SetAuth(info.InstallationID, info.URL, info.UserID)
}
Expand Down
90 changes: 20 additions & 70 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,94 +3,44 @@ module github.com/teamwork/mcp
go 1.26.2

require (
github.com/DataDog/dd-trace-go/contrib/net/http/v2 v2.7.3
github.com/DataDog/dd-trace-go/v2 v2.7.3
github.com/getsentry/sentry-go v0.45.1
github.com/getsentry/sentry-go/slog v0.45.1
github.com/google/jsonschema-go v0.4.2
github.com/google/uuid v1.6.0
github.com/modelcontextprotocol/go-sdk v1.5.0
github.com/teamwork/desksdkgo v0.0.0-20260420182446-6788c53d670d
github.com/teamwork/twapi-go-sdk v1.13.4
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0
go.opentelemetry.io/otel v1.43.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.43.0
go.opentelemetry.io/otel/sdk v1.43.0
go.opentelemetry.io/otel/trace v1.43.0
)

require (
github.com/DataDog/datadog-agent/comp/core/tagger/origindetection v0.77.1 // indirect
github.com/DataDog/datadog-agent/pkg/obfuscate v0.77.1 // indirect
github.com/DataDog/datadog-agent/pkg/opentelemetry-mapping-go/otlp/attributes v0.77.1 // indirect
github.com/DataDog/datadog-agent/pkg/proto v0.77.1 // indirect
github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.77.1 // indirect
github.com/DataDog/datadog-agent/pkg/template v0.77.1 // indirect
github.com/DataDog/datadog-agent/pkg/trace v0.77.1 // indirect
github.com/DataDog/datadog-agent/pkg/trace/log v0.77.1 // indirect
github.com/DataDog/datadog-agent/pkg/trace/otel v0.77.1 // indirect
github.com/DataDog/datadog-agent/pkg/trace/stats v0.77.1 // indirect
github.com/DataDog/datadog-agent/pkg/trace/traceutil v0.77.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.77.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.77.1 // indirect
github.com/DataDog/datadog-agent/pkg/version v0.77.1 // indirect
github.com/DataDog/datadog-go/v5 v5.8.3 // indirect
github.com/DataDog/go-libddwaf/v4 v4.9.0 // indirect
github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20260217080614-b0f4edc38a6d // indirect
github.com/DataDog/go-sqllexer v0.2.1 // indirect
github.com/DataDog/go-tuf v1.1.1-0.5.2 // indirect
github.com/DataDog/sketches-go v1.4.8 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/brianvoe/gofakeit/v7 v7.14.1 // indirect
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/ebitengine/purego v0.10.0 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/hashicorp/go-version v1.9.0 // indirect
github.com/joho/godotenv v1.5.1 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.18.5 // indirect
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
github.com/linkdata/deadlock v0.5.5 // indirect
github.com/lufia/plan9stats v0.0.0-20260330125221-c963978e514e // indirect
github.com/minio/simdjson-go v0.4.5 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/outcaste-io/ristretto v0.2.3 // indirect
github.com/petermattis/goid v0.0.0-20260330135022-df67b199bc81 // indirect
github.com/philhofer/fwd v1.2.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.10.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/segmentio/asm v1.2.1 // indirect
github.com/segmentio/encoding v0.5.4 // indirect
github.com/shirou/gopsutil/v4 v4.26.2 // indirect
github.com/sonh/qs v0.6.4 // indirect
github.com/tinylib/msgp v1.6.3 // indirect
github.com/tklauser/go-sysconf v0.3.16 // indirect
github.com/tklauser/numcpus v0.11.0 // indirect
github.com/trailofbits/go-mutexasserts v0.0.0-20250514102930-c1f3d2e37561 // indirect
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/collector/component v1.54.0 // indirect
go.opentelemetry.io/collector/featuregate v1.54.0 // indirect
go.opentelemetry.io/collector/pdata v1.54.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.148.0 // indirect
go.opentelemetry.io/otel v1.42.0 // indirect
go.opentelemetry.io/otel/metric v1.42.0 // indirect
go.opentelemetry.io/otel/trace v1.42.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.1 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 // indirect
golang.org/x/mod v0.34.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
golang.org/x/net v0.52.0 // indirect
golang.org/x/oauth2 v0.36.0 // indirect
golang.org/x/sys v0.43.0 // indirect
golang.org/x/text v0.35.0 // indirect
golang.org/x/time v0.15.0 // indirect
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
golang.org/x/tools v0.43.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260401024825-9d38bb4040a9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
google.golang.org/grpc v1.80.0 // indirect
google.golang.org/protobuf v1.36.11 // indirect
gopkg.in/ini.v1 v1.67.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading