File tree Expand file tree Collapse file tree 4 files changed +15
-2
lines changed
staging/src/k8s.io/apiserver Expand file tree Collapse file tree 4 files changed +15
-2
lines changed Original file line number Diff line number Diff line change @@ -37,6 +37,8 @@ import (
37
37
"github.com/coreos/go-systemd/v22/daemon"
38
38
"github.com/spf13/cobra"
39
39
"github.com/spf13/pflag"
40
+ "go.opentelemetry.io/otel"
41
+ "go.opentelemetry.io/otel/metric/noop"
40
42
"google.golang.org/grpc/codes"
41
43
"google.golang.org/grpc/status"
42
44
jsonpatch "gopkg.in/evanphx/json-patch.v4"
@@ -121,6 +123,9 @@ import (
121
123
122
124
func init () {
123
125
utilruntime .Must (logsapi .AddFeatureGates (utilfeature .DefaultMutableFeatureGate ))
126
+ // Prevent memory leak from OTel metrics, which we don't use:
127
+ // https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5190
128
+ otel .SetMeterProvider (noop .NewMeterProvider ())
124
129
}
125
130
126
131
const (
Original file line number Diff line number Diff line change @@ -65,6 +65,7 @@ require (
65
65
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0
66
66
go.opentelemetry.io/otel v1.28.0
67
67
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
68
+ go.opentelemetry.io/otel/metric v1.28.0
68
69
go.opentelemetry.io/otel/sdk v1.28.0
69
70
go.opentelemetry.io/otel/trace v1.28.0
70
71
go.opentelemetry.io/proto/otlp v1.3.1
@@ -206,7 +207,6 @@ require (
206
207
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
207
208
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
208
209
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
209
- go.opentelemetry.io/otel/metric v1.28.0 // indirect
210
210
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
211
211
go.uber.org/multierr v1.11.0 // indirect
212
212
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
Original file line number Diff line number Diff line change @@ -31,6 +31,7 @@ require (
31
31
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0
32
32
go.opentelemetry.io/otel v1.28.0
33
33
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
34
+ go.opentelemetry.io/otel/metric v1.28.0
34
35
go.opentelemetry.io/otel/sdk v1.28.0
35
36
go.opentelemetry.io/otel/trace v1.28.0
36
37
go.uber.org/zap v1.26.0
@@ -110,7 +111,6 @@ require (
110
111
go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect
111
112
go.etcd.io/etcd/raft/v3 v3.5.13 // indirect
112
113
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
113
- go.opentelemetry.io/otel/metric v1.28.0 // indirect
114
114
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
115
115
go.uber.org/multierr v1.11.0 // indirect
116
116
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
Original file line number Diff line number Diff line change @@ -23,7 +23,9 @@ import (
23
23
"net"
24
24
25
25
"github.com/spf13/pflag"
26
+ "go.opentelemetry.io/otel"
26
27
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
28
+ "go.opentelemetry.io/otel/metric/noop"
27
29
"go.opentelemetry.io/otel/sdk/resource"
28
30
"go.opentelemetry.io/otel/semconv/v1.12.0"
29
31
"google.golang.org/grpc"
48
50
codecs = serializer .NewCodecFactory (cfgScheme )
49
51
)
50
52
53
+ func init () {
54
+ // Prevent memory leak from OTel metrics, which we don't use:
55
+ // https://github.com/open-telemetry/opentelemetry-go-contrib/issues/5190
56
+ otel .SetMeterProvider (noop .NewMeterProvider ())
57
+ }
58
+
51
59
func init () {
52
60
install .Install (cfgScheme )
53
61
}
You can’t perform that action at this time.
0 commit comments