GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-09-15 16:23:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into release/v0.11.0

Browse Source
This commit is contained in:
Prashant Shahi 2022-08-24 19:01:33 +05:30
commit 73b00f405b
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/components/Logs/LogItem/index.tsx
View File

@ -15,6 +15,7 @@ import { ILogsReducer } from 'types/reducer/logs';
import AddToQueryHOC from '../AddToQueryHOC'; import AddToQueryHOC from '../AddToQueryHOC';
import CopyClipboardHOC from '../CopyClipboardHOC'; import CopyClipboardHOC from '../CopyClipboardHOC';
import { Container } from './styles'; import { Container } from './styles';
import { isValidLogField } from './util';
interface LogFieldProps { interface LogFieldProps {
fieldKey: string; fieldKey: string;
@ -118,7 +119,7 @@ function LogItem({ logData }: LogItemProps): JSX.Element {
</div> </div>
<div> <div>
{map(selected, (field) => { {map(selected, (field) => {
return flattenLogData[field.name] ? ( return isValidLogField(flattenLogData[field.name] as never) ? (
<LogSelectedField <LogSelectedField
key={field.name} key={field.name}
fieldKey={field.name} fieldKey={field.name}

1
frontend/src/components/Logs/LogItem/util.ts Normal file
View File

@ -0,0 +1 @@
export const isValidLogField = (value: never): boolean => value !== undefined;

2
frontend/src/container/LogsSearchFilter/useSearchParser.ts
View File

@ -44,7 +44,7 @@ export function useSearchParser(): {
); );
useEffect(() => { useEffect(() => {
updateQueryString(queryString); if (queryString !== null) updateQueryString(queryString);
}, [queryString, updateQueryString]); }, [queryString, updateQueryString]);
const updateParsedQuery = useCallback( const updateParsedQuery = useCallback(

7
pkg/query-service/app/logs/parser.go
View File

@ -7,6 +7,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"go.signoz.io/query-service/constants"
"go.signoz.io/query-service/model" "go.signoz.io/query-service/model"
) )
@ -239,8 +240,10 @@ func replaceInterestingFields(allFields *model.GetFieldsResponse, queryTokens []
sqlColName := *col sqlColName := *col
if _, ok := selectedFieldsLookup[*col]; !ok && *col != "body" { if _, ok := selectedFieldsLookup[*col]; !ok && *col != "body" {
if field, ok := interestingFieldLookup[*col]; ok { if field, ok := interestingFieldLookup[*col]; ok {
sqlColName = fmt.Sprintf("%s_%s_value[indexOf(%s_%s_key, '%s')]", field.Type, strings.ToLower(field.DataType), field.Type, strings.ToLower(field.DataType), *col) if field.Type != constants.Static {
} else if strings.Compare(strings.ToLower(*col), "fulltext") != 0 { sqlColName = fmt.Sprintf("%s_%s_value[indexOf(%s_%s_key, '%s')]", field.Type, strings.ToLower(field.DataType), field.Type, strings.ToLower(field.DataType), *col)
}
} else if strings.Compare(strings.ToLower(*col), "fulltext") != 0 && field.Type != constants.Static {
return nil, fmt.Errorf("field not found for filtering") return nil, fmt.Errorf("field not found for filtering")
} }
} }

18
pkg/query-service/model/response.go
View File

@ -430,16 +430,16 @@ type GetFieldsResponse struct {
type GetLogsResponse struct { type GetLogsResponse struct {
Timestamp uint64 `json:"timestamp" ch:"timestamp"` Timestamp uint64 `json:"timestamp" ch:"timestamp"`
ID string `json:"id" ch:"id"` ID string `json:"id" ch:"id"`
TraceID string `json:"traceId" ch:"trace_id"` TraceID string `json:"trace_id" ch:"trace_id"`
SpanID string `json:"spanId" ch:"span_id"` SpanID string `json:"span_id" ch:"span_id"`
TraceFlags uint32 `json:"traceFlags" ch:"trace_flags"` TraceFlags uint32 `json:"trace_flags" ch:"trace_flags"`
SeverityText string `json:"severityText" ch:"severity_text"` SeverityText string `json:"severity_text" ch:"severity_text"`
SeverityNumber uint8 `json:"severityNumber" ch:"severity_number"` SeverityNumber uint8 `json:"severity_number" ch:"severity_number"`
Body string `json:"body" ch:"body"` Body string `json:"body" ch:"body"`
Resources_string map[string]string `json:"resourcesString" ch:"resources_string"` Resources_string map[string]string `json:"resources_string" ch:"resources_string"`
Attributes_string map[string]string `json:"attributesString" ch:"attributes_string"` Attributes_string map[string]string `json:"attributes_string" ch:"attributes_string"`
Attributes_int64 map[string]int64 `json:"attributesInt" ch:"attributes_int64"` Attributes_int64 map[string]int64 `json:"attributes_int" ch:"attributes_int64"`
Attributes_float64 map[string]float64 `json:"attributesFloat" ch:"attributes_float64"` Attributes_float64 map[string]float64 `json:"attributes_float" ch:"attributes_float64"`
} }
type LogsTailClient struct { type LogsTailClient struct {