Skip to content

Commit 08b959c

Browse files
tristanmorgantristanmorgan
committed
Remove Tracing and update packages even more. (fabiolb#970)
1 parent 22944e4 commit 08b959c

18 files changed

+24
-458
lines changed

‎config/config.go

-13
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ type Config struct {
1414
Metrics Metrics
1515
UI UI
1616
Runtime Runtime
17-
Tracing Tracing
1817
ProfileMode string
1918
ProfilePath string
2019
Insecure bool
@@ -199,18 +198,6 @@ type Custom struct {
199198
Timeout time.Duration
200199
}
201200

202-
type Tracing struct {
203-
TracingEnabled bool
204-
CollectorType string
205-
ConnectString string
206-
ServiceName string
207-
Topic string
208-
SamplerRate float64
209-
SpanHost string
210-
SpanName string
211-
TraceID128Bit bool
212-
}
213-
214201
type AuthScheme struct {
215202
Name string
216203
Type string

‎config/default.go

-12
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,6 @@ var defaultConfig = &Config{
111111
},
112112
},
113113

114-
Tracing: Tracing{
115-
TracingEnabled: false,
116-
CollectorType: "http",
117-
ConnectString: "http://localhost:9411/api/v1/spans",
118-
ServiceName: "Fabiolb",
119-
Topic: "Fabiolb-Kafka-Topic",
120-
SamplerRate: -1,
121-
SpanHost: "localhost:9998",
122-
SpanName: "",
123-
TraceID128Bit: true,
124-
},
125-
126114
GlobCacheSize: 1000,
127115

128116
BGP: BGP{

‎config/load.go

-9
Original file line numberDiff line numberDiff line change
@@ -232,15 +232,6 @@ func load(cmdline, environ, envprefix []string, props *properties.Properties) (c
232232

233233
f.StringVar(&cfg.ProfileMode, "profile.mode", defaultConfig.ProfileMode, "enable profiling mode, one of [cpu, mem, mutex, block, trace]")
234234
f.StringVar(&cfg.ProfilePath, "profile.path", defaultConfig.ProfilePath, "path to profile dump file")
235-
f.BoolVar(&cfg.Tracing.TracingEnabled, "tracing.TracingEnabled", defaultConfig.Tracing.TracingEnabled, "Enable/Disable OpenTrace, one of [true, false]")
236-
f.StringVar(&cfg.Tracing.CollectorType, "tracing.CollectorType", defaultConfig.Tracing.CollectorType, "OpenTrace Collector Type, one of [http, kafka]")
237-
f.StringVar(&cfg.Tracing.ConnectString, "tracing.ConnectString", defaultConfig.Tracing.ConnectString, "OpenTrace Collector host:port")
238-
f.StringVar(&cfg.Tracing.ServiceName, "tracing.ServiceName", defaultConfig.Tracing.ServiceName, "Service name to embed in OpenTrace span")
239-
f.StringVar(&cfg.Tracing.SpanName, "tracing.SpanName", defaultConfig.Tracing.SpanName, "Span name template used to embed in OpenTrace span")
240-
f.StringVar(&cfg.Tracing.Topic, "tracing.Topic", defaultConfig.Tracing.Topic, "OpenTrace Collector Kafka Topic")
241-
f.Float64Var(&cfg.Tracing.SamplerRate, "tracing.SamplerRate", defaultConfig.Tracing.SamplerRate, "OpenTrace sample rate percentage in decimal form")
242-
f.StringVar(&cfg.Tracing.SpanHost, "tracing.SpanHost", defaultConfig.Tracing.SpanHost, "Host:Port info to add to spans")
243-
f.BoolVar(&cfg.Tracing.TraceID128Bit, "tracing.TraceID128Bit", defaultConfig.Tracing.TraceID128Bit, "Generate 128 bit trace IDs")
244235
f.BoolVar(&cfg.GlobMatchingDisabled, "glob.matching.disabled", defaultConfig.GlobMatchingDisabled, "Disable Glob Matching on routes, one of [true, false]")
245236
f.IntVar(&cfg.GlobCacheSize, "glob.cache.size", defaultConfig.GlobCacheSize, "sets the size of the glob cache")
246237

‎go.mod

-18
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ require (
1515
github.com/inetaf/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252
1616
github.com/magiconair/properties v1.8.9
1717
github.com/mwitkow/grpc-proxy v0.0.0-20230212185441-f345521cb9c9
18-
github.com/opentracing/opentracing-go v1.2.0
19-
github.com/openzipkin-contrib/zipkin-go-opentracing v0.3.5
2018
github.com/osrg/gobgp/v3 v3.34.0
2119
github.com/pascaldekloe/goe v0.1.1
2220
github.com/pkg/profile v1.7.0
@@ -32,27 +30,20 @@ require (
3230

3331
require (
3432
github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 // indirect
35-
github.com/Shopify/sarama v1.38.1 // indirect
3633
github.com/VividCortex/gohistogram v1.0.0 // indirect
37-
github.com/apache/thrift v0.13.0 // indirect
3834
github.com/armon/go-metrics v0.4.1 // indirect
3935
github.com/beorn7/perks v1.0.1 // indirect
4036
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
4137
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4238
github.com/circonus-labs/go-apiclient v0.7.24 // indirect
43-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4439
github.com/dgryski/go-farm v0.0.0-20240924180020-3414d57e47da // indirect
4540
github.com/eapache/channels v1.1.0 // indirect
46-
github.com/eapache/go-resiliency v1.7.0 // indirect
47-
github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3 // indirect
4841
github.com/eapache/queue v1.1.0 // indirect
4942
github.com/fatih/color v1.18.0 // indirect
5043
github.com/felixge/fgprof v0.9.5 // indirect
5144
github.com/fsnotify/fsnotify v1.8.0 // indirect
5245
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
5346
github.com/go-logfmt/logfmt v0.6.0 // indirect
54-
github.com/gogo/protobuf v1.3.2 // indirect
55-
github.com/golang/snappy v0.0.4 // indirect
5647
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 // indirect
5748
github.com/google/uuid v1.6.0 // indirect
5849
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -65,15 +56,9 @@ require (
6556
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
6657
github.com/hashicorp/go-secure-stdlib/parseutil v0.1.9 // indirect
6758
github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
68-
github.com/hashicorp/go-uuid v1.0.3 // indirect
6959
github.com/hashicorp/golang-lru v1.0.2 // indirect
7060
github.com/hashicorp/hcl v1.0.1-vault-7 // indirect
7161
github.com/hashicorp/serf v0.10.2 // indirect
72-
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
73-
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
74-
github.com/jcmturner/gofork v1.7.6 // indirect
75-
github.com/jcmturner/gokrb5/v8 v8.4.4 // indirect
76-
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
7762
github.com/k-sone/critbitgo v1.4.0 // indirect
7863
github.com/klauspost/compress v1.18.0 // indirect
7964
github.com/mattn/go-colorable v0.1.14 // indirect
@@ -82,14 +67,11 @@ require (
8267
github.com/mitchellh/mapstructure v1.5.0 // indirect
8368
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8469
github.com/openhistogram/circonusllhist v0.4.1 // indirect
85-
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
8670
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
87-
github.com/pierrec/lz4/v4 v4.1.22 // indirect
8871
github.com/pkg/errors v0.9.1 // indirect
8972
github.com/prometheus/client_model v0.6.1 // indirect
9073
github.com/prometheus/common v0.62.0 // indirect
9174
github.com/prometheus/procfs v0.15.1 // indirect
92-
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
9375
github.com/ryanuber/go-glob v1.0.0 // indirect
9476
github.com/sagikazarmark/locafero v0.7.0 // indirect
9577
github.com/sagikazarmark/slog-shim v0.1.0 // indirect

0 commit comments

Comments
 (0)