Misc updates

Author: cf-ml

apps/dex-analysis/src/api/dex.ts

@@ -14,7 +14,7 @@ export const fetchDexTestAnalyzation = async ({
 	timeEnd: string
 }) => {
 	return await fetchCloudflareApi({
-		endpoint: `/dex/test-results/by-quartile?from=${timeStart}&to=${timeEnd}&limit=5&testId=${dexTestId}`,
+		endpoint: `/dex/test-results/by-quartile?from=${timeStart}&to=${timeEnd}&limit=4&testId=${dexTestId}`,
 		accountId,
 		apiToken: accessToken,
 		options: {

apps/dex-analysis/src/index.ts

@@ -1,18 +1,24 @@
 import OAuthProvider from '@cloudflare/workers-oauth-provider'
-import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js'
 import { McpAgent } from 'agents/mcp'
 import { env } from 'cloudflare:workers'
 
 import {
 	createAuthHandlers,
 	handleTokenExchangeCallback,
 } from '@repo/mcp-common/src/cloudflare-oauth-handler'
+import { CloudflareMCPServer } from '@repo/mcp-common/src/server'
 import { registerAccountTools } from '@repo/mcp-common/src/tools/account'
 
+import { MetricsTracker } from '../../../packages/mcp-observability/src'
 import { registerDEXTools } from './tools/dex'
 
 import type { AccountSchema, UserSchema } from '@repo/mcp-common/src/cloudflare-oauth-handler'
 
+const metrics = new MetricsTracker(env.MCP_METRICS, {
+	name: env.MCP_SERVER_NAME,
+	version: env.MCP_SERVER_VERSION,
+})
+
 // Context from the auth process, encrypted & stored in the auth token
 // and provided to the DurableMCP as this.props
 export type Props = {
@@ -24,22 +30,41 @@ export type Props = {
 export type State = { activeAccountId: string | null }
 
 export class CloudflareDEXMCP extends McpAgent<Env, State, Props> {
-	server = new McpServer({
-		name: 'Remote MCP Server with Cloudflare DEX Analysis',
-		version: '1.0.0',
-	})
+	_server: CloudflareMCPServer | undefined
+	set server(server: CloudflareMCPServer) {
+		this._server = server
+	}
 
-	initialState: State = {
-		activeAccountId: null,
+	get server(): CloudflareMCPServer {
+		if (!this._server) {
+			throw new Error('Tried to access server before it was initialized')
+		}
+
+		return this._server
+	}
+
+	constructor(ctx: DurableObjectState, env: Env) {
+		super(ctx, env)
 	}
 
 	async init() {
-		registerAccountTools(this)
+		this.server = new CloudflareMCPServer({
+			userId: this.props.user.id,
+			wae: this.env.MCP_METRICS,
+			serverInfo: {
+				name: this.env.MCP_SERVER_NAME,
+				version: this.env.MCP_SERVER_VERSION,
+			},
+		})
 
-		// EXAMPLE TOOLS — register your own here
+		registerAccountTools(this)
 		registerDEXTools(this)
 	}
 
+	initialState: State = {
+		activeAccountId: null,
+	}
+
 	getActiveAccountId() {
 		// TODO: Figure out why this fail sometimes, and why we need to wrap this in a try catch
 		try {
@@ -74,7 +99,7 @@ export default new OAuthProvider({
 	// @ts-ignore
 	apiHandler: CloudflareDEXMCP.mount('/sse'),
 	// @ts-ignore
-	defaultHandler: createAuthHandlers({ scopes: DexScopes }),
+	defaultHandler: createAuthHandlers({ scopes: DexScopes, metrics }),
 	authorizeEndpoint: '/oauth/authorize',
 	tokenEndpoint: '/token',
 	tokenExchangeCallback: (options) =>

apps/dex-analysis/wrangler.jsonc

@@ -38,6 +38,12 @@
 	},
 	"workers_dev": false,
 	"preview_urls": false,
+	"analytics_engine_datasets": [
+		{
+			"binding": "MCP_METRICS",
+			"dataset": "mcp-metrics-dev"
+		}
+	],
 	"env": {
 		"staging": {
 			"name": "mcp-cloudflare-workers-dex-staging",
@@ -59,7 +65,13 @@
 			],
 			"vars": {
 				"ENVIRONMENT": "staging"
-			}
+			},
+			"analytics_engine_datasets": [
+				{
+					"binding": "MCP_METRICS",
+					"dataset": "mcp-metrics-staging"
+				}
+			],
 		},
 		"production": {
 			"name": "mcp-cloudflare-workers-dex-production",
@@ -81,7 +93,13 @@
 			],
 			"vars": {
 				"ENVIRONMENT": "production"
-			}
+			},
+			"analytics_engine_datasets": [
+				{
+					"binding": "MCP_METRICS",
+					"dataset": "mcp-metrics-production"
+				}
+			],
 		}
 	}
 }