Merge branch 'main' into fix-durable-object

Author: evanderkoogh

.changeset/huge-phones-work.md

@@ -0,0 +1,5 @@
+---
+'@microlabs/otel-cf-workers': patch
+---
+
+Make sure spans are ended on network errors

.changeset/new-coins-run.md

@@ -0,0 +1,5 @@
+---
+'@microlabs/otel-cf-workers': patch
+---
+
+Forcefully end spans that aren't ended by custom instrumentation when flushing

.changeset/pre.json

@@ -26,13 +26,15 @@
     "healthy-dolphins-yawn",
     "heavy-carrots-care",
     "hot-dodos-burn",
+    "huge-phones-work",
     "kind-ladybugs-swim",
     "little-goats-occur",
     "lovely-pets-impress",
     "lucky-apples-clean",
     "mighty-timers-float",
     "nervous-kids-guess",
     "nervous-poets-matter",
+    "new-coins-run",
     "new-gifts-repair",
     "new-horses-burn",
     "new-lions-collect",
@@ -46,8 +48,11 @@
     "proud-bugs-teach",
     "rotten-radios-hope",
     "rude-bottles-jog",
+    "shaky-lizards-help",
     "silent-flies-sell",
+    "smart-candies-grab",
     "smooth-vans-know",
+    "spotty-women-sleep",
     "strange-moose-fetch",
     "strong-monkeys-film",
     "tasty-ghosts-tickle",

.changeset/shaky-lizards-help.md

@@ -0,0 +1,5 @@
+---
+'@microlabs/otel-cf-workers': patch
+---
+
+Add user-agent header to the SpanExporter

CHANGELOG.md

@@ -1,5 +1,23 @@
 # @microlabs/otel-cf-workers
 
+## 1.0.0-rc.51
+
+### Patch Changes
+
+- d20322d: Make sure spans are ended on network errors
+- 4b89506: Forcefully end spans that aren't ended by custom instrumentation when flushing
+- 169d92a: Add user-agent header to the SpanExporter
+
+## 1.0.0-rc.50
+
+### Minor Changes
+
+- 19af336: Implement a complete rework of the internals to be more predictable and make it easier to implement more instrumentation on top of it.
+
+### Patch Changes
+
+- fcab308: Upgrade dependencies
+
 ## 1.0.0-rc.49
 
 ### Minor Changes

package.json

@@ -1,10 +1,11 @@
 {
 	"name": "@microlabs/otel-cf-workers",
-	"version": "1.0.0-rc.49",
+	"version": "1.0.0-rc.51",
 	"module": "./dist/index.js",
 	"type": "module",
 	"types": "./dist/index.d.ts",
 	"exports": "./dist/index.js",
+
 	"scripts": {
 		"clean": "rimraf ./dist versions.json",
 		"format": "prettier --ignore-unknown --write .",

src/instrumentation/fetch.ts

@@ -7,6 +7,8 @@ import {
 	Attributes,
 	Context,
 	Span,
+	Exception,
+	SpanStatusCode,
 } from '@opentelemetry/api'
 import { getActiveConfig } from '../config.js'
 import { wrap } from '../wrap.js'
@@ -180,21 +182,28 @@ export function instrumentClientFetch(
 			const method = request.method.toUpperCase()
 			const spanName = typeof attrs?.['name'] === 'string' ? attrs?.['name'] : `fetch ${method} ${host}`
 			const promise = tracer.startActiveSpan(spanName, options, async (span) => {
-				const includeTraceContext =
-					typeof config.includeTraceContext === 'function'
-						? config.includeTraceContext(request)
-						: config.includeTraceContext
-				if (includeTraceContext ?? true) {
-					propagation.inject(api_context.active(), request.headers, {
-						set: (h, k, v) => h.set(k, typeof v === 'string' ? v : String(v)),
-					})
+				try {
+					const includeTraceContext =
+						typeof config.includeTraceContext === 'function'
+							? config.includeTraceContext(request)
+							: config.includeTraceContext
+					if (includeTraceContext ?? true) {
+						propagation.inject(api_context.active(), request.headers, {
+							set: (h, k, v) => h.set(k, typeof v === 'string' ? v : String(v)),
+						})
+					}
+					span.setAttributes(gatherRequestAttributes(request))
+					if (request.cf) span.setAttributes(gatherOutgoingCfAttributes(request.cf))
+					const response = await Reflect.apply(target, thisArg, [request])
+					span.setAttributes(gatherResponseAttributes(response))
+					return response
+				} catch (error: unknown) {
+					span.recordException(error as Exception)
+					span.setStatus({ code: SpanStatusCode.ERROR })
+					throw error
+				} finally {
+					span.end()
 				}
-				span.setAttributes(gatherRequestAttributes(request))
-				if (request.cf) span.setAttributes(gatherOutgoingCfAttributes(request.cf))
-				const response = await Reflect.apply(target, thisArg, [request])
-				span.setAttributes(gatherResponseAttributes(response))
-				span.end()
-				return response
 			})
 			return promise
 		},

src/spanprocessor.ts

@@ -53,12 +53,14 @@ class TraceState {
 
 	async flush(): Promise<void> {
 		if (this.unexportedSpans.length > 0) {
-			this.sample()
-			const finishedSpans = this.unexportedSpans.filter((span) => !this.isSpanInProgress(span))
-			this.unexportedSpans = this.unexportedSpans.filter((span) => this.isSpanInProgress(span))
-			if (finishedSpans.length > 0) {
-				this.exportPromises.push(this.exportSpans(finishedSpans))
+			const unfinishedSpans = this.unexportedSpans.filter((span) => this.isSpanInProgress(span)) as unknown as Span[]
+			for (const span of unfinishedSpans) {
+				console.log(`Span ${span.spanContext().spanId} was not ended properly`)
+				span.end()
 			}
+			this.sample()
+			this.exportPromises.push(this.exportSpans(this.unexportedSpans))
+			this.unexportedSpans = []
 		}
 		if (this.exportPromises.length > 0) {
 			await Promise.allSettled(this.exportPromises)