Merge branch '3.0' into backport/backport-2412-to-3.0

Author: RyanL1997

opensearch_dashboards.json

@@ -1,6 +1,6 @@
 {
   "id": "observabilityDashboards",
-  "version": "3.0.0.0-beta1",
+  "version": "3.0.0.0",
   "opensearchDashboardsVersion": "3.0.0",
   "server": true,
   "ui": true,
@@ -26,7 +26,12 @@
     "dataSource",
     "dataSourceManagement"
   ],
-  "configPath": ["observability"],
+  "configPath": [
+    "observability"
+  ],
   "supportedOSDataSourceVersions": ">=2.9.0",
-  "requiredOSDataSourcePlugins": ["opensearch-sql", "opensearch-observability"]
-}
+  "requiredOSDataSourcePlugins": [
+    "opensearch-sql",
+    "opensearch-observability"
+  ]
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "observability-dashboards",
-  "version": "3.0.0.0-beta1",
+  "version": "3.0.0.0",
   "main": "index.ts",
   "license": "Apache-2.0",
   "scripts": {
@@ -84,4 +84,4 @@
     "node_modules/*",
     "target/*"
   ]
-}
+}

public/components/trace_analytics/components/common/__tests__/helper_functions.test.tsx

@@ -171,13 +171,15 @@ describe('Trace analytics helper functions', () => {
   });
 
   describe('getAttributeFieldNames', () => {
-    it("should return only field names starting with 'resource.attributes' or 'span.attributes'", () => {
+    it("should return only field names starting with 'resource.attributes' or 'span.attributes' or 'attributes'", () => {
       const expectedFields = [
         'span.attributes.http@url',
         'span.attributes.net@peer@ip',
         'span.attributes.http@user_agent.keyword',
         'resource.attributes.telemetry@[email protected]',
         '[email protected]',
+        'attributes.url',
+        'attributes.custom_field.keyword',
       ];
       const result = getAttributeFieldNames(fieldCapQueryResponse1);
       expect(result).toEqual(expectedFields);

public/components/trace_analytics/components/common/helper_functions.tsx

@@ -581,7 +581,10 @@ export const filtersToDsl = (
 
 export const getAttributeFieldNames = (response: FieldCapResponse): string[] => {
   return Object.keys(response.fields).filter(
-    (field) => field.startsWith('resource.attributes') || field.startsWith('span.attributes')
+    (field) =>
+      field.startsWith('resource.attributes') ||
+      field.startsWith('span.attributes') ||
+      field.startsWith('attributes')
   );
 };
 

public/components/trace_analytics/components/traces/trace_table_helpers.tsx

@@ -34,7 +34,7 @@ export const fetchDynamicColumns = (columnItems: string[]) => {
         </EuiText>
       ),
       align: 'right',
-      sortable: true,
+      sortable: false,
       truncateText: true,
       render: (item) =>
         item ? (

public/components/trace_analytics/components/traces/traces_custom_indices_table.tsx

@@ -50,6 +50,26 @@ export function TracesCustomIndicesTable(props: TracesLandingTableProps) {
     onSort,
   } = props;
 
+  const resolveFieldValue = (item: any, field: string) => {
+    if (!item) return '-';
+
+    const matchPrefix = (prefix: string, container?: any) => {
+      if (field.startsWith(prefix) && container) {
+        const attr = field.slice(prefix.length);
+        return container[attr] ?? '-';
+      }
+      return null;
+    };
+
+    return (
+      matchPrefix('resource.attributes.', item.resource?.attributes) ??
+      matchPrefix('span.attributes.', item.attributes) ??
+      matchPrefix('attributes.', item.attributes) ??
+      item[field] ??
+      '-'
+    );
+  };
+
   const renderCellValue = useMemo(() => {
     return ({ rowIndex, columnId }: { rowIndex: number; columnId: string }) => {
       const isTracesMode = props.tracesTableMode === 'traces';
@@ -58,7 +78,7 @@ export function TracesCustomIndicesTable(props: TracesLandingTableProps) {
         : rowIndex - pagination.pageIndex * pagination.pageSize;
 
       if (!items.hasOwnProperty(adjustedRowIndex)) return '-';
-      const value = items[adjustedRowIndex]?.[columnId];
+      const value = resolveFieldValue(items[adjustedRowIndex], columnId);
 
       if (!value && columnId !== 'status.code' && columnId !== 'error_count') return '-';
 

test/constants.ts

@@ -763,6 +763,20 @@ export const fieldCapQueryResponse1 = {
         aggregatable: false,
       },
     },
+    'attributes.url': {
+      text: {
+        type: 'text',
+        searchable: true,
+        aggregatable: false,
+      },
+    },
+    'attributes.custom_field.keyword': {
+      keyword: {
+        type: 'keyword',
+        searchable: true,
+        aggregatable: true,
+      },
+    },
   },
 };