Skip to content

Commit

Permalink
feat(frontend): change datastore to tracing backend (#3465)
Browse files Browse the repository at this point in the history
  • Loading branch information
jorgeepc authored Dec 20, 2023
1 parent 427e09d commit 79abaad
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ const DataStoreSelection = ({onChange = noop, value = SupportedDataStores.JAEGER
<Popover
content={
<div>
In localMode only the Agent data store can be used. <br /> If you want to connect to a different
data store <br /> please create a new environment
In localMode only the Agent Tracing Backend can be used. <br /> If you want to connect to a
different Tracing Backend <br /> please create a new environment
</div>
}
placement="right"
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/NoTracingPopover/NoTracingPopover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ const NoTracingPopover = () => {
<div>
<S.Title>Tracing is not configured.</S.Title>
<S.Text>
Tracetest needs configuration information about your backend trace data store so it can collect the trace
after a test run. Please configure your data store now.
Tracetest needs configuration information about your Tracing Backend so it can collect the trace after a
test run. Please configure your Tracing Backend now.
</S.Text>
</div>
<S.ButtonContainer>
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/RunEvents/RunEventDataStore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ const RunEventDataStore = ({event}: IPropsEvent) => (
{!!event.dataStoreConnection && (
<S.Content>
{event.dataStoreConnection?.allPassed ? (
<Typography.Title level={3}>Data store configuration is valid.</Typography.Title>
<Typography.Title level={3}>Tracing Backend configuration is valid.</Typography.Title>
) : (
<S.InvalidDataStoreContainer>
<Typography.Title level={3} style={{margin: 0}}>
Data store configuration is not valid.
Tracing Backend configuration is not valid.
</Typography.Title>
<Typography.Text>
You can go to the <Link to="/settings">settings page</Link> to fix it.
Expand Down
6 changes: 3 additions & 3 deletions web/src/components/Settings/DataStoreForm/DataStoreForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const DataStoreForm = ({
<S.TopContainer>
<S.Description>
Tracetest needs configuration information to be able to retrieve your trace from your distributed tracing
solution. Select your tracing data store and enter the configuration info.
solution. Select your Tracing Backend and enter the configuration info.
</S.Description>
{dataStoreType && <DataStoreComponentFactory dataStoreType={dataStoreType} />}
</S.TopContainer>
Expand All @@ -93,7 +93,7 @@ const DataStoreForm = ({
onClick={onDeleteConfig}
danger
>
{`Delete ${SupportedDataStoresToName[dataStoreConfig.defaultDataStore.type]} Data Store`}
{`Delete ${SupportedDataStoresToName[dataStoreConfig.defaultDataStore.type]} Tracing Backend`}
</AllowButton>
) : (
<div />
Expand All @@ -109,7 +109,7 @@ const DataStoreForm = ({
type="primary"
onClick={() => form.submit()}
>
Save and Set as DataStore
Save and Set as Tracing Backend
</AllowButton>
</S.SaveContainer>
</S.ButtonsContainer>
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/SetupAlert/SetupAlert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const SetupAlert = () => {
<S.Container
message={
<S.Message>
<S.TextBold>No trace data store configured.</S.TextBold>
<S.TextBold>No Tracing Backend configured.</S.TextBold>
<S.Text>Let us know the details of your existing tracing solution so we can gather the trace.</S.Text>
<Link to="/settings">
<S.WarningButton>Setup</S.WarningButton>
Expand Down
6 changes: 3 additions & 3 deletions web/src/pages/Home/ConfigCTA.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ const ConfigCTA = ({onSkip}: IProps) => {
<S.ConfigContainer align="middle">
<Col span={12} offset={6}>
<S.ConfigContent>
<S.ConfigIcon alt="tracing data stores" src={icon} />
<Typography.Title>Configure your trace data store</Typography.Title>
<S.ConfigIcon alt="Tracing Backend" src={icon} />
<Typography.Title>Configure your Tracing Backend</Typography.Title>
<Typography.Text>
Tracetest utilizes the trace collected by your existing OpenTelemetry compatible trace data store to apply
Tracetest utilizes the trace collected by your existing OpenTelemetry compatible Tracing Backend to apply
assertions against. Do you want to configure this now?
</Typography.Text>
<S.ConfigFooter>
Expand Down
2 changes: 1 addition & 1 deletion web/src/pages/Settings/Content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const Content = () => {
setQuery([['tab', newTab]]);
}}
>
<Tabs.TabPane key={TabsKeys.DataStore} tab="Configure Data Store">
<Tabs.TabPane key={TabsKeys.DataStore} tab="Tracing Backend">
<DataStore />
</Tabs.TabPane>
<Tabs.TabPane key={TabsKeys.Analytics} tab="Analytics">
Expand Down
6 changes: 3 additions & 3 deletions web/src/providers/DataStore/DataStore.provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ const DataStoreProvider = ({children}: IProps) => {
!!defaultDataStore.id && draft.dataStoreType !== defaultDataStore.type
? `Saving will delete your previous configuration of the ${
SupportedDataStoresToName[defaultDataStore.type || SupportedDataStores.JAEGER]
} data store`
} Tracing Backend.`
: '';

onOpen({
title: (
<>
<p>Are you sure you want to save this Data Store configuration?</p>
<p>Are you sure you want to save this Tracing Backend configuration?</p>
<p>{warningMessage}</p>
</>
),
Expand All @@ -81,7 +81,7 @@ const DataStoreProvider = ({children}: IProps) => {
const onDeleteConfig = useCallback(async () => {
onOpen({
title:
"Tracetest will remove the trace data store configuration information and enter the 'No-Tracing Mode'. You can still run tests against the responses until you configure a new trace data store.",
"Tracetest will remove the Tracing Backend configuration information and enter the 'No-Tracing Mode'. You can still run tests against the responses until you configure a new Tracing Backend.",
heading: 'Save Confirmation',
okText: 'Save',
onConfirm: async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const useDataStoreNotification = () => {
type: 'info',
title: <Typography.Title level={2}>No Automated Test</Typography.Title>,
description:
'Please note that configuring your OpenTelemetry Collector to send spans to Tracetest is just the first step. To enable successful testing, save this data store, and then try running a Tracetest test against your application under test. Note that there is no automated test since the OpenTelemetry Collector sends traces to Tracetest.',
'Please note that configuring your OpenTelemetry Collector to send spans to Tracetest is just the first step. To enable successful testing, save this Tracing Backend, and then try running a Tracetest test against your application under test. Note that there is no automated test since the OpenTelemetry Collector sends traces to Tracetest.',
});
}

Expand All @@ -38,7 +38,7 @@ const useDataStoreNotification = () => {
const showSuccessNotification = useCallback(() => {
return showNotification({
type: 'success',
title: 'Data Store saved',
title: 'Tracing Backend saved',
description: 'Your configuration was added',
});
}, [showNotification]);
Expand Down
4 changes: 3 additions & 1 deletion web/src/services/EventLog.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ const eventToString = ({title, description}: TestRunEvent): string => {
const dataStoreEventToString = (event: TestRunEvent): string => {
const {dataStoreConnection: {allPassed, ...dataStoreConnection} = ConnectionResult({})} = event;
const baseText = eventToString(event);
const configValidText = allPassed ? 'Data store configuration is valid.' : 'Data store configuration is not valid.';
const configValidText = allPassed
? 'Tracing Backend configuration is valid.'
: 'Tracing Backend configuration is not valid.';

const connectionStepsDetailsText = Object.entries(dataStoreConnection || {})
.map(([key, {message, error}]) => `${key.toUpperCase()} - ${message} ${error ? ` - ${error}` : ''}`, '')
Expand Down

0 comments on commit 79abaad

Please sign in to comment.