snapshot of https://github.com/grpc/grpc-go.git (master, 2026-09-15; blobs > 131072B omitted)
Some checks failed
codecov / upload (push) Failing after 13m59s
CodeQL / Analyze (push) Failing after 1s
govulncheck / govulncheck (.) (push) Failing after 1s
govulncheck / govulncheck (./cmd/protoc-gen-go-grpc) (push) Failing after 1s
govulncheck / govulncheck (./gcp/observability) (push) Failing after 1s
govulncheck / govulncheck (./security/advancedtls) (push) Failing after 1s
govulncheck / govulncheck (./stats/opencensus) (push) Failing after 1s
Testing / vet-proto (push) Failing after 1s
Testing / tests (arm, latest) (push) Waiting to run
Testing / extras (latest) (push) Failing after 1s
Testing / static checks (latest-1) (push) Failing after 1s
Testing / tests (-race, latest) (push) Failing after 1s
Testing / tests (i386, latest) (push) Failing after 1s
Testing / tests (latest) (push) Failing after 1s
Testing / tests (latest-1) (push) Failing after 1s
Lock Threads / lock (push) Failing after 1s
Stale bot / stale (push) Failing after 1s
Some checks failed
codecov / upload (push) Failing after 13m59s
CodeQL / Analyze (push) Failing after 1s
govulncheck / govulncheck (.) (push) Failing after 1s
govulncheck / govulncheck (./cmd/protoc-gen-go-grpc) (push) Failing after 1s
govulncheck / govulncheck (./gcp/observability) (push) Failing after 1s
govulncheck / govulncheck (./security/advancedtls) (push) Failing after 1s
govulncheck / govulncheck (./stats/opencensus) (push) Failing after 1s
Testing / vet-proto (push) Failing after 1s
Testing / tests (arm, latest) (push) Waiting to run
Testing / extras (latest) (push) Failing after 1s
Testing / static checks (latest-1) (push) Failing after 1s
Testing / tests (-race, latest) (push) Failing after 1s
Testing / tests (i386, latest) (push) Failing after 1s
Testing / tests (latest) (push) Failing after 1s
Testing / tests (latest-1) (push) Failing after 1s
Lock Threads / lock (push) Failing after 1s
Stale bot / stale (push) Failing after 1s
This commit is contained in:
58
admin/admin.go
Normal file
58
admin/admin.go
Normal file
@@ -0,0 +1,58 @@
|
||||
/*
|
||||
*
|
||||
* Copyright 2021 gRPC authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
|
||||
// Package admin provides a convenient method for registering a collection of
|
||||
// administration services to a gRPC server. The services registered are:
|
||||
//
|
||||
// - Channelz: https://github.com/grpc/proposal/blob/master/A14-channelz.md
|
||||
//
|
||||
// - CSDS: https://github.com/grpc/proposal/blob/master/A40-csds-support.md
|
||||
//
|
||||
// # Experimental
|
||||
//
|
||||
// Notice: All APIs in this package are experimental and may be removed in a
|
||||
// later release.
|
||||
package admin
|
||||
|
||||
import (
|
||||
"google.golang.org/grpc"
|
||||
channelzservice "google.golang.org/grpc/channelz/service"
|
||||
internaladmin "google.golang.org/grpc/internal/admin"
|
||||
)
|
||||
|
||||
func init() {
|
||||
// Add a list of default services to admin here. Optional services, like
|
||||
// CSDS, will be added by other packages.
|
||||
internaladmin.AddService(func(registrar grpc.ServiceRegistrar) (func(), error) {
|
||||
channelzservice.RegisterChannelzServiceToServer(registrar)
|
||||
return nil, nil
|
||||
})
|
||||
}
|
||||
|
||||
// Register registers the set of admin services to the given server.
|
||||
//
|
||||
// The returned cleanup function should be called to clean up the resources
|
||||
// allocated for the service handlers after the server is stopped.
|
||||
//
|
||||
// Note that if `s` is not a *grpc.Server or a *xds.GRPCServer, CSDS will not be
|
||||
// registered because CSDS generated code is old and doesn't support interface
|
||||
// `grpc.ServiceRegistrar`.
|
||||
// https://github.com/envoyproxy/go-control-plane/issues/403
|
||||
func Register(s grpc.ServiceRegistrar) (cleanup func(), _ error) {
|
||||
return internaladmin.Register(s)
|
||||
}
|
||||
34
admin/admin_test.go
Normal file
34
admin/admin_test.go
Normal file
@@ -0,0 +1,34 @@
|
||||
/*
|
||||
*
|
||||
* Copyright 2021 gRPC authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
|
||||
package admin_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"google.golang.org/grpc/admin/test"
|
||||
"google.golang.org/grpc/codes"
|
||||
)
|
||||
|
||||
func TestRegisterNoCSDS(t *testing.T) {
|
||||
test.RunRegisterTests(t, test.ExpectedStatusCodes{
|
||||
ChannelzCode: codes.OK,
|
||||
// CSDS is not registered because xDS isn't imported.
|
||||
CSDSCode: codes.Unimplemented,
|
||||
})
|
||||
}
|
||||
38
admin/test/admin_test.go
Normal file
38
admin/test/admin_test.go
Normal file
@@ -0,0 +1,38 @@
|
||||
/*
|
||||
*
|
||||
* Copyright 2021 gRPC authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
|
||||
// This file has the same content as admin_test.go, difference is that this is
|
||||
// in another package, and it imports "xds", so we can test that csds is
|
||||
// registered when xds is imported.
|
||||
|
||||
package test_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"google.golang.org/grpc/admin/test"
|
||||
"google.golang.org/grpc/codes"
|
||||
_ "google.golang.org/grpc/xds"
|
||||
)
|
||||
|
||||
func TestRegisterWithCSDS(t *testing.T) {
|
||||
test.RunRegisterTests(t, test.ExpectedStatusCodes{
|
||||
ChannelzCode: codes.OK,
|
||||
CSDSCode: codes.OK,
|
||||
})
|
||||
}
|
||||
104
admin/test/utils.go
Normal file
104
admin/test/utils.go
Normal file
@@ -0,0 +1,104 @@
|
||||
/*
|
||||
*
|
||||
* Copyright 2021 gRPC authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*
|
||||
*/
|
||||
|
||||
// Package test contains test only functions for package admin. It's used by
|
||||
// admin/admin_test.go and admin/test/admin_test.go.
|
||||
package test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"net"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/admin"
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/credentials/insecure"
|
||||
"google.golang.org/grpc/status"
|
||||
|
||||
v3statusgrpc "github.com/envoyproxy/go-control-plane/envoy/service/status/v3"
|
||||
v3statuspb "github.com/envoyproxy/go-control-plane/envoy/service/status/v3"
|
||||
channelzgrpc "google.golang.org/grpc/channelz/grpc_channelz_v1"
|
||||
channelzpb "google.golang.org/grpc/channelz/grpc_channelz_v1"
|
||||
)
|
||||
|
||||
const (
|
||||
defaultTestTimeout = 10 * time.Second
|
||||
)
|
||||
|
||||
// ExpectedStatusCodes contains the expected status code for each RPC (can be
|
||||
// OK).
|
||||
type ExpectedStatusCodes struct {
|
||||
ChannelzCode codes.Code
|
||||
CSDSCode codes.Code
|
||||
}
|
||||
|
||||
// RunRegisterTests makes a client, runs the RPCs, and compares the status
|
||||
// codes.
|
||||
func RunRegisterTests(t *testing.T, ec ExpectedStatusCodes) {
|
||||
lis, err := net.Listen("tcp", "localhost:0")
|
||||
if err != nil {
|
||||
t.Fatalf("cannot create listener: %v", err)
|
||||
}
|
||||
|
||||
server := grpc.NewServer()
|
||||
defer server.Stop()
|
||||
cleanup, err := admin.Register(server)
|
||||
if err != nil {
|
||||
t.Fatalf("failed to register admin: %v", err)
|
||||
}
|
||||
defer cleanup()
|
||||
go func() {
|
||||
server.Serve(lis)
|
||||
}()
|
||||
|
||||
conn, err := grpc.NewClient(lis.Addr().String(), grpc.WithTransportCredentials(insecure.NewCredentials()))
|
||||
if err != nil {
|
||||
t.Fatalf("grpc.NewClient(%q) = %v", lis.Addr().String(), err)
|
||||
}
|
||||
|
||||
t.Run("channelz", func(t *testing.T) {
|
||||
if err := RunChannelz(conn); status.Code(err) != ec.ChannelzCode {
|
||||
t.Fatalf("%s RPC failed with error %v, want code %v", "channelz", err, ec.ChannelzCode)
|
||||
}
|
||||
})
|
||||
t.Run("csds", func(t *testing.T) {
|
||||
if err := RunCSDS(conn); status.Code(err) != ec.CSDSCode {
|
||||
t.Fatalf("%s RPC failed with error %v, want code %v", "CSDS", err, ec.CSDSCode)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// RunChannelz makes a channelz RPC.
|
||||
func RunChannelz(conn *grpc.ClientConn) error {
|
||||
c := channelzgrpc.NewChannelzClient(conn)
|
||||
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
|
||||
defer cancel()
|
||||
_, err := c.GetTopChannels(ctx, &channelzpb.GetTopChannelsRequest{}, grpc.WaitForReady(true))
|
||||
return err
|
||||
}
|
||||
|
||||
// RunCSDS makes a CSDS RPC.
|
||||
func RunCSDS(conn *grpc.ClientConn) error {
|
||||
c := v3statusgrpc.NewClientStatusDiscoveryServiceClient(conn)
|
||||
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
|
||||
defer cancel()
|
||||
_, err := c.FetchClientStatus(ctx, &v3statuspb.ClientStatusRequest{}, grpc.WaitForReady(true))
|
||||
return err
|
||||
}
|
||||
Reference in New Issue
Block a user