Skip to content

PMM-9377 grpc-gateway v2 upgrade #861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BupycHuk merged 13 commits into from
Jun 7, 2022
Merged

PMM-9377 grpc-gateway v2 upgrade #861

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
978b67b
add custom error handler for gateway v2
idoqo May 3, 2022
b336657
regenerate files
idoqo May 3, 2022
59b17db
Merge branch 'main' into PMM-9377-gateway-2
idoqo May 18, 2022
9725224
clean up go.sum
idoqo May 18, 2022
71998b7
Merge branch 'main' into grpc-gateway-v2
idoqo May 31, 2022
d83bc77
remove duplicated code
idoqo Jun 1, 2022
c794e78
Merge branch 'main' into grpc-gateway-v2
idoqo Jun 1, 2022
77d28e6
restore blank imports comments
idoqo Jun 2, 2022
37efda7
improve error handler doc
idoqo Jun 6, 2022
acb7385
Merge branch 'main' into grpc-gateway-v2
idoqo Jun 6, 2022
1b157bc
regenerate files to fix build
idoqo Jun 6, 2022
5cf06b3
Merge branch 'main' into grpc-gateway-v2
idoqo Jun 7, 2022
c36b086
Merge branch 'main' into grpc-gateway-v2
idoqo Jun 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 17 additions & 7 deletions agent/agentlocal/agent_local.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ package agentlocal
import (
"bytes"
"context"
_ "expvar" // register /debug/vars
_ "expvar"
"html/template"
"log"
"net"
"net/http"
_ "net/http/pprof" // register /debug/pprof
_ "net/http/pprof"
"os"
"strconv"
"strings"
"sync"
"time"

grpc_gateway "github.com/grpc-ecosystem/grpc-gateway/runtime"
grpc_gateway "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/collectors"
"github.com/prometheus/client_golang/prometheus/promhttp"
Expand All @@ -41,11 +41,15 @@ import (
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/reflection"
"google.golang.org/grpc/status"

Comment thread
idoqo marked this conversation as resolved.
Outdated
// register /debug/vars
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/types/known/durationpb"

"github.com/percona/pmm/agent/config"
"github.com/percona/pmm/api/agentlocalpb"
"github.com/percona/pmm/api/agentpb"
pmmerrors "github.com/percona/pmm/utils/errors"
"github.com/percona/pmm/version"
)

Expand Down Expand Up @@ -271,11 +275,17 @@ func (s *Server) runJSONServer(ctx context.Context, grpcAddress string) {

proxyMux := grpc_gateway.NewServeMux(
grpc_gateway.WithMarshalerOption(grpc_gateway.MIMEWildcard, &grpc_gateway.JSONPb{
EmitDefaults: true,
Indent: " ",
OrigName: true,
MarshalOptions: protojson.MarshalOptions{
EmitUnpopulated: true,
Indent: " ",
UseProtoNames: true,
},
UnmarshalOptions: protojson.UnmarshalOptions{
DiscardUnknown: true,
},
}),
)
grpc_gateway.WithErrorHandler(pmmerrors.PMMHTTPErrorHandler))

opts := []grpc.DialOption{
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithBlock(),
Expand Down
6 changes: 3 additions & 3 deletions agent/commands/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func checkStatus(configFilepath string, l *logrus.Entry) (string, bool) {
case *agent_local.StatusDefault:
msg := fmt.Sprintf("HTTP code %d", err.Code())
if err.Payload != nil {
msg = fmt.Sprintf("%s (gRPC code %d, HTTP code %d)", err.Payload.Error, err.Payload.Code, err.Code())
msg = fmt.Sprintf("%s (gRPC code %d, HTTP code %d)", err.Payload.Message, err.Payload.Code, err.Code())
}
fmt.Printf("pmm-agent is running, but status check failed: %s.\n", msg)
os.Exit(1)
Expand Down Expand Up @@ -140,7 +140,7 @@ func register(cfg *config.Config, l *logrus.Entry) {
if err != nil {
msg := err.Error()
if e, _ := err.(*node.RegisterNodeDefault); e != nil {
msg = e.Payload.Error + ""
msg = e.Payload.Message + ""
switch e.Code() {
case http.StatusConflict:
msg += " If you want override node, use --force option"
Expand All @@ -167,7 +167,7 @@ func reload(l *logrus.Entry) {
err := localReload()
l.Debugf("Reload error: %#v", err)
if err, _ := err.(*agent_local.ReloadDefault); err != nil && err.Code() == int(codes.FailedPrecondition) {
fmt.Printf("Failed to reload configuration: %s.\n", err.Payload.Error)
fmt.Printf("Failed to reload configuration: %s.\n", err.Payload.Message)
os.Exit(1)
}

Expand Down
44 changes: 24 additions & 20 deletions api/agentlocalpb/agentlocal.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 24 additions & 43 deletions api/agentlocalpb/json/agentlocalpb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,33 +48,25 @@
"code": {
"type": "integer",
"format": "int32",
"x-order": 1
"x-order": 0
},
"details": {
"type": "array",
"items": {
"type": "object",
"properties": {
"type_url": {
"@type": {
"type": "string",
"x-order": 0
},
"value": {
"type": "string",
"format": "byte",
"x-order": 1
}
}
},
"additionalProperties": false
},
"x-order": 3
},
"error": {
"type": "string",
"x-order": 0
"x-order": 2
},
"message": {
"type": "string",
"x-order": 2
"x-order": 1
}
}
}
Expand Down Expand Up @@ -232,33 +224,25 @@
"code": {
"type": "integer",
"format": "int32",
"x-order": 1
"x-order": 0
},
"details": {
"type": "array",
"items": {
"type": "object",
"properties": {
"type_url": {
"@type": {
"type": "string",
"x-order": 0
},
"value": {
"type": "string",
"format": "byte",
"x-order": 1
}
}
},
"additionalProperties": false
},
"x-order": 3
},
"error": {
"type": "string",
"x-order": 0
"x-order": 2
},
"message": {
"type": "string",
"x-order": 2
"x-order": 1
}
}
}
Expand Down Expand Up @@ -423,39 +407,36 @@
"code": {
"type": "integer",
"format": "int32",
"x-order": 1
"x-order": 0
},
"details": {
"type": "array",
"items": {
"type": "object",
"properties": {
"type_url": {
"@type": {
"type": "string",
"x-order": 0
},
"value": {
"type": "string",
"format": "byte",
"x-order": 1
}
}
},
"additionalProperties": false
},
"x-order": 3
},
"error": {
"type": "string",
"x-order": 0
"x-order": 2
},
"message": {
"type": "string",
"x-order": 2
"x-order": 1
}
}
}
}
}
}
}
}
},
"tags": [
{
"name": "AgentLocal"
}
]
}
11 changes: 2 additions & 9 deletions api/agentlocalpb/json/client/agent_local/reload_responses.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading