common: log endpoint in freshness checker

style: run prettier
graphprotocol · Jan 11, 2024 · bb086fe · bb086fe
1 parent 1b78523
commit bb086fe
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/packages/indexer-common/src/epoch-subgraph.ts b/packages/indexer-common/src/epoch-subgraph.ts
@@ -8,12 +8,14 @@ export class EpochSubgraph {
   endpointClient: AxiosInstance
   freshnessChecker: SubgraphFreshnessChecker
   logger: Logger
+  endpoint: string
 
   constructor(
     endpoint: string,
     freshnessChecker: SubgraphFreshnessChecker,
     logger: Logger,
   ) {
+    this.endpoint = endpoint
     this.endpointClient = axios.create({
       baseURL: endpoint,
       headers: { 'content-type': 'application/json' },

diff --git a/packages/indexer-common/src/graph-node.ts b/packages/indexer-common/src/graph-node.ts
@@ -128,13 +128,17 @@ export class GraphNode {
   // AxiosClient factory scoped by subgraph IFPS hash
   getQueryClient(deploymentIpfsHash: string): AxiosInstance {
     return axios.create({
-      baseURL: new URL(deploymentIpfsHash, this.queryBaseURL).toString(),
+      baseURL: this.getQueryEndpoint(deploymentIpfsHash),
       headers: { 'content-type': 'application/json' },
       responseType: 'text', // Don't parse responses as JSON
       transformResponse: (data) => data, // Don't transform responses
     })
   }
 
+  getQueryEndpoint(deploymentIpfsHash: string): string {
+    return new URL(deploymentIpfsHash, this.queryBaseURL).toString()
+  }
+
   public async subgraphDeployments(): Promise<SubgraphDeploymentID[]> {
     return (await this.subgraphDeploymentsAssignments()).map((details) => details.id)
   }

diff --git a/packages/indexer-common/src/network-subgraph.ts b/packages/indexer-common/src/network-subgraph.ts
@@ -44,6 +44,7 @@ export class NetworkSubgraph {
   logger: Logger
   freshnessChecker: SubgraphFreshnessChecker | undefined
   endpointClient?: AxiosInstance
+  endpoint: string
 
   public readonly deployment?: {
     id: SubgraphDeploymentID
@@ -54,6 +55,10 @@ export class NetworkSubgraph {
   private constructor(options: NetworkSubgraphOptions) {
     this.logger = options.logger
     this.freshnessChecker = options.subgraphFreshnessChecker
+    this.endpoint =
+      options?.endpoint ||
+      options.deployment?.graphNode.getQueryEndpoint(options.deployment.id.ipfsHash) ||
+      ''
 
     if (options.endpoint) {
       this.endpointClient = axios.create({

diff --git a/packages/indexer-common/src/subgraphs.ts b/packages/indexer-common/src/subgraphs.ts
@@ -344,6 +344,7 @@ export interface SubgraphQueryInterface {
     query: DocumentNode,
     variables?: Record<string, any>,
   ): Promise<QueryResult<Data>>
+  endpoint: string
 }
 /* eslint-enable @typescript-eslint/no-explicit-any */
 
@@ -427,6 +428,7 @@ export class SubgraphFreshnessChecker {
       this.logger.error(errorMsg, {
         subgraph: this.subgraphName,
         query: print(updatedQuery),
+        endpoint: subgraph.endpoint,
       })
       throw new Error(errorMsg)
     }
@@ -455,6 +457,7 @@ export class SubgraphFreshnessChecker {
         subgraph: this.subgraphName,
         error: queryShapeError,
         subgraphQueryResult,
+        endpoint: subgraph.endpoint,
       })
       throw new Error(errorMsg)
     }
@@ -471,6 +474,7 @@ export class SubgraphFreshnessChecker {
       freshnessThreshold: this.threshold,
       subgraph: this.subgraphName,
       retriesLeft,
+      endpoint: subgraph.endpoint,
     }
     this.logger.trace('Performing subgraph freshness check', logInfo)