diff --git a/projects/observability/src/pages/api-trace-detail/api-trace-detail.service.test.ts b/projects/observability/src/pages/api-trace-detail/api-trace-detail.service.test.ts
index f46085af0..3548aac7b 100644
--- a/projects/observability/src/pages/api-trace-detail/api-trace-detail.service.test.ts
+++ b/projects/observability/src/pages/api-trace-detail/api-trace-detail.service.test.ts
@@ -50,7 +50,7 @@ describe('Api TraceDetailService', () => {
             name: attributeKey,
             displayName: 'Duration',
             units: 'ms',
-            type: AttributeMetadataType.Number,
+            type: AttributeMetadataType.Long,
             scope: scope,
             onlySupportsAggregation: false,
             onlySupportsGrouping: false,
diff --git a/projects/observability/src/pages/explorer/explorer-dashboard-builder.test.ts b/projects/observability/src/pages/explorer/explorer-dashboard-builder.test.ts
index 4caf64e4a..fce1fd466 100644
--- a/projects/observability/src/pages/explorer/explorer-dashboard-builder.test.ts
+++ b/projects/observability/src/pages/explorer/explorer-dashboard-builder.test.ts
@@ -77,7 +77,7 @@ describe('Explorer dashboard builder', () => {
           of({
             name: name,
             displayName: capitalize(name),
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           })
       } as MetadataService,
       MockService(FilterBuilderLookupService)
diff --git a/projects/observability/src/pages/explorer/explorer-dashboard-builder.ts b/projects/observability/src/pages/explorer/explorer-dashboard-builder.ts
index eb84fe496..a9796aa04 100644
--- a/projects/observability/src/pages/explorer/explorer-dashboard-builder.ts
+++ b/projects/observability/src/pages/explorer/explorer-dashboard-builder.ts
@@ -154,7 +154,8 @@ export class ExplorerDashboardBuilder {
 
   private getRendererForType(type: AttributeMetadataType): string {
     switch (type) {
-      case AttributeMetadataType.Number:
+      case AttributeMetadataType.Long:
+      case AttributeMetadataType.Double:
         return CoreTableCellRendererType.Number;
       case AttributeMetadataType.Timestamp:
         return CoreTableCellRendererType.Timestamp;
diff --git a/projects/observability/src/pages/explorer/explorer-service.test.ts b/projects/observability/src/pages/explorer/explorer-service.test.ts
index de4b41a23..9381ee6de 100644
--- a/projects/observability/src/pages/explorer/explorer-service.test.ts
+++ b/projects/observability/src/pages/explorer/explorer-service.test.ts
@@ -20,7 +20,7 @@ describe('Explorer service', () => {
             name: 'duration',
             displayName: 'Duration',
             units: 'ms',
-            type: AttributeMetadataType.Number,
+            type: AttributeMetadataType.Long,
             scope: scope,
             onlySupportsAggregation: false,
             onlySupportsGrouping: false,
diff --git a/projects/observability/src/pages/trace-detail/trace-detail.service.test.ts b/projects/observability/src/pages/trace-detail/trace-detail.service.test.ts
index 39723895b..d9273a691 100644
--- a/projects/observability/src/pages/trace-detail/trace-detail.service.test.ts
+++ b/projects/observability/src/pages/trace-detail/trace-detail.service.test.ts
@@ -64,7 +64,7 @@ describe('TraceDetailService', () => {
               name: attributeKey,
               displayName: 'Latency',
               units: 'ms',
-              type: AttributeMetadataType.Number,
+              type: AttributeMetadataType.Long,
               scope: scope,
               onlySupportsAggregation: false,
               onlySupportsGrouping: false,
diff --git a/projects/observability/src/shared/components/explore-query-editor/explore-query-editor.component.test.ts b/projects/observability/src/shared/components/explore-query-editor/explore-query-editor.component.test.ts
index 6608935a1..f24feee14 100644
--- a/projects/observability/src/shared/components/explore-query-editor/explore-query-editor.component.test.ts
+++ b/projects/observability/src/shared/components/explore-query-editor/explore-query-editor.component.test.ts
@@ -30,7 +30,7 @@ describe('Explore query editor', () => {
       scope: ObservabilityTraceType.Api,
       displayName: 'First',
       units: 'ms',
-      type: AttributeMetadataType.Number,
+      type: AttributeMetadataType.Long,
       onlySupportsAggregation: false,
       onlySupportsGrouping: false,
       allowedAggregations: [MetricAggregationType.Average, MetricAggregationType.Sum],
@@ -41,7 +41,7 @@ describe('Explore query editor', () => {
       scope: ObservabilityTraceType.Api,
       displayName: 'Second',
       units: 'ms',
-      type: AttributeMetadataType.Number,
+      type: AttributeMetadataType.Long,
       onlySupportsAggregation: false,
       onlySupportsGrouping: false,
       allowedAggregations: [MetricAggregationType.Average, MetricAggregationType.Sum],
diff --git a/projects/observability/src/shared/dashboard/data/graphql/api-calls-count/api-calls-count-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/api-calls-count/api-calls-count-data-source.model.test.ts
index 736242dc2..5d083b632 100644
--- a/projects/observability/src/shared/dashboard/data/graphql/api-calls-count/api-calls-count-data-source.model.test.ts
+++ b/projects/observability/src/shared/dashboard/data/graphql/api-calls-count/api-calls-count-data-source.model.test.ts
@@ -40,7 +40,7 @@ describe('API call count data source model', () => {
               {
                 [numCallsSpec.resultAlias()]: {
                   value: 100,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 }
               }
             ]
diff --git a/projects/observability/src/shared/dashboard/data/graphql/explore/explore-cartesian-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/explore/explore-cartesian-data-source.model.test.ts
index 55d4195be..828ce7395 100644
--- a/projects/observability/src/shared/dashboard/data/graphql/explore/explore-cartesian-data-source.model.test.ts
+++ b/projects/observability/src/shared/dashboard/data/graphql/explore/explore-cartesian-data-source.model.test.ts
@@ -48,7 +48,7 @@ describe('Explore cartesian data source model', () => {
               name: name,
               displayName: 'Duration',
               units: 'ms',
-              type: AttributeMetadataType.Number,
+              type: AttributeMetadataType.Long,
               scope: context,
               onlySupportsAggregation: false,
               onlySupportsGrouping: false,
@@ -99,14 +99,14 @@ describe('Explore cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 10,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 [GQL_EXPLORE_RESULT_INTERVAL_KEY]: startTime
               },
               {
                 'sum(foo)': {
                   value: 15,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 [GQL_EXPLORE_RESULT_INTERVAL_KEY]: secondIntervalTime
               }
@@ -168,7 +168,7 @@ describe('Explore cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 10,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 baz: {
                   value: 'first',
@@ -178,7 +178,7 @@ describe('Explore cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 15,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 baz: {
                   value: 'second',
@@ -232,7 +232,7 @@ describe('Explore cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 10,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 baz: {
                   value: 'first',
@@ -243,7 +243,7 @@ describe('Explore cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 15,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 baz: {
                   value: 'first',
@@ -254,7 +254,7 @@ describe('Explore cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 20,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 baz: {
                   value: 'second',
@@ -265,7 +265,7 @@ describe('Explore cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 25,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 baz: {
                   value: 'second',
diff --git a/projects/observability/src/shared/dashboard/data/graphql/explore/explore-result.test.ts b/projects/observability/src/shared/dashboard/data/graphql/explore/explore-result.test.ts
index c562600e9..955e954f3 100644
--- a/projects/observability/src/shared/dashboard/data/graphql/explore/explore-result.test.ts
+++ b/projects/observability/src/shared/dashboard/data/graphql/explore/explore-result.test.ts
@@ -10,21 +10,21 @@ describe('Explore result', () => {
         {
           'sum(foo)': {
             value: 10,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           [GQL_EXPLORE_RESULT_INTERVAL_KEY]: new Date(0)
         },
         {
           'sum(foo)': {
             value: 15,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           [GQL_EXPLORE_RESULT_INTERVAL_KEY]: new Date(1)
         },
         {
           'sum(foo)': {
             value: 20,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           [GQL_EXPLORE_RESULT_INTERVAL_KEY]: new Date(2)
         }
@@ -53,7 +53,7 @@ describe('Explore result', () => {
         {
           'sum(foo)': {
             value: 10,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           group: {
             value: 'first',
@@ -63,7 +63,7 @@ describe('Explore result', () => {
         {
           'sum(foo)': {
             value: 15,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           group: {
             value: 'second',
@@ -73,7 +73,7 @@ describe('Explore result', () => {
         {
           'sum(foo)': {
             value: 20,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           group: {
             value: 'third',
@@ -96,7 +96,7 @@ describe('Explore result', () => {
         {
           'sum(foo)': {
             value: 10,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           group: {
             value: 'first',
@@ -106,7 +106,7 @@ describe('Explore result', () => {
         {
           'sum(foo)': {
             value: 15,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           group: {
             value: '__Other',
@@ -128,7 +128,7 @@ describe('Explore result', () => {
         {
           'sum(foo)': {
             value: 10,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           group: {
             value: 'first',
@@ -139,7 +139,7 @@ describe('Explore result', () => {
         {
           'sum(foo)': {
             value: 15,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           group: {
             value: 'first',
@@ -150,7 +150,7 @@ describe('Explore result', () => {
         {
           'sum(foo)': {
             value: 20,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           group: {
             value: 'second',
@@ -161,7 +161,7 @@ describe('Explore result', () => {
         {
           'sum(foo)': {
             value: 25,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           group: {
             value: 'second',
diff --git a/projects/observability/src/shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model.test.ts
index 621fad703..11861d3b9 100644
--- a/projects/observability/src/shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model.test.ts
+++ b/projects/observability/src/shared/dashboard/data/graphql/explorer-visualization/explorer-visualization-cartesian-data-source.model.test.ts
@@ -46,7 +46,7 @@ describe('Explorer Visualization cartesian data source model', () => {
               name: name,
               displayName: 'Duration',
               units: 'ms',
-              type: AttributeMetadataType.Number,
+              type: AttributeMetadataType.Long,
               scope: context,
               onlySupportsAggregation: false,
               onlySupportsGrouping: false,
@@ -118,14 +118,14 @@ describe('Explorer Visualization cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 10,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 [GQL_EXPLORE_RESULT_INTERVAL_KEY]: startTime
               },
               {
                 'sum(foo)': {
                   value: 15,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 [GQL_EXPLORE_RESULT_INTERVAL_KEY]: secondIntervalTime
               }
@@ -188,7 +188,7 @@ describe('Explorer Visualization cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 10,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 baz: {
                   value: 'first',
@@ -198,7 +198,7 @@ describe('Explorer Visualization cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 15,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 baz: {
                   value: 'second',
@@ -254,7 +254,7 @@ describe('Explorer Visualization cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 10,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 baz: {
                   value: 'first',
@@ -265,7 +265,7 @@ describe('Explorer Visualization cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 15,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 baz: {
                   value: 'first',
@@ -276,7 +276,7 @@ describe('Explorer Visualization cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 20,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 baz: {
                   value: 'second',
@@ -287,7 +287,7 @@ describe('Explorer Visualization cartesian data source model', () => {
               {
                 'sum(foo)': {
                   value: 25,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 },
                 baz: {
                   value: 'second',
diff --git a/projects/observability/src/shared/dashboard/data/graphql/metric-aggregation/metric-aggregation-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/metric-aggregation/metric-aggregation-data-source.model.test.ts
index 46c38fb26..a02c40647 100644
--- a/projects/observability/src/shared/dashboard/data/graphql/metric-aggregation/metric-aggregation-data-source.model.test.ts
+++ b/projects/observability/src/shared/dashboard/data/graphql/metric-aggregation/metric-aggregation-data-source.model.test.ts
@@ -49,7 +49,7 @@ describe('Metric aggregation data source model', () => {
               {
                 [callCountSpec.resultAlias()]: {
                   value: 10,
-                  type: AttributeMetadataType.Number
+                  type: AttributeMetadataType.Long
                 }
               }
             ]
diff --git a/projects/observability/src/shared/dashboard/data/graphql/trace/donut/trace-donut-data-source.model.test.ts b/projects/observability/src/shared/dashboard/data/graphql/trace/donut/trace-donut-data-source.model.test.ts
index cc6c05381..b23dce246 100644
--- a/projects/observability/src/shared/dashboard/data/graphql/trace/donut/trace-donut-data-source.model.test.ts
+++ b/projects/observability/src/shared/dashboard/data/graphql/trace/donut/trace-donut-data-source.model.test.ts
@@ -96,7 +96,7 @@ describe('Donut data source model', () => {
             {
               'sum(foo)': {
                 value: 10,
-                type: AttributeMetadataType.Number
+                type: AttributeMetadataType.Long
               },
               bar: {
                 value: 'first',
@@ -106,7 +106,7 @@ describe('Donut data source model', () => {
             {
               'sum(foo)': {
                 value: 15,
-                type: AttributeMetadataType.Number
+                type: AttributeMetadataType.Long
               },
               bar: {
                 value: 'second',
diff --git a/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts b/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts
index 4d3f25730..73694a663 100644
--- a/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts
+++ b/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts
@@ -66,7 +66,8 @@ export class TableWidgetColumnsService {
 
   private lookupDisplayType(type: AttributeMetadataType): string {
     switch (type) {
-      case AttributeMetadataType.Number:
+      case AttributeMetadataType.Long:
+      case AttributeMetadataType.Double:
         return CoreTableCellRendererType.Number;
       case AttributeMetadataType.Timestamp:
         return CoreTableCellRendererType.Timestamp;
@@ -77,7 +78,8 @@ export class TableWidgetColumnsService {
 
   private lookupAlignment(type: AttributeMetadataType): TableCellAlignmentType {
     switch (type) {
-      case AttributeMetadataType.Number:
+      case AttributeMetadataType.Long:
+      case AttributeMetadataType.Double:
       case AttributeMetadataType.Timestamp:
         return TableCellAlignmentType.Right;
       default:
diff --git a/projects/observability/src/shared/graphql/model/metadata/attribute-metadata.ts b/projects/observability/src/shared/graphql/model/metadata/attribute-metadata.ts
index b1717a42b..401b900fa 100644
--- a/projects/observability/src/shared/graphql/model/metadata/attribute-metadata.ts
+++ b/projects/observability/src/shared/graphql/model/metadata/attribute-metadata.ts
@@ -17,7 +17,8 @@ export const enum AttributeMetadataType {
   // Duplicated for FilterAttributeType in filter-attribute-type.ts
   Boolean = 'BOOLEAN',
   String = 'STRING',
-  Number = 'LONG',
+  Long = 'LONG',
+  Double = 'DOUBLE',
   StringArray = 'STRING_ARRAY',
   StringMap = 'STRING_MAP',
   Timestamp = 'TIMESTAMP'
@@ -27,7 +28,8 @@ export const toFilterAttributeType = (type: AttributeMetadataType): FilterAttrib
   switch (type) {
     case AttributeMetadataType.Boolean:
       return FilterAttributeType.Boolean;
-    case AttributeMetadataType.Number:
+    case AttributeMetadataType.Long:
+    case AttributeMetadataType.Double:
       return FilterAttributeType.Number;
     case AttributeMetadataType.String:
       return FilterAttributeType.String;
diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.test.ts
index b6b5d8433..936e1121e 100644
--- a/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.test.ts
+++ b/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.test.ts
@@ -30,7 +30,7 @@ describe('Interactions graphql query handler', () => {
             name: attributeKey,
             displayName: 'Duration',
             units: 'ms',
-            type: AttributeMetadataType.Number,
+            type: AttributeMetadataType.Long,
             scope: scope,
             onlySupportsAggregation: false,
             onlySupportsGrouping: false,
diff --git a/projects/observability/src/shared/graphql/request/handlers/explore/explore-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/explore/explore-graphql-query-handler.service.test.ts
index 4a240fc89..5c036ab28 100644
--- a/projects/observability/src/shared/graphql/request/handlers/explore/explore-graphql-query-handler.service.test.ts
+++ b/projects/observability/src/shared/graphql/request/handlers/explore/explore-graphql-query-handler.service.test.ts
@@ -27,7 +27,7 @@ describe('Explore graphql query handler', () => {
               name: 'duration',
               displayName: 'Duration',
               units: 'ms',
-              type: AttributeMetadataType.Number,
+              type: AttributeMetadataType.Long,
               scope: 'API_TRACE',
               onlySupportsAggregation: false,
               onlySupportsGrouping: false,
@@ -277,11 +277,11 @@ describe('Explore graphql query handler', () => {
           },
           avg_duration: {
             value: 15,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           avgrate_min_duration: {
             value: 55,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           }
         },
         {
@@ -292,11 +292,11 @@ describe('Explore graphql query handler', () => {
           },
           avg_duration: {
             value: 20,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           avgrate_min_duration: {
             value: 65,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           }
         },
         {
@@ -307,11 +307,11 @@ describe('Explore graphql query handler', () => {
           },
           avg_duration: {
             value: 25,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           avgrate_min_duration: {
             value: 70,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           }
         },
         {
@@ -322,11 +322,11 @@ describe('Explore graphql query handler', () => {
           },
           avg_duration: {
             value: 30,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           avgrate_min_duration: {
             value: 75,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           }
         },
         {
@@ -337,11 +337,11 @@ describe('Explore graphql query handler', () => {
           },
           avg_duration: {
             value: 35,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           avgrate_min_duration: {
             value: 80,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           }
         },
         {
@@ -352,11 +352,11 @@ describe('Explore graphql query handler', () => {
           },
           avg_duration: {
             value: 40,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           avgrate_min_duration: {
             value: 85,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           }
         }
       ],
@@ -373,11 +373,11 @@ describe('Explore graphql query handler', () => {
           },
           'avg(duration)': {
             value: 15,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           'avgrate_min(duration)': {
             value: 55,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           }
         },
         {
@@ -388,11 +388,11 @@ describe('Explore graphql query handler', () => {
           },
           'avg(duration)': {
             value: 20,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           'avgrate_min(duration)': {
             value: 65,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           }
         },
         {
@@ -403,11 +403,11 @@ describe('Explore graphql query handler', () => {
           },
           'avg(duration)': {
             value: 25,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           'avgrate_min(duration)': {
             value: 70,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           }
         },
         {
@@ -418,11 +418,11 @@ describe('Explore graphql query handler', () => {
           },
           'avg(duration)': {
             value: 30,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           'avgrate_min(duration)': {
             value: 75,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           }
         },
         {
@@ -433,11 +433,11 @@ describe('Explore graphql query handler', () => {
           },
           'avg(duration)': {
             value: 35,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           'avgrate_min(duration)': {
             value: 80,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           }
         },
         {
@@ -448,11 +448,11 @@ describe('Explore graphql query handler', () => {
           },
           'avg(duration)': {
             value: 40,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           },
           'avgrate_min(duration)': {
             value: 85,
-            type: AttributeMetadataType.Number
+            type: AttributeMetadataType.Long
           }
         }
       ],
diff --git a/projects/observability/src/shared/graphql/request/handlers/spans/span-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/spans/span-graphql-query-handler.service.test.ts
index 60049401d..d50d65e2b 100644
--- a/projects/observability/src/shared/graphql/request/handlers/spans/span-graphql-query-handler.service.test.ts
+++ b/projects/observability/src/shared/graphql/request/handlers/spans/span-graphql-query-handler.service.test.ts
@@ -29,7 +29,7 @@ describe('SpanGraphQlQueryHandlerService', () => {
                 name: attributeKey,
                 displayName: 'Duration',
                 units: 'ms',
-                type: AttributeMetadataType.Number,
+                type: AttributeMetadataType.Long,
                 scope: scope,
                 onlySupportsAggregation: false,
                 onlySupportsGrouping: false,
@@ -40,7 +40,7 @@ describe('SpanGraphQlQueryHandlerService', () => {
                 name: attributeKey,
                 displayName: 'API Name',
                 units: '',
-                type: AttributeMetadataType.Number,
+                type: AttributeMetadataType.Long,
                 scope: scope,
                 onlySupportsAggregation: false,
                 onlySupportsGrouping: false,
diff --git a/projects/observability/src/shared/graphql/request/handlers/spans/spans-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/spans/spans-graphql-query-handler.service.test.ts
index dbb0a0cb1..17a5a9e40 100644
--- a/projects/observability/src/shared/graphql/request/handlers/spans/spans-graphql-query-handler.service.test.ts
+++ b/projects/observability/src/shared/graphql/request/handlers/spans/spans-graphql-query-handler.service.test.ts
@@ -27,7 +27,7 @@ describe('SpansGraphQlQueryHandlerService', () => {
                 name: attributeKey,
                 displayName: 'Duration',
                 units: 'ms',
-                type: AttributeMetadataType.Number,
+                type: AttributeMetadataType.Long,
                 scope: scope,
                 onlySupportsAggregation: false,
                 onlySupportsGrouping: false,
@@ -38,7 +38,7 @@ describe('SpansGraphQlQueryHandlerService', () => {
                 name: attributeKey,
                 displayName: 'API Name',
                 units: '',
-                type: AttributeMetadataType.Number,
+                type: AttributeMetadataType.Long,
                 scope: scope,
                 onlySupportsAggregation: false,
                 onlySupportsGrouping: false,
diff --git a/projects/observability/src/shared/services/metadata/handler/metadata-graphql-query-handler.service.test.ts b/projects/observability/src/shared/services/metadata/handler/metadata-graphql-query-handler.service.test.ts
index a1be269ce..331b9458e 100644
--- a/projects/observability/src/shared/services/metadata/handler/metadata-graphql-query-handler.service.test.ts
+++ b/projects/observability/src/shared/services/metadata/handler/metadata-graphql-query-handler.service.test.ts
@@ -68,7 +68,7 @@ describe('Metadata graphql query handler service', () => {
         scope: SPAN_SCOPE,
         displayName: 'First',
         units: 'ms',
-        type: AttributeMetadataType.Number,
+        type: AttributeMetadataType.Long,
         onlySupportsAggregation: false,
         onlySupportsGrouping: false,
         supportedAggregations: [
@@ -112,7 +112,7 @@ describe('Metadata graphql query handler service', () => {
         scope: SPAN_SCOPE,
         displayName: 'First',
         units: 'ms',
-        type: AttributeMetadataType.Number,
+        type: AttributeMetadataType.Long,
         onlySupportsAggregation: false,
         onlySupportsGrouping: false,
         allowedAggregations: [
diff --git a/projects/observability/src/shared/services/metadata/metadata.service.test.ts b/projects/observability/src/shared/services/metadata/metadata.service.test.ts
index 5c8ed0cec..fb2c77ad4 100644
--- a/projects/observability/src/shared/services/metadata/metadata.service.test.ts
+++ b/projects/observability/src/shared/services/metadata/metadata.service.test.ts
@@ -27,7 +27,7 @@ describe('Metadata Service', () => {
       name: 'attr2',
       displayName: 'Attribute 2',
       units: 'ms',
-      type: AttributeMetadataType.Number,
+      type: AttributeMetadataType.Long,
       scope: SPAN_SCOPE,
       allowedAggregations: [MetricAggregationType.Average, MetricAggregationType.Sum],
       onlySupportsAggregation: false,
@@ -38,7 +38,7 @@ describe('Metadata Service', () => {
       name: 'attr3',
       displayName: 'Attribute 3',
       units: '',
-      type: AttributeMetadataType.Number,
+      type: AttributeMetadataType.Long,
       scope: SPAN_SCOPE,
       allowedAggregations: [],
       onlySupportsAggregation: false,
@@ -66,7 +66,7 @@ describe('Metadata Service', () => {
       }),
       mockProvider(FilterBuilderLookupService, {
         isBuildableType: (type: AttributeMetadataType) =>
-          type === AttributeMetadataType.String || type === AttributeMetadataType.Number
+          type === AttributeMetadataType.String || type === AttributeMetadataType.Long
       })
     ]
   });
diff --git a/src/app/home/data/label/total-errors-label-data-source.model.test.ts b/src/app/home/data/label/total-errors-label-data-source.model.test.ts
index fdf88521c..a3b86f8f4 100644
--- a/src/app/home/data/label/total-errors-label-data-source.model.test.ts
+++ b/src/app/home/data/label/total-errors-label-data-source.model.test.ts
@@ -64,7 +64,7 @@ describe('Total Errors label data source model', () => {
         results: [
           {
             'sum(errorCount)': {
-              type: AttributeMetadataType.Number,
+              type: AttributeMetadataType.Long,
               value: 23
             }
           }
diff --git a/src/app/home/data/system/observe-system-radar-data-source.model.test.ts b/src/app/home/data/system/observe-system-radar-data-source.model.test.ts
index 96ad32260..c1e8eefaf 100644
--- a/src/app/home/data/system/observe-system-radar-data-source.model.test.ts
+++ b/src/app/home/data/system/observe-system-radar-data-source.model.test.ts
@@ -62,19 +62,19 @@ describe('Observe System radar data source model', () => {
         results: [
           {
             'p99(duration)': {
-              type: AttributeMetadataType.Number,
+              type: AttributeMetadataType.Long,
               value: 23
             },
             'avgrate_sec(calls)': {
-              type: AttributeMetadataType.Number,
+              type: AttributeMetadataType.Long,
               value: 33
             },
             'avg(duration)': {
-              type: AttributeMetadataType.Number,
+              type: AttributeMetadataType.Long,
               value: 43
             },
             'avgrate_sec(errorCount)': {
-              type: AttributeMetadataType.Number,
+              type: AttributeMetadataType.Long,
               value: 53
             }
           }