brings front end in line with slight data type changes

CtrlSpice · Feb 10, 2025 · 50d1994 · 50d1994
1 parent a2d05ea
commit 50d1994
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 38 deletions.
diff --git a/desktopexporter/internal/app/routes/main-view.tsx b/desktopexporter/internal/app/routes/main-view.tsx
@@ -67,7 +67,6 @@ export default function MainView() {
 }
 
 function initSidebarData(traceSummaries: TraceSummary[]): SidebarData {
-  console.log("traceSummaries: ", traceSummaries);
   return {
     summaries: traceSummaries.map((traceSummary) =>
       generateTraceSummaryWithUIData(traceSummary),
@@ -126,15 +125,15 @@ function generateTraceSummaryWithUIData(
 ): TraceSummaryWithUIData {
   if (traceSummary.hasRootSpan) {
     let duration = getDurationNs(
-      traceSummary.rootStartTime,
-      traceSummary.rootEndTime,
+      traceSummary.rootSpan.startTime,
+      traceSummary.rootSpan.endTime,
     );
 
     let durationString = getDurationString(duration);
     return {
       hasRootSpan: true,
-      rootServiceName: traceSummary.rootServiceName,
-      rootName: traceSummary.rootName,
+      rootServiceName: traceSummary.rootSpan.serviceName,
+      rootName: traceSummary.rootSpan.name,
       rootDurationString: durationString,
       spanCount: traceSummary.spanCount,
       traceID: traceSummary.traceID,

diff --git a/desktopexporter/internal/app/types/api-types.ts b/desktopexporter/internal/app/types/api-types.ts
@@ -1,11 +1,15 @@
+export type RootSpan = {
+  serviceName: string;
+  name: string;
+  startTime: string;
+  endTime: string;
+};
+
 export type TraceSummary = {
+  traceID: string;
   hasRootSpan: boolean;
-  rootServiceName: string;
-  rootName: string;
-  rootStartTime: string;
-  rootEndTime: string;
+  rootSpan: RootSpan;
   spanCount: number;
-  traceID: string;
 };
 
 export type TraceSummaries = {

diff --git a/desktopexporter/internal/server/static/main.js b/desktopexporter/internal/server/static/main.js
@@ -56452,14 +56452,14 @@ otel-cli exec --service my-service --name "curl google" curl https://google.com
   function generateTraceSummaryWithUIData(traceSummary) {
     if (traceSummary.hasRootSpan) {
       let duration = getDurationNs(
-        traceSummary.rootStartTime,
-        traceSummary.rootEndTime
+        traceSummary.rootSpan.startTime,
+        traceSummary.rootSpan.endTime
       );
       let durationString = getDurationString(duration);
       return {
         hasRootSpan: true,
-        rootServiceName: traceSummary.rootServiceName,
-        rootName: traceSummary.rootName,
+        rootServiceName: traceSummary.rootSpan.serviceName,
+        rootName: traceSummary.rootSpan.name,
         rootDurationString: durationString,
         spanCount: traceSummary.spanCount,
         traceID: traceSummary.traceID

diff --git a/desktopexporter/internal/store/queries.go b/desktopexporter/internal/store/queries.go
@@ -106,13 +106,6 @@ const (
         ORDER BY (SELECT MAX(startTime) FROM spans WHERE traceID = t.traceID) DESC
     `
 
-	SELECT_ORDERED_TRACES = `
-		SELECT traceID 
-		FROM spans
-		GROUP BY traceID
-		ORDER BY MAX(startTime) DESC
-	`
-
 	// DuckDB's Go bindings have limited support for complex types like UNIONs and STRUCTs
 	// So we need to cast the attributes to VARCHAR and then parse them back into the original type
 	SELECT_TRACE string = `
@@ -142,23 +135,6 @@ const (
 		FROM spans 
 		WHERE traceID = ?
 	`
-
-	SELECT_ROOT_SPAN string = `
-		SELECT 
-			CAST(UNNEST(resourceAttributes['service.name']) AS VARCHAR),
-			name,
-			startTime,
-			endTime
-		FROM spans
-		WHERE traceID = ?
-		AND parentSpanID = '' 
-	`
-	SELECT_SPAN_COUNT string = `
-		SELECT count(*) 
-		FROM spans
-		WHERE traceID = ?
-	`
-
 	TRUNCATE_SPANS string = `
 		TRUNCATE spans;
 	`