From 4e899d48cffa95617266dd8f9aef54603a87ad82 Mon Sep 17 00:00:00 2001
From: snek <snek@deno.com>
Date: Thu, 14 Nov 2024 13:16:28 +0100
Subject: fix: otel resiliency (#26857)

Improving the breadth of collected data, and ensuring that the collected
data is more likely to be successfully reported.

- Use `log` crate in more places
- Hook up `log` crate to otel
- Switch to process-wide otel processors
- Handle places that use `process::exit`

Also adds a more robust testing framework, with a deterministic tracing
setting.

Refs: https://github.com/denoland/deno/issues/26852
---
 tests/specs/cli/otel_basic/basic.ts | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 tests/specs/cli/otel_basic/basic.ts

(limited to 'tests/specs/cli/otel_basic/basic.ts')

diff --git a/tests/specs/cli/otel_basic/basic.ts b/tests/specs/cli/otel_basic/basic.ts
new file mode 100644
index 000000000..5a178794a
--- /dev/null
+++ b/tests/specs/cli/otel_basic/basic.ts
@@ -0,0 +1,24 @@
+// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
+
+async function inner() {
+  using _span = new Deno.tracing.Span("inner span");
+  console.log("log 1");
+  await 1;
+  console.log("log 2");
+}
+
+const server = Deno.serve({
+  port: 0,
+  async onListen({ port }) {
+    try {
+      await fetch(`http://localhost:${port}`);
+    } finally {
+      server.shutdown();
+    }
+  },
+  handler: async (_req) => {
+    using _span = new Deno.tracing.Span("outer span");
+    await inner();
+    return new Response(null, { status: 200 });
+  },
+});
-- 
cgit v1.2.3


From 594a99817cbe44553b2c288578fbba8e1e9c1907 Mon Sep 17 00:00:00 2001
From: Luca Casonato <hello@lcas.dev>
Date: Tue, 19 Nov 2024 00:55:22 +0100
Subject: feat(runtime): remove public OTEL trace API (#26854)

This PR removes the public Deno.tracing.Span API.
We are not confident we can ship an API that is
better than the `@opentelemetry/api` API, because
V8 CPED does not support us using `using` to
manage span context. If this changes, we can
revisit this decision. For now, users wanting
custom spans can instrument their code using
the `@opentelemetry/api` API and `@deno/otel`.

This PR also speeds up the OTEL trace generation
by a 30% by using Uint8Array instead of
strings for the trace ID and span ID.
---
 tests/specs/cli/otel_basic/basic.ts | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'tests/specs/cli/otel_basic/basic.ts')

diff --git a/tests/specs/cli/otel_basic/basic.ts b/tests/specs/cli/otel_basic/basic.ts
index 5a178794a..5c4ae43cd 100644
--- a/tests/specs/cli/otel_basic/basic.ts
+++ b/tests/specs/cli/otel_basic/basic.ts
@@ -1,10 +1,17 @@
 // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
 
+import { trace } from "npm:@opentelemetry/api@1.9.0";
+import "jsr:@deno/otel@0.0.2/register";
+
+const tracer = trace.getTracer("example-tracer");
+
 async function inner() {
-  using _span = new Deno.tracing.Span("inner span");
-  console.log("log 1");
-  await 1;
-  console.log("log 2");
+  await tracer.startActiveSpan("inner span", async (span) => {
+    console.log("log 1");
+    await 1;
+    console.log("log 2");
+    span.end();
+  });
 }
 
 const server = Deno.serve({
@@ -17,8 +24,11 @@ const server = Deno.serve({
     }
   },
   handler: async (_req) => {
-    using _span = new Deno.tracing.Span("outer span");
-    await inner();
-    return new Response(null, { status: 200 });
+    return await tracer.startActiveSpan("outer span", async (span) => {
+      await inner();
+      const resp = new Response(null, { status: 200 });
+      span.end();
+      return resp;
+    });
   },
 });
-- 
cgit v1.2.3