Skip to content

Commit ecec6ce

Browse files
committed
Removes unneeded OpenTelemetry features.
1 parent 7adabf2 commit ecec6ce

File tree

4 files changed

+1
-394
lines changed

4 files changed

+1
-394
lines changed

cmd/postgres-operator/main.go

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ import (
3939
)
4040

4141
func main() {
42-
if flush, err := initOpenTelemetry(); err != nil {
43-
log.Fatal(err)
44-
} else {
45-
defer flush()
46-
}
47-
4842
debugFlag := os.Getenv("CRUNCHY_DEBUG")
4943
// add logging configuration
5044
crunchylog.CrunchyLogger(crunchylog.SetParameters())
@@ -58,18 +52,7 @@ func main() {
5852
// give time for pgo-event to start up
5953
time.Sleep(time.Duration(5) * time.Second)
6054

61-
newKubernetesClient := func() (*kubeapi.Client, error) {
62-
config, err := kubeapi.LoadClientConfig()
63-
if err != nil {
64-
return nil, err
65-
}
66-
67-
config.Wrap(otelTransportWrapper())
68-
69-
return kubeapi.NewClientForConfig(config)
70-
}
71-
72-
client, err := newKubernetesClient()
55+
client, err := kubeapi.NewClient()
7356
if err != nil {
7457
log.Fatal(err)
7558
}
@@ -96,8 +79,6 @@ func main() {
9679
}
9780
log.Debug("controller manager created")
9881

99-
controllerManager.NewKubernetesClient = newKubernetesClient
100-
10182
// If not using the "disabled" namespace operating mode, start a real namespace controller
10283
// that is able to resond to namespace events in the Kube cluster. If using the "disabled"
10384
// operating mode, then create a fake client containing all namespaces defined for the install

cmd/postgres-operator/open_telemetry.go

Lines changed: 0 additions & 101 deletions
This file was deleted.

go.mod

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ require (
1212
github.com/spf13/cobra v0.0.5
1313
github.com/spf13/pflag v1.0.5
1414
github.com/xdg/stringprep v1.0.0
15-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.13.0
16-
go.opentelemetry.io/otel v0.13.0
17-
go.opentelemetry.io/otel/exporters/stdout v0.13.0
18-
go.opentelemetry.io/otel/exporters/trace/jaeger v0.13.0
1915
golang.org/x/crypto v0.1.0
2016
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
2117
gopkg.in/yaml.v2 v2.4.0
@@ -27,12 +23,9 @@ require (
2723
)
2824

2925
require (
30-
github.com/DataDog/sketches-go v0.0.1 // indirect
31-
github.com/apache/thrift v0.13.0 // indirect
3226
github.com/davecgh/go-spew v1.1.1 // indirect
3327
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
3428
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
35-
github.com/felixge/httpsnoop v1.0.1 // indirect
3629
github.com/go-logr/logr v1.2.3 // indirect
3730
github.com/go-openapi/jsonpointer v0.19.5 // indirect
3831
github.com/go-openapi/jsonreference v0.20.0 // indirect
@@ -57,15 +50,12 @@ require (
5750
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5851
github.com/onsi/ginkgo v1.16.4 // indirect
5952
github.com/pkg/errors v0.9.1 // indirect
60-
github.com/stretchr/objx v0.4.0 // indirect
61-
go.opentelemetry.io/otel/sdk v0.13.0 // indirect
6253
golang.org/x/net v0.7.0 // indirect
6354
golang.org/x/oauth2 v0.5.0 // indirect
6455
golang.org/x/sys v0.5.0 // indirect
6556
golang.org/x/term v0.5.0 // indirect
6657
golang.org/x/text v0.7.0 // indirect
6758
golang.org/x/time v0.3.0 // indirect
68-
google.golang.org/api v0.32.0 // indirect
6959
google.golang.org/appengine v1.6.7 // indirect
7060
google.golang.org/protobuf v1.28.1 // indirect
7161
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)