moar wip

Author: n1ru4l

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

@@ -4,7 +4,7 @@ export const action: Action = async exec => {
   // Base tables as created by otel-exporter clickhouse
   await exec(`
     CREATE TABLE IF NOT EXISTS "otel_traces" (
-      "Timestamp" DateTime64(9) CODEC(Delta(8), ZSTD(1))
+      "Timestamp" DateTime64(9, 'UTC') CODEC(Delta(8), ZSTD(1))
       , "TraceId" String CODEC(ZSTD(1))
       , "SpanId" String CODEC(ZSTD(1))
       , "ParentSpanId" String CODEC(ZSTD(1))
@@ -19,7 +19,7 @@ export const action: Action = async exec => {
       , "Duration" UInt64 CODEC(ZSTD(1))
       , "StatusCode" LowCardinality(String) CODEC(ZSTD(1))
       , "StatusMessage" String CODEC(ZSTD(1))
-      , "Events.Timestamp" Array(DateTime64(9)) CODEC(ZSTD(1))
+      , "Events.Timestamp" Array(DateTime64(9, 'UTC')) CODEC(ZSTD(1))
       , "Events.Name" Array(LowCardinality(String)) CODEC(ZSTD(1))
       , "Events.Attributes" Array(Map(LowCardinality(String), String)) CODEC(ZSTD(1))
       , "Links.TraceId" Array(String) CODEC(ZSTD(1))
@@ -172,7 +172,7 @@ export const action: Action = async exec => {
       FROM
         "otel_traces"
       WHERE
-        empty("ParentSpanId")
+        empty("ParentSpanId") AND NOT empty("SpanAttributes"['hive.graphql.operation.type'])
     )
   `);
 

packages/services/api/src/modules/operations/index.ts

@@ -2,6 +2,7 @@ import { createModule } from 'graphql-modules';
 import { ClickHouse } from './providers/clickhouse-client';
 import { OperationsManager } from './providers/operations-manager';
 import { OperationsReader } from './providers/operations-reader';
+import { Traces } from './providers/traces';
 import { resolvers } from './resolvers.generated';
 import typeDefs from './module.graphql';
 
@@ -10,5 +11,5 @@ export const operationsModule = createModule({
   dirname: __dirname,
   typeDefs,
   resolvers,
-  providers: [OperationsManager, OperationsReader, ClickHouse],
+  providers: [OperationsManager, OperationsReader, ClickHouse, Traces],
 });

packages/services/api/src/modules/operations/module.graphql.mappers.ts

@@ -1,6 +1,7 @@
 import type Dataloader from 'dataloader';
 import type { ClientStatsValues, OperationStatsValues, PageInfo } from '../../__generated__/types';
 import type { DateRange } from '../../shared/entities';
+import { Span, Trace } from './providers/traces';
 
 // import { SqlValue } from './providers/sql';
 
@@ -58,3 +59,6 @@ export type TracesFilterOptionsMapper = {
     string
   >;
 };
+
+export type TraceMapper = Trace;
+export type SpanMapper = Span;

packages/services/api/src/modules/operations/module.graphql.ts

@@ -272,7 +272,7 @@ export default gql`
   type Trace {
     id: ID!
     timestamp: DateTime!
-    operationName: String!
+    operationName: String
     operationType: GraphQLOperationType!
     duration: Int!
     subgraphs: [String!]!
@@ -284,6 +284,20 @@ export default gql`
     httpHost: String
     httpRoute: String
     httpUrl: String
+
+    spans: [Span!]!
+  }
+
+  type Span {
+    id: ID!
+    traceId: ID!
+    parentId: ID
+    name: String!
+    startTime: DateTime64!
+    duration: SafeInt!
+    endTime: DateTime64!
+    resourceAttributes: JSONObject!
+    spanAttributes: JSONObject!
   }
 
   input TracesFilterInput {
@@ -335,6 +349,7 @@ export default gql`
     operation(hash: ID! @tag(name: "public")): Operation @tag(name: "public")
     traces(first: Int, after: String, filter: TracesFilterInput): TraceConnection!
     tracesFilterOptions(filter: TracesFilterInput): TracesFilterOptions!
+    trace(traceId: ID!): Trace
   }
 
   extend type Project {

packages/services/api/src/modules/operations/providers/clickhouse-client.ts

@@ -120,6 +120,23 @@ export class ClickHouse {
           },
           retry: {
             calculateDelay: info => {
+              if (
+                info.error.response?.body &&
+                typeof info.error.response.body === 'object' &&
+                'exception' in info.error.response.body &&
+                typeof info.error.response.body.exception === 'string'
+              ) {
+                this.logger.error(info.error.response.body.exception);
+                // In case of development errors we don't need to retry
+                // https://github.com/ClickHouse/ClickHouse/blob/eb33caaa13355761e4ceaba4a41b8801161ce327/src/Common/ErrorCodes.cpp#L55
+                // //https://github.com/ClickHouse/ClickHouse/blob/eb33caaa13355761e4ceaba4a41b8801161ce327/src/Common/ErrorCodes.cpp#L68C7-L68C9
+                if (
+                  info.error.response.body.exception.startsWith('Code: 47') ||
+                  info.error.response.body.exception.startsWith('Code: 62')
+                ) {
+                  return 0;
+                }
+              }
               span.setAttribute('retry.count', info.attemptCount);
 
               if (info.attemptCount >= 6) {