feat: remove otel

Author: sunchanglong

.nvmrc

@@ -1 +1 @@
-20
+v20.18.1

src/components/configEditor/TracesConfig.tsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import { ConfigSection, ConfigSubSection } from 'components/experimental/ConfigSection';
 import { Input, Field } from '@grafana/ui';
-import { OtelVersionSelect } from 'components/queryBuilder/OtelVersionSelect';
+// import { OtelVersionSelect } from 'components/queryBuilder/OtelVersionSelect';
 import { ColumnHint, TimeUnit } from 'types/queryBuilder';
 import otel, { defaultTraceTable } from 'otel';
 import { LabeledInput } from './LabeledInput';
@@ -33,7 +33,7 @@ interface TraceConfigProps {
 export const TracesConfig = (props: TraceConfigProps) => {
   const {
     onDefaultDatabaseChange, onDefaultTableChange,
-    onOtelEnabledChange, onOtelVersionChange,
+    // onOtelEnabledChange, onOtelVersionChange,
     onTraceIdColumnChange, onSpanIdColumnChange, onOperationNameColumnChange, onParentSpanIdColumnChange,
     onServiceNameColumnChange, onDurationColumnChange, onDurationUnitChange, onStartTimeColumnChange,
     onTagsColumnChange, onServiceTagsColumnChange, onEventsColumnPrefixChange
@@ -99,13 +99,13 @@ export const TracesConfig = (props: TraceConfigProps) => {
         title={labels.columns.title}
         description={labels.columns.description}
       >
-        <OtelVersionSelect
+        {/* <OtelVersionSelect
           enabled={otelEnabled || false}
           selectedVersion={otelVersion || ''}
           onEnabledChange={onOtelEnabledChange}
           onVersionChange={onOtelVersionChange}
           wide
-        />
+        /> */}
         <LabeledInput
           disabled={otelEnabled}
           label={labels.columns.traceId.label}

src/components/queryBuilder/OtelVersionSelect.tsx

@@ -11,7 +11,7 @@ interface OtelVersionSelectProps {
   onVersionChange: (version: string) => void,
   wide?: boolean,
 }
-
+ 
 export const OtelVersionSelect = (props: OtelVersionSelectProps) => {
   const { enabled, onEnabledChange, selectedVersion, onVersionChange, wide } = props;
   const { label, tooltip } = selectors.components.OtelVersionSelect;

src/components/queryBuilder/views/LogsQueryBuilder.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { ColumnsEditor } from '../ColumnsEditor';
 import { Filter, OrderBy, QueryBuilderOptions, SelectedColumn, ColumnHint } from 'types/queryBuilder';
 import { ColumnSelect } from '../ColumnSelect';
-import { OtelVersionSelect } from '../OtelVersionSelect';
+// import { OtelVersionSelect } from '../OtelVersionSelect';
 import { OrderByEditor, getOrderByOptions } from '../OrderByEditor';
 import { LimitEditor } from '../LimitEditor';
 import { FiltersEditor } from '../FilterEditor';
@@ -13,7 +13,7 @@ import { Datasource } from 'data/CHDatasource';
 import { useBuilderOptionChanges } from 'hooks/useBuilderOptionChanges';
 import { Alert, Button, InlineFormLabel, Input, VerticalGroup } from '@grafana/ui';
 import useColumns from 'hooks/useColumns';
-import { BuilderOptionsReducerAction, setOptions, setOtelEnabled, setOtelVersion } from 'hooks/useBuilderOptionsState';
+import { BuilderOptionsReducerAction, setOptions, } from 'hooks/useBuilderOptionsState';
 import useIsNewQuery from 'hooks/useIsNewQuery';
 import { useDefaultFilters, useDefaultTimeColumn, useLogDefaultsOnMount, useOtelColumns } from './logsQueryBuilderHooks';
 import { styles } from 'styles';
@@ -112,12 +112,12 @@ export const LogsQueryBuilder = (props: LogsQueryBuilderProps) => {
   return (
     <div>
       { configWarning }
-      <OtelVersionSelect
+      {/* <OtelVersionSelect
         enabled={builderState.otelEnabled}
         onEnabledChange={e => builderOptionsDispatch(setOtelEnabled(e))}
         selectedVersion={builderState.otelVersion}
         onVersionChange={v => builderOptionsDispatch(setOtelVersion(v))}
-      />
+      /> */}
       <ColumnsEditor
         disabled={builderState.otelEnabled}
         allColumns={allColumns}

src/components/queryBuilder/views/TraceQueryBuilder.tsx

@@ -10,9 +10,9 @@ import { DurationUnitSelect } from 'components/queryBuilder/DurationUnitSelect';
 import { Datasource } from 'data/CHDatasource';
 import { useBuilderOptionChanges } from 'hooks/useBuilderOptionChanges';
 import useColumns from 'hooks/useColumns';
-import { BuilderOptionsReducerAction, setOptions, setOtelEnabled, setOtelVersion } from 'hooks/useBuilderOptionsState';
+import { BuilderOptionsReducerAction, setOptions } from 'hooks/useBuilderOptionsState';
 import useIsNewQuery from 'hooks/useIsNewQuery';
-import { OtelVersionSelect } from '../OtelVersionSelect';
+// import { OtelVersionSelect } from '../OtelVersionSelect';
 import { useDefaultFilters, useOtelColumns, useTraceDefaultsOnMount } from './traceQueryBuilderHooks';
 import TraceIdInput from '../TraceIdInput';
 import { OrderByEditor, getOrderByOptions } from '../OrderByEditor';
@@ -134,13 +134,13 @@ export const TraceQueryBuilder = (props: TraceQueryBuilderProps) => {
         onToggle={setColumnsOpen}
       >
         {configWarning}
-        <OtelVersionSelect
+        {/* <OtelVersionSelect
           enabled={builderState.otelEnabled}
           onEnabledChange={e => builderOptionsDispatch(setOtelEnabled(e))}
           selectedVersion={builderState.otelVersion}
           onVersionChange={v => builderOptionsDispatch(setOtelVersion(v))}
           wide
-        />
+        /> */}
         <div className="gf-form">
           <ColumnSelect
             disabled={builderState.otelEnabled}

src/data/CHDatasource.ts

@@ -444,7 +444,7 @@ export class Datasource
   }
 
   getDefaultDatabase(): string {
-    return this.settings.jsonData.defaultDatabase || 'default';
+    return this.settings.jsonData.defaultDatabase || 'public';
   }
 
   getDefaultTable(): string | undefined {