Skip to content

Commit 3d65369

Browse files
authored
Merge pull request kubernetes#126957 from dashpole/fix_tracing_leak
Fix memory leak from global OpenTelemetry MeterProvider
2 parents 71389d5 + 4aa655c commit 3d65369

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

cmd/kubelet/app/server.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ import (
3737
"github.com/coreos/go-systemd/v22/daemon"
3838
"github.com/spf13/cobra"
3939
"github.com/spf13/pflag"
40+
"go.opentelemetry.io/otel"
41+
"go.opentelemetry.io/otel/metric/noop"
4042
"google.golang.org/grpc/codes"
4143
"google.golang.org/grpc/status"
4244
jsonpatch "gopkg.in/evanphx/json-patch.v4"
@@ -121,6 +123,9 @@ import (
121123

122124
func init() {
123125
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())
124129
}
125130

126131
const (

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ require (
6565
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.42.0
6666
go.opentelemetry.io/otel v1.28.0
6767
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
68+
go.opentelemetry.io/otel/metric v1.28.0
6869
go.opentelemetry.io/otel/sdk v1.28.0
6970
go.opentelemetry.io/otel/trace v1.28.0
7071
go.opentelemetry.io/proto/otlp v1.3.1
@@ -206,7 +207,6 @@ require (
206207
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
207208
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
208209
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
209-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
210210
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
211211
go.uber.org/multierr v1.11.0 // indirect
212212
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect

staging/src/k8s.io/apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ require (
3131
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0
3232
go.opentelemetry.io/otel v1.28.0
3333
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
34+
go.opentelemetry.io/otel/metric v1.28.0
3435
go.opentelemetry.io/otel/sdk v1.28.0
3536
go.opentelemetry.io/otel/trace v1.28.0
3637
go.uber.org/zap v1.26.0
@@ -110,7 +111,6 @@ require (
110111
go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect
111112
go.etcd.io/etcd/raft/v3 v3.5.13 // indirect
112113
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
113-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
114114
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
115115
go.uber.org/multierr v1.11.0 // indirect
116116
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect

staging/src/k8s.io/apiserver/pkg/server/options/tracing.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ import (
2323
"net"
2424

2525
"github.com/spf13/pflag"
26+
"go.opentelemetry.io/otel"
2627
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
28+
"go.opentelemetry.io/otel/metric/noop"
2729
"go.opentelemetry.io/otel/sdk/resource"
2830
"go.opentelemetry.io/otel/semconv/v1.12.0"
2931
"google.golang.org/grpc"
@@ -48,6 +50,12 @@ var (
4850
codecs = serializer.NewCodecFactory(cfgScheme)
4951
)
5052

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+
5159
func init() {
5260
install.Install(cfgScheme)
5361
}

0 commit comments

Comments
 (0)