Merge branch 'main' into rename-FreshContext-req-to-request

Author: timreichen

.gitignore

@@ -1,8 +1,6 @@
 _fresh/
-tmp/
 vendor/
 node_modules/
 .docs/
 .DS_Store
-tmp-*
 tmp_*

deno.lock

@@ -554,7 +554,8 @@ if (Deno.args.includes("build")) {
   const denoJson = {
     tasks: {
       check:
-        "deno fmt --check && deno lint && deno check **/*.ts && deno check **/*.tsx",
+        // Revert once https://github.com/denoland/deno/issues/28923 is fixed
+        "deno fmt --check . && deno lint . && deno check **/*.ts && deno check **/*.tsx",
       dev: "deno run -A --watch=static/,routes/ dev.ts",
       build: "deno run -A dev.ts build",
       start: "deno run -A main.ts",

init/src/init.ts

@@ -4,7 +4,7 @@ import type { MiddlewareFn } from "./mod.ts";
 import { ASSET_CACHE_BUST_KEY } from "../runtime/shared_internal.tsx";
 import { BUILD_ID } from "../runtime/build_id.ts";
 import { getBuildCache } from "../context.ts";
-import { tracer } from "../otel.ts";
+import { trace, tracer } from "../otel.ts";
 
 /**
  * Fresh middleware to enable file-system based routing.
@@ -41,6 +41,12 @@ export function staticFiles<T>(): MiddlewareFn<T> {
       return new Response("Method Not Allowed", { status: 405 });
     }
 
+    const parentSpan = trace.getActiveSpan();
+    if (parentSpan) {
+      parentSpan.updateName(`${req.method} /*`);
+      parentSpan.setAttribute("http.route", "/*");
+    }
+
     const span = tracer.startSpan("static file", {
       attributes: { "fresh.span_type": "static_file" },
       startTime,

src/middlewares/static_files.ts

@@ -4,3 +4,4 @@ import denoJson from "../deno.json" with { type: "json" };
 export const CURRENT_FRESH_VERSION = denoJson.version;
 
 export const tracer = trace.getTracer("fresh", CURRENT_FRESH_VERSION);
+export { trace };

src/otel.ts

@@ -1900,7 +1900,7 @@ Deno.test({
 });
 
 Deno.test({
-  name: "partials - submit form redirecct",
+  name: "partials - submit form redirect",
   fn: async () => {
     const app = testApp()
       .get("/done", (ctx) => {