Enable tracing and fix local development (cloudflare#237)

Ankcorn · web-flow · commit 30b77e0e7ab2 · 2025-10-15T15:53:07.000+01:00
* enable tracing and fix local development

* pin tagged-logger version

* fix type issues

* fix type issues

* fix format issues

* remove missed email comment
diff --git a/apps/ai-gateway/.dev.vars.example b/apps/ai-gateway/.dev.vars.example
@@ -2,4 +2,4 @@ CLOUDFLARE_CLIENT_ID=
 CLOUDFLARE_CLIENT_SECRET=
 DEV_DISABLE_OAUTH=
 DEV_CLOUDFLARE_API_TOKEN=
-DEV_CLOUDFLARE_EMAIL=
+
diff --git a/apps/ai-gateway/wrangler.jsonc b/apps/ai-gateway/wrangler.jsonc
@@ -15,7 +15,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/apps/auditlogs/.dev.vars.example b/apps/auditlogs/.dev.vars.example
@@ -2,4 +2,3 @@ CLOUDFLARE_CLIENT_ID=
 CLOUDFLARE_CLIENT_SECRET=
 DEV_DISABLE_OAUTH=
 DEV_CLOUDFLARE_API_TOKEN=
-DEV_CLOUDFLARE_EMAIL=
diff --git a/apps/auditlogs/wrangler.jsonc b/apps/auditlogs/wrangler.jsonc
@@ -15,7 +15,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/apps/autorag/.dev.vars.example b/apps/autorag/.dev.vars.example
@@ -2,4 +2,4 @@ CLOUDFLARE_CLIENT_ID=
 CLOUDFLARE_CLIENT_SECRET=
 DEV_DISABLE_OAUTH=
 DEV_CLOUDFLARE_API_TOKEN=
-DEV_CLOUDFLARE_EMAIL=
+
diff --git a/apps/autorag/wrangler.jsonc b/apps/autorag/wrangler.jsonc
@@ -15,7 +15,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/apps/browser-rendering/.dev.vars.example b/apps/browser-rendering/.dev.vars.example
@@ -2,4 +2,4 @@ CLOUDFLARE_CLIENT_ID=
 CLOUDFLARE_CLIENT_SECRET=
 DEV_DISABLE_OAUTH=
 DEV_CLOUDFLARE_API_TOKEN=
-DEV_CLOUDFLARE_EMAIL=
+
diff --git a/apps/browser-rendering/wrangler.jsonc b/apps/browser-rendering/wrangler.jsonc
@@ -15,7 +15,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/apps/cloudflare-one-casb/.dev.vars.example b/apps/cloudflare-one-casb/.dev.vars.example
@@ -2,4 +2,3 @@ CLOUDFLARE_CLIENT_ID=
 CLOUDFLARE_CLIENT_SECRET=
 DEV_DISABLE_OAUTH=
 DEV_CLOUDFLARE_API_TOKEN=
-DEV_CLOUDFLARE_EMAIL=
diff --git a/apps/cloudflare-one-casb/wrangler.jsonc b/apps/cloudflare-one-casb/wrangler.jsonc
@@ -14,7 +14,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"vars": {
 		"MCP_SERVER_NAME": "PLACEHOLDER",
diff --git a/apps/demo-day/wrangler.json b/apps/demo-day/wrangler.json
@@ -13,7 +13,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/apps/dex-analysis/.dev.vars.example b/apps/dex-analysis/.dev.vars.example
@@ -2,4 +2,3 @@ CLOUDFLARE_CLIENT_ID=
 CLOUDFLARE_CLIENT_SECRET=
 DEV_DISABLE_OAUTH=
 DEV_CLOUDFLARE_API_TOKEN=
-DEV_CLOUDFLARE_EMAIL=
diff --git a/apps/dex-analysis/wrangler.jsonc b/apps/dex-analysis/wrangler.jsonc
@@ -18,7 +18,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/apps/dns-analytics/CONTRIBUTING.md b/apps/dns-analytics/CONTRIBUTING.md
@@ -18,7 +18,7 @@ If you'd like to iterate and test your MCP server, you can do so in local develo
 
    ```
    DEV_DISABLE_OAUTH=true
-   DEV_CLOUDFLARE_EMAIL=your_cloudflare_email
+   your_cloudflare_email
    # This is your api token with endpoint access.
    DEV_CLOUDFLARE_API_TOKEN=your_development_api_token
    ```
diff --git a/apps/dns-analytics/wrangler.jsonc b/apps/dns-analytics/wrangler.jsonc
@@ -15,7 +15,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/apps/docs-autorag/wrangler.jsonc b/apps/docs-autorag/wrangler.jsonc
@@ -15,7 +15,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/apps/docs-vectorize/wrangler.jsonc b/apps/docs-vectorize/wrangler.jsonc
@@ -15,7 +15,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/apps/graphql/wrangler.jsonc b/apps/graphql/wrangler.jsonc
@@ -15,7 +15,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/apps/logpush/.dev.vars.example b/apps/logpush/.dev.vars.example
@@ -2,4 +2,3 @@ CLOUDFLARE_CLIENT_ID=
 CLOUDFLARE_CLIENT_SECRET=
 DEV_DISABLE_OAUTH=
 DEV_CLOUDFLARE_API_TOKEN=
-DEV_CLOUDFLARE_EMAIL=
diff --git a/apps/logpush/wrangler.jsonc b/apps/logpush/wrangler.jsonc
@@ -15,7 +15,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/apps/radar/.dev.vars.example b/apps/radar/.dev.vars.example
@@ -2,4 +2,4 @@ CLOUDFLARE_CLIENT_ID=
 CLOUDFLARE_CLIENT_SECRET=
 DEV_DISABLE_OAUTH=
 DEV_CLOUDFLARE_API_TOKEN=
-DEV_CLOUDFLARE_EMAIL=
+
diff --git a/apps/radar/CONTRIBUTING.md b/apps/radar/CONTRIBUTING.md
@@ -17,7 +17,6 @@ If you'd like to iterate and test your MCP server, you can do so in local develo
 
    ```
    DEV_DISABLE_OAUTH=true
-   DEV_CLOUDFLARE_EMAIL=your_cloudflare_email
    # This is your global api token
    DEV_CLOUDFLARE_API_TOKEN=your_development_api_token
    ```
diff --git a/apps/radar/wrangler.jsonc b/apps/radar/wrangler.jsonc
@@ -15,7 +15,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/apps/sandbox-container/.dev.vars.example b/apps/sandbox-container/.dev.vars.example
@@ -2,4 +2,3 @@ CLOUDFLARE_CLIENT_ID=
 CLOUDFLARE_CLIENT_SECRET=
 DEV_DISABLE_OAUTH=
 DEV_CLOUDFLARE_API_TOKEN=
-DEV_CLOUDFLARE_EMAIL=
diff --git a/apps/sandbox-container/wrangler.jsonc b/apps/sandbox-container/wrangler.jsonc
@@ -40,7 +40,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"kv_namespaces": [
 		{
diff --git a/apps/workers-bindings/.dev.vars.example b/apps/workers-bindings/.dev.vars.example
@@ -2,4 +2,3 @@ CLOUDFLARE_CLIENT_ID=
 CLOUDFLARE_CLIENT_SECRET=
 DEV_DISABLE_OAUTH=
 DEV_CLOUDFLARE_API_TOKEN=
-DEV_CLOUDFLARE_EMAIL=
diff --git a/apps/workers-bindings/CONTRIBUTING.md b/apps/workers-bindings/CONTRIBUTING.md
@@ -17,7 +17,6 @@ If you'd like to iterate and test your MCP server, you can do so in local develo
 
    ```
    DEV_DISABLE_OAUTH=true
-   DEV_CLOUDFLARE_EMAIL=your_cloudflare_email
    # This is your global api token
    DEV_CLOUDFLARE_API_TOKEN=your_development_api_token
    ```
diff --git a/apps/workers-bindings/wrangler.jsonc b/apps/workers-bindings/wrangler.jsonc
@@ -33,7 +33,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"dev": {
 		"port": 8976
diff --git a/apps/workers-builds/.dev.vars.example b/apps/workers-builds/.dev.vars.example
@@ -3,4 +3,4 @@ CLOUDFLARE_CLIENT_SECRET=
 # OR
 DEV_DISABLE_OAUTH=
 DEV_CLOUDFLARE_API_TOKEN=
-DEV_CLOUDFLARE_EMAIL=
+
diff --git a/apps/workers-builds/CONTRIBUTING.md b/apps/workers-builds/CONTRIBUTING.md
@@ -17,7 +17,6 @@ If you'd like to iterate and test your MCP server, you can do so in local develo
 
    ```
    DEV_DISABLE_OAUTH=true
-   DEV_CLOUDFLARE_EMAIL=your_cloudflare_email
    # This is your global api token
    DEV_CLOUDFLARE_API_TOKEN=your_development_api_token
    ```
diff --git a/apps/workers-builds/wrangler.jsonc b/apps/workers-builds/wrangler.jsonc
@@ -15,7 +15,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/apps/workers-observability/.dev.vars.example b/apps/workers-observability/.dev.vars.example
@@ -2,4 +2,4 @@ CLOUDFLARE_CLIENT_ID=
 CLOUDFLARE_CLIENT_SECRET=
 DEV_DISABLE_OAUTH=
 DEV_CLOUDFLARE_API_TOKEN=
-DEV_CLOUDFLARE_EMAIL=
+
diff --git a/apps/workers-observability/CONTRIBUTING.md b/apps/workers-observability/CONTRIBUTING.md
@@ -17,8 +17,6 @@ If you'd like to iterate and test your MCP server, you can do so in local develo
 
    ```
    DEV_DISABLE_OAUTH=true
-   DEV_CLOUDFLARE_EMAIL=your_cloudflare_email
-   # This is your global api token
    DEV_CLOUDFLARE_API_TOKEN=your_development_api_token
    ```
 
diff --git a/apps/workers-observability/package.json b/apps/workers-observability/package.json
@@ -21,6 +21,7 @@
 		"agents": "0.2.7",
 		"cloudflare": "4.2.0",
 		"hono": "4.7.6",
+		"workers-tagged-logger": "0.13.5",
 		"zod": "3.24.2"
 	},
 	"devDependencies": {
diff --git a/apps/workers-observability/src/tools/workers-observability.tools.ts b/apps/workers-observability/src/tools/workers-observability.tools.ts
@@ -1,4 +1,5 @@
 import { writeToString } from '@fast-csv/format'
+import { WorkersLogger } from 'workers-tagged-logger'
 
 import {
 	handleWorkerLogsKeys,
@@ -14,6 +15,10 @@ import {
 
 import type { ObservabilityMCP } from '../workers-observability.app'
 
+type Tags = {
+	toolName?: string
+}
+const logger = new WorkersLogger<Tags>()
 /**
  * Registers the logs analysis tool with the MCP server
  * @param server The MCP server instance
@@ -49,9 +54,15 @@ This tool provides three primary views of your Worker data:
 		{
 			query: zQueryRunRequest,
 		},
-		async ({ query }) => {
+		async ({ query }, req) => {
+			logger.setTags({ userAgent: req.requestInfo?.headers?.['mcp-protocol-version'] })
+			logger.setTags({ mcpSessionId: req.requestInfo?.headers?.['mcp-session-id'] })
+			logger.setTags({ userAgent: req.requestInfo?.headers?.['sec-ch-ua'] })
+			logger.setTags({ toolName: 'query_worker_observability' })
 			const accountId = await agent.getActiveAccountId()
+			logger.setTags({ hasAccount: !!accountId })
 			if (!accountId) {
+				logger.warn('Ran Workers Observability Tool')
 				return {
 					content: [
 						{
@@ -63,8 +74,11 @@ This tool provides three primary views of your Worker data:
 			}
 			try {
 				const props = getProps(agent)
+				logger.setTags({ datasets: query.parameters?.datasets })
+				logger.setTags({ view: query.view })
 				const response = await queryWorkersObservability(props.accessToken, accountId, query)
 
+				logger.info('Ran Workers Observability Query')
 				if (query.view === 'calculations') {
 					let data = ''
 					for (const calculation of response?.calculations || []) {
diff --git a/apps/workers-observability/wrangler.jsonc b/apps/workers-observability/wrangler.jsonc
@@ -15,7 +15,11 @@
 		}
 	],
 	"observability": {
-		"enabled": true
+		"enabled": true,
+		"traces": {
+			"enabled": true,
+			"head_sampling_rate": 0.1
+		}
 	},
 	"durable_objects": {
 		"bindings": [
diff --git a/packages/mcp-common/src/api-token-mode.ts b/packages/mcp-common/src/api-token-mode.ts
diff --git a/packages/mcp-common/src/cloudflare-api.ts b/packages/mcp-common/src/cloudflare-api.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
