Skip to content

Commit 11e638b

Browse files
authored
Merge pull request #499 from databacker/proper-traces-endpoint
proper traces support; api v1.3.0
2 parents e6bf3da + ce4fe99 commit 11e638b

3 files changed

Lines changed: 18 additions & 7 deletions

File tree

cmd/root.go

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,19 @@ func rootCmd(execs execs) (*cobra.Command, error) {
145145
if err != nil {
146146
return fmt.Errorf("unable to set up telemetry: %w", err)
147147
}
148+
opts := []otlptracehttp.Option{
149+
// WithEndpoint expects ONLY the host (e.g., "otelep.foo.com" or "localhost:4318")
150+
otlptracehttp.WithEndpoint(u.Host),
151+
otlptracehttp.WithTLSClientConfig(tlsConfig),
152+
}
153+
if u.Path != "" {
154+
opts = append(opts, otlptracehttp.WithURLPath(u.Path))
155+
}
148156

149-
tracerExporter, err := otlptracehttp.New(ctx, otlptracehttp.WithEndpoint(*actualConfig.Telemetry.URL), otlptracehttp.WithTLSClientConfig(tlsConfig))
157+
if u.Scheme == "http" {
158+
opts = append(opts, otlptracehttp.WithInsecure())
159+
}
160+
tracerExporter, err := otlptracehttp.New(ctx, opts...)
150161
if err != nil {
151162
return fmt.Errorf("unable to set up telemetry: %w", err)
152163
}

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
filippo.io/age v1.2.1
3434
github.com/InfiniteLoopSpace/go_S-MIME v0.0.0-20181221134359-3f58f9a4b2b6
3535
github.com/bramvdbogaerde/go-scp v1.5.0
36-
github.com/databacker/api/go/api v0.0.0-20250908082438-7e7e048af692
36+
github.com/databacker/api/go/api v0.0.0-20260203120843-ea139d59c2ed
3737
github.com/gliderlabs/ssh v0.3.8
3838
github.com/google/go-cmp v0.7.0
3939
github.com/kevinburke/ssh_config v1.2.0
@@ -56,7 +56,7 @@ require (
5656
github.com/containerd/log v0.1.0 // indirect
5757
github.com/distribution/reference v0.6.0 // indirect
5858
github.com/felixge/httpsnoop v1.0.3 // indirect
59-
github.com/go-chi/chi/v5 v5.2.3 // indirect
59+
github.com/go-chi/chi/v5 v5.2.4 // indirect
6060
github.com/go-logr/logr v1.4.2 // indirect
6161
github.com/go-logr/stdr v1.2.2 // indirect
6262
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
8686
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
8787
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
8888
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
89-
github.com/databacker/api/go/api v0.0.0-20250908082438-7e7e048af692 h1:eIny/Iq0E5Hg7QKXNrjT91oyWjhnY+WVAv5Y8fRC0JY=
90-
github.com/databacker/api/go/api v0.0.0-20250908082438-7e7e048af692/go.mod h1:vXp1gX/diWXW659asaBZ7K3Wgs2OG3igz0dF0UB4yIY=
89+
github.com/databacker/api/go/api v0.0.0-20260203120843-ea139d59c2ed h1:PKzk3NUbJGSOpINtzGNSJR8jLqrTIy0enpaUma5RFgk=
90+
github.com/databacker/api/go/api v0.0.0-20260203120843-ea139d59c2ed/go.mod h1:vXp1gX/diWXW659asaBZ7K3Wgs2OG3igz0dF0UB4yIY=
9191
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
9292
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
9393
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -114,8 +114,8 @@ github.com/geoffgarside/ber v1.1.0/go.mod h1:jVPKeCbj6MvQZhwLYsGwaGI52oUorHoHKNe
114114
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
115115
github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
116116
github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
117-
github.com/go-chi/chi/v5 v5.2.3 h1:WQIt9uxdsAbgIYgid+BpYc+liqQZGMHRaUwp0JUcvdE=
118-
github.com/go-chi/chi/v5 v5.2.3/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
117+
github.com/go-chi/chi/v5 v5.2.4 h1:WtFKPHwlywe8Srng8j2BhOD9312j9cGUxG1SP4V2cR4=
118+
github.com/go-chi/chi/v5 v5.2.4/go.mod h1:X7Gx4mteadT3eDOMTsXzmI4/rwUpOwBHLpAfupzFJP0=
119119
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
120120
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
121121
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=

0 commit comments

Comments
 (0)