selectedGroupBy === e.key)?.displayValue}
onChange={onClickSelectedGroupByHandler}
>
diff --git a/frontend/src/container/Trace/TraceTable/index.tsx b/frontend/src/container/Trace/TraceTable/index.tsx
index ce6133a089..919f680778 100644
--- a/frontend/src/container/Trace/TraceTable/index.tsx
+++ b/frontend/src/container/Trace/TraceTable/index.tsx
@@ -43,7 +43,7 @@ const TraceTable = ({ getSpansAggregate }: TraceProps) => {
key: 'timestamp',
render: (value: TableType['timestamp']) => {
const day = dayjs(value);
- return {day.format('DD/MM/YYYY HH:MM:ss A')}
;
+ return {day.format('DD/MM/YYYY hh:mm:ss A')}
;
},
sorter: (a, b) => dayjs(a.timestamp).diff(dayjs(b.timestamp)),
},
@@ -129,6 +129,9 @@ const TraceTable = ({ getSpansAggregate }: TraceProps) => {
})}
size="middle"
rowKey={'timestamp'}
+ style={{
+ cursor: 'pointer',
+ }}
pagination={{
current: spansAggregate.currentPage,
pageSize: spansAggregate.pageSize,
diff --git a/frontend/src/hooks/useDebouncedFunction.ts b/frontend/src/hooks/useDebouncedFunction.ts
index 4a26fbc46f..e63b8c6021 100644
--- a/frontend/src/hooks/useDebouncedFunction.ts
+++ b/frontend/src/hooks/useDebouncedFunction.ts
@@ -1,4 +1,4 @@
-import { useCallback } from 'react';
+import { useMemo, useRef } from 'react';
import debounce from 'lodash-es/debounce';
export interface DebouncedFunc any> {
@@ -26,9 +26,13 @@ const useDebouncedFn = any>(
options: DebounceOptions = defaultOptions,
dependencies?: ReadonlyArray,
): DebouncedFunc => {
- const debounced = debounce(fn, wait, options);
+ const fnRef = useRef(fn);
+ fnRef.current = fn;
- return useCallback(debounced, dependencies || []);
+ return useMemo(
+ () => debounce(((...args) => fnRef.current(...args)) as T, wait, options),
+ [...(dependencies || [])],
+ );
};
export default useDebouncedFn;
diff --git a/frontend/src/pages/AlertChannelCreate/index.tsx b/frontend/src/pages/AlertChannelCreate/index.tsx
index e7063085d2..226f2ca2c2 100644
--- a/frontend/src/pages/AlertChannelCreate/index.tsx
+++ b/frontend/src/pages/AlertChannelCreate/index.tsx
@@ -1,18 +1,32 @@
+import RouteTab from 'components/RouteTab';
+import ROUTES from 'constants/routes';
import CreateAlertChannels from 'container/CreateAlertChannels';
import GeneralSettings from 'container/GeneralSettings';
-import SettingsWrapper from 'container/SettingsWrapper';
+import history from 'lib/history';
import React from 'react';
const SettingsPage = (): JSX.Element => {
- const AlertChannels = (): JSX.Element => {
- return ;
- };
+ const pathName = history.location.pathname;
return (
- {
+ return ;
+ },
+ name: 'Alert Channels',
+ route: ROUTES.ALL_CHANNELS,
+ },
+ ],
+ activeKey:
+ pathName === ROUTES.SETTINGS ? 'General Settings' : 'Alert Channels',
}}
/>
);
diff --git a/frontend/src/pages/AllAlertChannels/index.tsx b/frontend/src/pages/AllAlertChannels/index.tsx
index 716795500c..e557f4e861 100644
--- a/frontend/src/pages/AllAlertChannels/index.tsx
+++ b/frontend/src/pages/AllAlertChannels/index.tsx
@@ -1,16 +1,33 @@
import AlertChannels from 'container/AllAlertChannels';
import GeneralSettings from 'container/GeneralSettings';
-import SettingsWrapper from 'container/SettingsWrapper';
import React from 'react';
+import RouteTab from 'components/RouteTab';
+import ROUTES from 'constants/routes';
+import history from 'lib/history';
-const AllAlertChannels = (): JSX.Element => (
-
-);
+const AllAlertChannels = (): JSX.Element => {
+ const pathName = history.location.pathname;
+
+ return (
+
+ );
+};
export default AllAlertChannels;
diff --git a/frontend/src/pages/Settings/index.tsx b/frontend/src/pages/Settings/index.tsx
index 3a8687c48a..c5310107f3 100644
--- a/frontend/src/pages/Settings/index.tsx
+++ b/frontend/src/pages/Settings/index.tsx
@@ -1,14 +1,30 @@
import AlertChannels from 'container/AllAlertChannels';
import GeneralSettings from 'container/GeneralSettings';
-import SettingsWrapper from 'container/SettingsWrapper';
import React from 'react';
+import RouteTab from 'components/RouteTab';
+import ROUTES from 'constants/routes';
+import history from 'lib/history';
const SettingsPage = (): JSX.Element => {
+ const pathName = history.location.pathname;
+
return (
-
);
diff --git a/frontend/src/store/actions/app/index.ts b/frontend/src/store/actions/app/index.ts
index 308027be21..036d1024cf 100644
--- a/frontend/src/store/actions/app/index.ts
+++ b/frontend/src/store/actions/app/index.ts
@@ -1,2 +1 @@
export * from './toggleDarkMode';
-export * from './toggleSettingsTab';
diff --git a/frontend/src/store/actions/app/toggleSettingsTab.ts b/frontend/src/store/actions/app/toggleSettingsTab.ts
deleted file mode 100644
index d60ee26afe..0000000000
--- a/frontend/src/store/actions/app/toggleSettingsTab.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Dispatch } from 'redux';
-import AppActions from 'types/actions';
-import { SettingTab } from 'types/reducer/app';
-
-export const ToggleSettingsTab = (
- props: SettingTab,
-): ((dispatch: Dispatch) => void) => {
- return (dispatch: Dispatch): void => {
- dispatch({
- type: 'TOGGLE_SETTINGS_TABS',
- payload: {
- activeTab: props,
- },
- });
- };
-};
diff --git a/frontend/src/store/reducers/app.ts b/frontend/src/store/reducers/app.ts
index d0ab0fef79..8a786919b9 100644
--- a/frontend/src/store/reducers/app.ts
+++ b/frontend/src/store/reducers/app.ts
@@ -1,10 +1,5 @@
import { IS_LOGGED_IN } from 'constants/auth';
-import {
- AppAction,
- LOGGED_IN,
- SWITCH_DARK_MODE,
- TOGGLE_SETTINGS_TABS,
-} from 'types/actions/app';
+import { AppAction, LOGGED_IN, SWITCH_DARK_MODE } from 'types/actions/app';
import getTheme from 'lib/theme/getTheme';
import InitialValueTypes from 'types/reducer/app';
import getLocalStorageKey from 'api/browser/localstorage/get';
@@ -12,7 +7,6 @@ import getLocalStorageKey from 'api/browser/localstorage/get';
const InitialValue: InitialValueTypes = {
isDarkMode: getTheme() === 'darkMode' ? true : false,
isLoggedIn: getLocalStorageKey(IS_LOGGED_IN) === 'yes',
- settingsActiveTab: 'General',
};
const appReducer = (
@@ -34,13 +28,6 @@ const appReducer = (
};
}
- case TOGGLE_SETTINGS_TABS: {
- return {
- ...state,
- settingsActiveTab: action.payload.activeTab,
- };
- }
-
default:
return state;
}
diff --git a/frontend/src/types/actions/app.ts b/frontend/src/types/actions/app.ts
index 968ee5f89f..4a8495aafe 100644
--- a/frontend/src/types/actions/app.ts
+++ b/frontend/src/types/actions/app.ts
@@ -1,8 +1,5 @@
-import { SettingTab } from 'types/reducer/app';
-
export const SWITCH_DARK_MODE = 'SWITCH_DARK_MODE';
export const LOGGED_IN = 'LOGGED_IN';
-export const TOGGLE_SETTINGS_TABS = 'TOGGLE_SETTINGS_TABS';
export interface SwitchDarkMode {
type: typeof SWITCH_DARK_MODE;
@@ -12,11 +9,4 @@ export interface LoggedInUser {
type: typeof LOGGED_IN;
}
-export interface ToggleSettingsTab {
- type: typeof TOGGLE_SETTINGS_TABS;
- payload: {
- activeTab: SettingTab;
- };
-}
-
-export type AppAction = SwitchDarkMode | LoggedInUser | ToggleSettingsTab;
+export type AppAction = SwitchDarkMode | LoggedInUser;
diff --git a/frontend/src/types/reducer/app.ts b/frontend/src/types/reducer/app.ts
index d0e82f0153..2ec974c399 100644
--- a/frontend/src/types/reducer/app.ts
+++ b/frontend/src/types/reducer/app.ts
@@ -1,6 +1,4 @@
-export type SettingTab = 'General' | 'Alert Channels';
export default interface AppReducer {
isDarkMode: boolean;
isLoggedIn: boolean;
- settingsActiveTab: SettingTab;
}
diff --git a/frontend/webpack.config.prod.js b/frontend/webpack.config.prod.js
index c90c4616d8..291fa84e15 100644
--- a/frontend/webpack.config.prod.js
+++ b/frontend/webpack.config.prod.js
@@ -144,8 +144,4 @@ const config = {
},
};
-if (process.env.BUNDLE_ANALYSER === 'true') {
- config.plugins.push(new BundleAnalyzerPlugin({ analyzerMode: 'server' }));
-}
-
module.exports = config;
diff --git a/pkg/query-service/README.md b/pkg/query-service/README.md
index c4c96a9757..72b69afc9a 100644
--- a/pkg/query-service/README.md
+++ b/pkg/query-service/README.md
@@ -2,27 +2,30 @@
Query service is the interface between forntend and databases. It is written in **Golang**. It will have modules for all supported databases. Query service is responsible to:
- parse the request from Frontend
-- create relevant Druid queries (and all other supported database queries)
+- create relevant Clickhouse queries (and all other supported database queries)
- parse response from databases and handle error if any
-- build response in the format accepted by Frontend
+- clickhouse response in the format accepted by Frontend
-#### Druid Queries
-Internally we use both native and sql queries to Druid.
-
#### Configuration
-Query Service needs below `env` variables to run:
+- Open ./constants/constants.go
+ - Replace ```const RELATIONAL_DATASOURCE_PATH = "/var/lib/signoz/signoz.db"``` \
+ with ```const RELATIONAL_DATASOURCE_PATH = "./signoz.db".```
+
+- Query Service needs below `env` variables to run:
+
```
- DruidClientUrl: http://signoz-druid-router:8888
- DruidDatasource: flattened_spans
+ ClickHouseUrl=tcp://localhost:9001
+ STORAGE=clickhouse
```
-The above values are the default ones used by SigNoz and are kept at `deploy/kubernetes/platform/signoz-charts/query-service/values.yaml`
+
+
#### Build and Run locally
```console
cd pkg/query-service
go build -o build/query-service main.go
-DruidClientUrl=xxxx DruidDatasource=flattened_spans build/query-service
+ClickHouseUrl=tcp://localhost:9001 STORAGE=clickhouse build/query-service
```
#### Docker Images
diff --git a/pkg/query-service/app/clickhouseReader/reader.go b/pkg/query-service/app/clickhouseReader/reader.go
index 876c66fa18..d424762293 100644
--- a/pkg/query-service/app/clickhouseReader/reader.go
+++ b/pkg/query-service/app/clickhouseReader/reader.go
@@ -1537,7 +1537,7 @@ func (r *ClickHouseReader) GetSpanFilters(ctx context.Context, queryParams *mode
}
}
case "status":
- finalQuery := fmt.Sprintf("SELECT COUNT(*) as numErrors FROM %s WHERE timestamp >= ? AND timestamp <= ? AND ( ( has(tags, 'error:true') OR statusCode>=500 OR statusCode=2))", r.indexTable)
+ finalQuery := fmt.Sprintf("SELECT COUNT(*) as numErrors FROM %s WHERE timestamp >= ? AND timestamp <= ? AND hasError = 1", r.indexTable)
finalQuery += query
var dBResponse []model.DBResponseErrors
err := r.db.Select(&dBResponse, finalQuery, args...)
@@ -1582,16 +1582,16 @@ func getStatusFilters(query string, statusParams []string, excludeMap map[string
if _, ok := excludeMap["status"]; ok {
if len(statusParams) == 1 {
if statusParams[0] == "error" {
- query += " AND ((NOT ( has(tags, 'error:true')) AND statusCode<500 AND statusCode!=2))"
+ query += " AND hasError = 0"
} else if statusParams[0] == "ok" {
- query += " AND ( ( has(tags, 'error:true') OR statusCode>=500 OR statusCode=2))"
+ query += " AND hasError = 1"
}
}
} else if len(statusParams) == 1 {
if statusParams[0] == "error" {
- query += " AND ( ( has(tags, 'error:true') OR statusCode>=500 OR statusCode=2))"
+ query += " AND hasError = 1"
} else if statusParams[0] == "ok" {
- query += " AND ((NOT ( has(tags, 'error:true')) AND statusCode<500 AND statusCode!=2))"
+ query += " AND hasError = 0"
}
}
return query
@@ -1839,6 +1839,79 @@ func excludeTags(ctx context.Context, tags []model.TagFilters) []model.TagFilter
return newTags
}
+func (r *ClickHouseReader) GetTagValues(ctx context.Context, queryParams *model.TagFilterParams) (*[]model.TagValues, *model.ApiError) {
+
+ excludeMap := make(map[string]struct{})
+ for _, e := range queryParams.Exclude {
+ if e == constants.OperationRequest {
+ excludeMap[constants.OperationDB] = struct{}{}
+ continue
+ }
+ excludeMap[e] = struct{}{}
+ }
+
+ var query string
+ args := []interface{}{queryParams.TagKey, strconv.FormatInt(queryParams.Start.UnixNano(), 10), strconv.FormatInt(queryParams.End.UnixNano(), 10)}
+ if len(queryParams.ServiceName) > 0 {
+ args = buildFilterArrayQuery(ctx, excludeMap, queryParams.ServiceName, constants.ServiceName, &query, args)
+ }
+ if len(queryParams.HttpRoute) > 0 {
+ args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpRoute, constants.HttpRoute, &query, args)
+ }
+ if len(queryParams.HttpCode) > 0 {
+ args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpCode, constants.HttpCode, &query, args)
+ }
+ if len(queryParams.HttpHost) > 0 {
+ args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpHost, constants.HttpHost, &query, args)
+ }
+ if len(queryParams.HttpMethod) > 0 {
+ args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpMethod, constants.HttpMethod, &query, args)
+ }
+ if len(queryParams.HttpUrl) > 0 {
+ args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpUrl, constants.HttpUrl, &query, args)
+ }
+ if len(queryParams.Component) > 0 {
+ args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args)
+ }
+ if len(queryParams.Operation) > 0 {
+ args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
+ }
+ if len(queryParams.MinDuration) != 0 {
+ query = query + " AND durationNano >= ?"
+ args = append(args, queryParams.MinDuration)
+ }
+ if len(queryParams.MaxDuration) != 0 {
+ query = query + " AND durationNano <= ?"
+ args = append(args, queryParams.MaxDuration)
+ }
+
+ query = getStatusFilters(query, queryParams.Status, excludeMap)
+
+ tagValues := []model.TagValues{}
+
+ finalQuery := fmt.Sprintf(`SELECT tagMap[?] as tagValues FROM %s WHERE timestamp >= ? AND timestamp <= ?`, r.indexTable)
+ finalQuery += query
+ fmt.Println(finalQuery)
+ finalQuery += "GROUP BY tagMap[?]"
+ args = append(args, queryParams.TagKey)
+ err := r.db.Select(&tagValues, finalQuery, args...)
+
+ zap.S().Info(query)
+
+ if err != nil {
+ zap.S().Debug("Error in processing sql query: ", err)
+ return nil, &model.ApiError{model.ErrorExec, fmt.Errorf("Error in processing sql query")}
+ }
+
+ cleanedTagValues := []model.TagValues{}
+ for _, e := range tagValues {
+ if e.TagValues != "" {
+ cleanedTagValues = append(cleanedTagValues, e)
+ }
+ }
+ return &cleanedTagValues, nil
+}
+
func (r *ClickHouseReader) GetServiceDBOverview(ctx context.Context, queryParams *model.GetServiceOverviewParams) (*[]model.ServiceDBOverviewItem, error) {
var serviceDBOverviewItems []model.ServiceDBOverviewItem
@@ -2093,7 +2166,7 @@ func (r *ClickHouseReader) SearchTraces(ctx context.Context, traceId string) (*[
var searchScanReponses []model.SearchSpanReponseItem
- query := fmt.Sprintf("SELECT timestamp, spanID, traceID, serviceName, name, kind, durationNano, tagsKeys, tagsValues, references, events FROM %s WHERE traceID=?", r.indexTable)
+ query := fmt.Sprintf("SELECT timestamp, spanID, traceID, serviceName, name, kind, durationNano, tagsKeys, tagsValues, references, events, hasError FROM %s WHERE traceID=?", r.indexTable)
err := r.db.Select(&searchScanReponses, query, traceId)
@@ -2106,7 +2179,7 @@ func (r *ClickHouseReader) SearchTraces(ctx context.Context, traceId string) (*[
searchSpansResult := []model.SearchSpansResult{
model.SearchSpansResult{
- Columns: []string{"__time", "SpanId", "TraceId", "ServiceName", "Name", "Kind", "DurationNano", "TagsKeys", "TagsValues", "References", "Events"},
+ Columns: []string{"__time", "SpanId", "TraceId", "ServiceName", "Name", "Kind", "DurationNano", "TagsKeys", "TagsValues", "References", "Events", "HasError"},
Events: make([][]interface{}, len(searchScanReponses)),
},
}
diff --git a/pkg/query-service/app/druidReader/reader.go b/pkg/query-service/app/druidReader/reader.go
index bd44ad2670..de390d98e2 100644
--- a/pkg/query-service/app/druidReader/reader.go
+++ b/pkg/query-service/app/druidReader/reader.go
@@ -173,6 +173,10 @@ func (druid *DruidReader) GetTagFilters(_ context.Context, _ *model.TagFilterPar
return nil, &model.ApiError{model.ErrorNotImplemented, fmt.Errorf("druid does not support getting tagFilters")}
}
+func (druid *DruidReader) GetTagValues(_ context.Context, _ *model.TagFilterParams) (*[]model.TagValues, *model.ApiError) {
+ return nil, &model.ApiError{model.ErrorNotImplemented, fmt.Errorf("druid does not support getting tagValues")}
+}
+
func (druid *DruidReader) GetFilteredSpans(_ context.Context, _ *model.GetFilteredSpansParams) (*model.GetFilterSpansResponse, *model.ApiError) {
return nil, &model.ApiError{model.ErrorNotImplemented, fmt.Errorf("druid does not support getting FilteredSpans")}
}
diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go
index d76e8c6ca1..c46988760e 100644
--- a/pkg/query-service/app/http_handler.go
+++ b/pkg/query-service/app/http_handler.go
@@ -214,6 +214,7 @@ func (aH *APIHandler) RegisterRoutes(router *mux.Router) {
router.HandleFunc("/api/v1/getFilteredSpans", aH.getFilteredSpans).Methods(http.MethodPost)
router.HandleFunc("/api/v1/getFilteredSpans/aggregates", aH.getFilteredSpanAggregates).Methods(http.MethodPost)
+ router.HandleFunc("/api/v1/getTagValues", aH.getTagValues).Methods(http.MethodPost)
router.HandleFunc("/api/v1/errors", aH.getErrors).Methods(http.MethodGet)
router.HandleFunc("/api/v1/errorWithId", aH.getErrorForId).Methods(http.MethodGet)
router.HandleFunc("/api/v1/errorWithType", aH.getErrorForType).Methods(http.MethodGet)
@@ -682,8 +683,9 @@ func (aH *APIHandler) user(w http.ResponseWriter, r *http.Request) {
telemetry.GetInstance().IdentifyUser(user)
data := map[string]interface{}{
- "name": user.Name,
- "email": user.Email,
+ "name": user.Name,
+ "email": user.Email,
+ "organizationName": user.OrganizationName,
}
telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_EVENT_USER, data)
@@ -1040,6 +1042,22 @@ func (aH *APIHandler) getTagFilters(w http.ResponseWriter, r *http.Request) {
aH.writeJSON(w, r, result)
}
+func (aH *APIHandler) getTagValues(w http.ResponseWriter, r *http.Request) {
+
+ query, err := parseTagValueRequest(r)
+ if aH.handleError(w, err, http.StatusBadRequest) {
+ return
+ }
+
+ result, apiErr := (*aH.reader).GetTagValues(context.Background(), query)
+
+ if apiErr != nil && aH.handleError(w, apiErr.Err, http.StatusInternalServerError) {
+ return
+ }
+
+ aH.writeJSON(w, r, result)
+}
+
func (aH *APIHandler) setTTL(w http.ResponseWriter, r *http.Request) {
ttlParams, err := parseDuration(r)
if aH.handleError(w, err, http.StatusBadRequest) {
@@ -1091,6 +1109,12 @@ func (aH *APIHandler) setUserPreferences(w http.ResponseWriter, r *http.Request)
return
}
+ data := map[string]interface{}{
+ "hasOptedUpdates": userParams.HasOptedUpdates,
+ "isAnonymous": userParams.IsAnonymous,
+ }
+ telemetry.GetInstance().SendEvent(telemetry.TELEMETRY_EVENT_USER_PREFERENCES, data)
+
aH.writeJSON(w, r, map[string]string{"data": "user preferences set successfully"})
}
diff --git a/pkg/query-service/app/interface.go b/pkg/query-service/app/interface.go
index de5bdec35b..158a900215 100644
--- a/pkg/query-service/app/interface.go
+++ b/pkg/query-service/app/interface.go
@@ -39,6 +39,7 @@ type Reader interface {
GetTTL(ctx context.Context, ttlParams *model.GetTTLParams) (*model.GetTTLResponseItem, *model.ApiError)
GetSpanFilters(ctx context.Context, query *model.SpanFilterParams) (*model.SpanFiltersResponse, *model.ApiError)
GetTagFilters(ctx context.Context, query *model.TagFilterParams) (*[]model.TagFilters, *model.ApiError)
+ GetTagValues(ctx context.Context, query *model.TagFilterParams) (*[]model.TagValues, *model.ApiError)
GetFilteredSpans(ctx context.Context, query *model.GetFilteredSpansParams) (*model.GetFilterSpansResponse, *model.ApiError)
GetFilteredSpansAggregates(ctx context.Context, query *model.GetFilteredSpanAggregatesParams) (*model.GetFilteredSpansAggregatesResponse, *model.ApiError)
diff --git a/pkg/query-service/app/parser.go b/pkg/query-service/app/parser.go
index 89d1a6c07f..b329c85a34 100644
--- a/pkg/query-service/app/parser.go
+++ b/pkg/query-service/app/parser.go
@@ -650,6 +650,31 @@ func parseTagFilterRequest(r *http.Request) (*model.TagFilterParams, error) {
return postData, nil
}
+
+func parseTagValueRequest(r *http.Request) (*model.TagFilterParams, error) {
+ var postData *model.TagFilterParams
+ err := json.NewDecoder(r.Body).Decode(&postData)
+
+ if err != nil {
+ return nil, err
+ }
+ if postData.TagKey == "" {
+ return nil, fmt.Errorf("%s param missing in query", postData.TagKey)
+ }
+
+ postData.Start, err = parseTimeStr(postData.StartStr, "start")
+ if err != nil {
+ return nil, err
+ }
+ postData.End, err = parseTimeMinusBufferStr(postData.EndStr, "end")
+ if err != nil {
+ return nil, err
+ }
+
+ return postData, nil
+
+}
+
func parseErrorsRequest(r *http.Request) (*model.GetErrorsParams, error) {
startTime, err := parseTime("start", r)
diff --git a/pkg/query-service/model/queryParams.go b/pkg/query-service/model/queryParams.go
index 8ceaddd9a6..71782b3ec9 100644
--- a/pkg/query-service/model/queryParams.go
+++ b/pkg/query-service/model/queryParams.go
@@ -6,8 +6,9 @@ import (
)
type User struct {
- Name string `json:"name"`
- Email string `json:"email"`
+ Name string `json:"name"`
+ Email string `json:"email"`
+ OrganizationName string `json:"organizationName"`
}
type InstantQueryMetricsParams struct {
@@ -201,6 +202,7 @@ type TagFilterParams struct {
MaxDuration string `json:"maxDuration"`
StartStr string `json:"start"`
EndStr string `json:"end"`
+ TagKey string `json:"tagKey"`
Start *time.Time
End *time.Time
}
diff --git a/pkg/query-service/model/response.go b/pkg/query-service/model/response.go
index d3e15490f1..fb5c460747 100644
--- a/pkg/query-service/model/response.go
+++ b/pkg/query-service/model/response.go
@@ -179,6 +179,7 @@ type SearchSpanReponseItem struct {
TagsKeys []string `db:"tagsKeys"`
TagsValues []string `db:"tagsValues"`
Events []string `db:"events"`
+ HasError int32 `db:"hasError"`
}
type OtelSpanRef struct {
@@ -214,7 +215,7 @@ func (item *SearchSpanReponseItem) GetValues() []interface{} {
}
}
- returnArray := []interface{}{int64(timeObj.UnixNano() / 1000000), item.SpanID, item.TraceID, item.ServiceName, item.Name, strconv.Itoa(int(item.Kind)), strconv.FormatInt(item.DurationNano, 10), item.TagsKeys, item.TagsValues, referencesStringArray, errorEvent}
+ returnArray := []interface{}{int64(timeObj.UnixNano() / 1000000), item.SpanID, item.TraceID, item.ServiceName, item.Name, strconv.Itoa(int(item.Kind)), strconv.FormatInt(item.DurationNano, 10), item.TagsKeys, item.TagsValues, referencesStringArray, errorEvent, item.HasError}
return returnArray
}
@@ -267,6 +268,10 @@ type TagItem struct {
type TagFilters struct {
TagKeys string `json:"tagKeys" db:"tagKeys"`
}
+
+type TagValues struct {
+ TagValues string `json:"tagValues" db:"tagValues"`
+}
type ServiceMapDependencyResponseItem struct {
Parent string `json:"parent,omitempty" db:"parent,omitempty"`
Child string `json:"child,omitempty" db:"child,omitempty"`
diff --git a/pkg/query-service/telemetry/telemetry.go b/pkg/query-service/telemetry/telemetry.go
index 90632784e7..5de8392e0c 100644
--- a/pkg/query-service/telemetry/telemetry.go
+++ b/pkg/query-service/telemetry/telemetry.go
@@ -18,6 +18,7 @@ const (
TELEMETRY_EVENT_INPRODUCT_FEEDBACK = "InProduct Feeback Submitted"
TELEMETRY_EVENT_NUMBER_OF_SERVICES = "Number of Services"
TELEMETRY_EVENT_HEART_BEAT = "Heart Beat"
+ TELEMETRY_EVENT_USER_PREFERENCES = "User Preferences"
)
const api_key = "4Gmoa4ixJAUHx2BpJxsjwA1bEfnwEeRz"
@@ -61,6 +62,10 @@ func getOutboundIP() string {
ip := []byte("NA")
resp, err := http.Get("https://api.ipify.org?format=text")
+ if err != nil {
+ return string(ip)
+ }
+
defer resp.Body.Close()
if err == nil {
ipBody, err := ioutil.ReadAll(resp.Body)