@merkl/api 0.20.78 → 0.20.80

package/dist/src/modules/v4/router.d.ts

@@ -18,7 +18,7 @@ export declare const v4: Elysia<"/v4", false, {
     macro: {};
     macroFn: {};
 }, {
-    v4: {} | {
+    v4: {
         derive: {};
         resolve: {};
         schema: {};
@@ -2757,28 +2757,6 @@ export declare const v4: Elysia<"/v4", false, {
                 };
             };
         };
-    } & {
-        rewards: {
-            total: {
-                distributed: {
-                    "by-opportunities": {
-                        get: {
-                            body: unknown;
-                            params: {};
-                            query: {
-                                since: Date;
-                            };
-                            headers: {
-                                authorization: string;
-                            };
-                            response: {
-                                200: string;
-                            };
-                        };
-                    };
-                };
-            };
-        };
     } & {
         rewards: {
             total: {
@@ -2964,6 +2942,7 @@ export declare const v4: Elysia<"/v4", false, {
                     };
                     response: {
                         200: {
+                            name: string;
                             Explorer: {
                                 id: string;
                                 type: import("@db/api").$Enums.ExplorerType;

package/dist/src/modules/v4/router.js

@@ -22,35 +22,39 @@ import { TokenController } from "@/modules/v4/token/token.controller";
 import { UniswapController } from "@/modules/v4/uniswap/uniswap.controller";
 import { UserController } from "@/modules/v4/user/user.controller";
 import { ErrorHandler } from "@/plugins/error-handling.plugin";
+import { TailSampler } from "@/utils/TailSampler";
 import bigintToString from "@/utils/bigintToString";
 import { opentelemetry } from "@elysiajs/opentelemetry";
 import { getNodeAutoInstrumentations } from "@opentelemetry/auto-instrumentations-node";
 import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http";
-import { BatchSpanProcessor } from "@opentelemetry/sdk-trace-node";
+import { PgInstrumentation } from "@opentelemetry/instrumentation-pg";
+import { RedisInstrumentation } from "@opentelemetry/instrumentation-redis";
+import { AlwaysOffSampler, BatchSpanProcessor } from "@opentelemetry/sdk-trace-node";
 import { PrismaInstrumentation } from "@prisma/instrumentation";
 import Elysia from "elysia";
 import { ReferralController } from "./referral/referral.controller";
 // ─── V4 Router ───────────────────────────────────────────────────────────────
 export const v4 = new Elysia({ tags: ["v4"], prefix: "/v4" })
     // ─── OpenTelemetry ───────────────────────────────────────────────────
-    .use(process.env.TRACE === "true"
-    ? opentelemetry({
-        spanProcessors: [
-            new BatchSpanProcessor(new OTLPTraceExporter({
-                url: process.env.OTEL_COLLECTOR,
-                headers: {
-                    "signoz-ingestion-key": String(process.env.SIGNOZ_INGESTION_KEY),
-                },
-            })),
-        ],
-        instrumentations: [new PrismaInstrumentation(), getNodeAutoInstrumentations()],
-    })
-    : new Elysia() // not optimal
-)
+    .use(opentelemetry({
+    sampler: process.env.TRACE === "true" ? new TailSampler(0.1) : new AlwaysOffSampler(),
+    spanProcessors: [
+        new BatchSpanProcessor(new OTLPTraceExporter({
+            url: process.env.OTEL_COLLECTOR,
+            headers: {
+                "signoz-ingestion-key": String(process.env.SIGNOZ_INGESTION_KEY),
+            },
+        })),
+    ],
+    instrumentations: [
+        new PgInstrumentation(),
+        new RedisInstrumentation(),
+        new PrismaInstrumentation(),
+        getNodeAutoInstrumentations(),
+    ],
+}))
     // ─── Error Handling ──────────────────────────────────────────────────
     .use(ErrorHandler)
-    // ─── Logger ──────────────────────────────────────────────────────────
-    // .use(Logger)
     // ─── Response Transformation ─────────────────────────────────────────
     .onAfterHandle(({ response }) => bigintToString(response))
     // ─── Route Controllers ───────────────────────────────────────────────

package/dist/src/modules/v4/tvl/tvl.service.js

@@ -9,7 +9,18 @@ export class TvlService {
         const typesWithoutApr = [Campaign.INVALID, Campaign.JSON_AIRDROP, Campaign.ERC20_SNAPSHOT];
         if (typesWithoutApr.includes(type))
             return { timestamp, total: 0, breakdowns: [] };
-        const opportunitySummary = dynamicData.reduce((merged, c) => Object.assign(merged, c), {});
+        /**
+         *  Merge dynamic data and take the max tvl encountered
+         * @dev Useful if campaigns have different hooks or blacklists and so different target tvl
+         */
+        const opportunitySummary = dynamicData.reduce((merged, c) => {
+            const res = Object.assign(merged, c);
+            const campaignTvl = c?.tvl ?? 0;
+            if (campaignTvl > (merged?.tvl ?? 0)) {
+                res.tvl = campaignTvl;
+            }
+            return res;
+        }, {});
         let breakdowns = [];
         if (type === Campaign.CLAMM) {
             breakdowns = [

package/dist/src/utils/TailSampler.d.ts

@@ -0,0 +1,8 @@
+import type { Attributes, Context, Link, SpanKind } from "@opentelemetry/api";
+import { type Sampler, type SamplingResult } from "@opentelemetry/sdk-trace-node";
+export declare class TailSampler implements Sampler {
+    private baseSampler;
+    constructor(ratio: number);
+    shouldSample(context: Context, traceId: string, spanName: string, spanKind: SpanKind, attributes: Attributes, links: Link[]): SamplingResult;
+    toString(): string;
+}

package/dist/src/utils/TailSampler.js

@@ -0,0 +1,23 @@
+import { ParentBasedSampler, SamplingDecision, TraceIdRatioBasedSampler, } from "@opentelemetry/sdk-trace-node";
+export class TailSampler {
+    baseSampler;
+    constructor(ratio) {
+        this.baseSampler = new ParentBasedSampler({
+            root: new TraceIdRatioBasedSampler(ratio),
+        });
+    }
+    shouldSample(context, traceId, spanName, spanKind, attributes, links) {
+        const result = this.baseSampler.shouldSample(context, traceId, spanName, spanKind, attributes, links);
+        // Override sampling decision if error detected
+        if (attributes["error"] || Number(attributes["http.status_code"]) >= 500) {
+            return {
+                decision: SamplingDecision.RECORD_AND_SAMPLED,
+                attributes: { error_sampled: "true" },
+            };
+        }
+        return result;
+    }
+    toString() {
+        return "CustomTailSampler";
+    }
+}