fix typos

Author: n1ru4l

packages/migrations/src/clickhouse-actions/015-otel-trace.ts

@@ -164,7 +164,7 @@ export const action: Action = async exec => {
         , "SpanAttributes"['hive.client.name'] AS "client_name"
         , "SpanAttributes"['hive.client.version'] AS "client_version"
         , "SpanAttributes"['hive.graphql.operation.name'] AS "graphql_operation_name"
-        , toLowCardinality("SpanAttributes"['graphql.operation.type']) AS "graphql_operation_type"
+        , toLowCardinality("SpanAttributes"['hive.graphql.operation.type']) AS "graphql_operation_type"
         , "SpanAttributes"['hive.graphql.operation.document'] AS "graphql_operation_document"
         , "SpanAttributes"['hive.graphql.error.count'] AS "graphql_errors_count"
         , arrayMap(x -> toLowCardinality(x), splitByChar(',', "SpanAttributes"['hive.graphql.error.codes'])) AS "graphql_error_codes"

packages/services/api/src/modules/operations/resolvers/Target.ts

@@ -75,11 +75,11 @@ export const Target: Pick<
       schemaCoordinate: args.schemaCoordinate,
     };
   },
-  traces: async (_parent, { first, filter }, { injector }) => {
+  traces: async (target, { first, filter }, { injector }) => {
     const clickhouse = injector.get(ClickHouse);
     const limit = (first ?? 10) + 1;
 
-    const ANDs: SqlValue[] = [sql`target_id = ${'target-1'}`];
+    const ANDs: SqlValue[] = [sql`target_id = ${target.id}`];
 
     if (filter?.id?.length) {
       ANDs.push(sql`trace_id IN (${sql.array(filter.id, 'String')})`);
@@ -102,11 +102,11 @@ export const Target: Pick<
     }
 
     if (filter?.operationName?.length) {
-      ANDs.push(sql`operation_name IN (${sql.array(filter.operationName, 'String')})`);
+      ANDs.push(sql`graphql_operation_name IN (${sql.array(filter.operationName, 'String')})`);
     }
 
     if (filter?.operationType?.length) {
-      ANDs.push(sql`operation_type IN (${sql.array(filter.operationType, 'String')})`);
+      ANDs.push(sql`graphql_operation_type IN (${sql.array(filter.operationType, 'String')})`);
     }
 
     if (filter?.subgraphs?.length) {
@@ -156,8 +156,8 @@ export const Target: Pick<
           trace_id,
           span_id,
           timestamp,
-          operation_name,
-          operation_type,
+          graphql_operation_name as operation_name,
+          graphql_operation_type as operation_type,
           duration,
           subgraph_names,
           http_status_code,
@@ -177,6 +177,8 @@ export const Target: Pick<
     const traces = tracesQuery.data;
     let hasNext = false;
 
+    console.log('AYAYAYAY', traces.length);
+
     if (traces.length == limit) {
       hasNext = true;
       (traces as any).pop();
@@ -242,11 +244,11 @@ export const Target: Pick<
     }
 
     if (filter?.operationName?.length) {
-      ANDs.push(sql`operation_name IN (${sql.array(filter.operationName, 'String')})`);
+      ANDs.push(sql`graphql_operation_name IN (${sql.array(filter.operationName, 'String')})`);
     }
 
     if (filter?.operationType?.length) {
-      ANDs.push(sql`operation_type IN (${sql.array(filter.operationType, 'String')})`);
+      ANDs.push(sql`graphql_operation_type IN (${sql.array(filter.operationType, 'String')})`);
     }
 
     if (filter?.subgraphs?.length) {

packages/services/api/src/modules/operations/resolvers/TracesFilterOptions.ts

@@ -55,16 +55,16 @@ export const TracesFilterOptions: TracesFilterOptionsResolvers = {
   },
   operationName: async ({ loader }, { top }) => {
     return loader.load({
-      key: 'operation_name',
-      columnExpression: 'operation_name',
+      key: 'graphql_operation_name',
+      columnExpression: 'graphql_operation_name',
       limit: top ?? 5,
       arrayJoinColumn: null,
     });
   },
   operationType: async ({ loader }) => {
     return loader.load({
-      key: 'operation_type',
-      columnExpression: 'operation_type',
+      key: 'graphql_operation_type',
+      columnExpression: 'graphql_operation_type',
       limit: null,
       arrayJoinColumn: null,
     });