change package name to genericproducer

arjan-bal · Sep 5, 2024 · 6d24284 · 6d24284
1 parent 4bb15ed
commit 6d24284
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/balancer/pickfirstleaf/pickfirstleaf.go b/balancer/pickfirstleaf/pickfirstleaf.go
@@ -30,7 +30,7 @@ import (
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/grpclog"
-	"google.golang.org/grpc/health/producer"
+	"google.golang.org/grpc/health/genericproducer"
 	"google.golang.org/grpc/internal"
 	"google.golang.org/grpc/internal/envconfig"
 	internalgrpclog "google.golang.org/grpc/internal/grpclog"
@@ -491,7 +491,7 @@ func (b *pickfirstBalancer) updateSubConnState(sd *scData, state balancer.SubCon
 			pb:     b,
 		}
 		if sd.unregisterHealthListener == nil {
-			sd.unregisterHealthListener = producer.RegisterListener(hl, sd.subConn)
+			sd.unregisterHealthListener = genericproducer.RegisterListener(hl, sd.subConn)
 		} else {
 			// The health update may have already arrived.
 			b.updateSubConnHealthState(sd)

diff --git a/health/producer/generic_producer.go → health/genericproducer/generic_producer.go b/health/producer/generic_producer.go → health/genericproducer/generic_producer.go
@@ -1,4 +1,4 @@
-package producer
+package genericproducer
 
 import (
 	"context"

diff --git a/health/producer.go b/health/producer.go
@@ -8,7 +8,7 @@ import (
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/connectivity"
-	"google.golang.org/grpc/health/producer"
+	"google.golang.org/grpc/health/genericproducer"
 	"google.golang.org/grpc/internal"
 	"google.golang.org/grpc/status"
 )
@@ -110,7 +110,7 @@ func EnableHealthCheck(opts balancer.HealthCheckOptions, sc balancer.SubConn) fu
 		return closeFn
 	}
 	var closeGenericProducer func()
-	p.listener, closeGenericProducer = producer.SwapRootListener(&noOpListener{p: p}, sc)
+	p.listener, closeGenericProducer = genericproducer.SwapRootListener(&noOpListener{p: p}, sc)
 	ls := &subConnStateListener{
 		p: p,
 	}

diff --git a/xds/internal/balancer/outlierdetection/balancer.go b/xds/internal/balancer/outlierdetection/balancer.go
@@ -35,7 +35,7 @@ import (
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/balancer/pickfirstleaf"
 	"google.golang.org/grpc/connectivity"
-	"google.golang.org/grpc/health/producer"
+	"google.golang.org/grpc/health/genericproducer"
 	"google.golang.org/grpc/internal/balancer/gracefulswitch"
 	"google.golang.org/grpc/internal/buffer"
 	"google.golang.org/grpc/internal/channelz"
@@ -530,7 +530,7 @@ func (b *outlierDetectionBalancer) NewSubConn(addrs []resolver.Address, opts bal
 		genericHealthProducerEnabled: genericHealthProducerEnabled,
 	}
 	if genericHealthProducerEnabled {
-		scw.healthListener, scw.unregisterHealthListener = producer.SwapRootListener(&healthListener{
+		scw.healthListener, scw.unregisterHealthListener = genericproducer.SwapRootListener(&healthListener{
 			b:  b,
 			sc: sc,
 		}, sc)