diff --git a/tap/extensions/http/http2_assembler.go b/tap/extensions/http/http2_assembler.go index 5a5cb0d85..92f05c60f 100644 --- a/tap/extensions/http/http2_assembler.go +++ b/tap/extensions/http/http2_assembler.go @@ -28,26 +28,6 @@ const protoMinorHTTP2 = 0 var maxHTTP2DataLen = 1 * 1024 * 1024 // 1MB -var grpcStatusCodes = []string{ - "OK", - "CANCELLED", - "UNKNOWN", - "INVALID_ARGUMENT", - "DEADLINE_EXCEEDED", - "NOT_FOUND", - "ALREADY_EXISTS", - "PERMISSION_DENIED", - "RESOURCE_EXHAUSTED", - "FAILED_PRECONDITION", - "ABORTED", - "OUT_OF_RANGE", - "UNIMPLEMENTED", - "INTERNAL", - "UNAVAILABLE", - "DATA_LOSS", - "UNAUTHENTICATED", -} - type messageFragment struct { headers []hpack.HeaderField data []byte @@ -142,18 +122,8 @@ func (ga *Http2Assembler) readMessage() (streamID uint32, messageHTTP1 interface // gRPC detection grpcStatus := headersHTTP1.Get("Grpc-Status") - if grpcStatus != "" { + if grpcStatus != "" || strings.Contains(headersHTTP1.Get("Content-Type"), "application/grpc") { isGrpc = true - status = grpcStatus - } - - if strings.Contains(headersHTTP1.Get("Content-Type"), "application/grpc") { - isGrpc = true - grpcPath := headersHTTP1.Get(":path") - pathSegments := strings.Split(grpcPath, "/") - if len(pathSegments) > 0 { - method = pathSegments[len(pathSegments)-1] - } } if method != "" { diff --git a/tap/extensions/http/main.go b/tap/extensions/http/main.go index a1f18ba0d..44059f535 100644 --- a/tap/extensions/http/main.go +++ b/tap/extensions/http/main.go @@ -248,11 +248,6 @@ func (d dissecting) Analyze(item *api.OutputChannelItem, resolvedSource string, reqDetails["_queryStringMerged"] = mapSliceMergeRepeatedKeys(reqDetails["_queryString"].([]interface{})) reqDetails["queryString"] = mapSliceRebuildAsMap(reqDetails["_queryStringMerged"].([]interface{})) - statusCode := int(resDetails["status"].(float64)) - if item.Protocol.Abbreviation == "gRPC" { - resDetails["statusText"] = grpcStatusCodes[statusCode] - } - elapsedTime := item.Pair.Response.CaptureTime.Sub(item.Pair.Request.CaptureTime).Round(time.Millisecond).Milliseconds() if elapsedTime < 0 { elapsedTime = 0 diff --git a/ui-common/src/components/UI/StatusCode.tsx b/ui-common/src/components/UI/StatusCode.tsx index 64140982f..5e5506d04 100644 --- a/ui-common/src/components/UI/StatusCode.tsx +++ b/ui-common/src/components/UI/StatusCode.tsx @@ -37,9 +37,9 @@ export function getClassification(statusCode: number): string { // 1 - 16 HTTP/2 (gRPC) status codes // 2xx - 5xx HTTP/1.x status codes - if ((statusCode >= 200 && statusCode <= 399) || statusCode === 0) { + if (statusCode >= 200 && statusCode <= 399) { classification = StatusCodeClassification.SUCCESS; - } else if (statusCode >= 400 || (statusCode >= 1 && statusCode <= 16)) { + } else if (statusCode >= 400) { classification = StatusCodeClassification.FAILURE; }