@@ -4,7 +4,6 @@ import { assert, describe, it } from "@effect/vitest";
44import * as Effect from "effect/Effect" ;
55import * as FileSystem from "effect/FileSystem" ;
66import * as Layer from "effect/Layer" ;
7- import * as Metric from "effect/Metric" ;
87import * as Schema from "effect/Schema" ;
98import * as HttpClient from "effect/unstable/http/HttpClient" ;
109import * as HttpClientResponse from "effect/unstable/http/HttpClientResponse" ;
@@ -428,32 +427,6 @@ describe("DesktopObservability", () => {
428427 ) ;
429428 } ) ;
430429
431- it . effect ( "exports main process metrics to the configured metrics endpoint" , ( ) => {
432- const requests : Array < ExportedRequest > = [ ] ;
433- return Effect . gen ( function * ( ) {
434- const fileSystem = yield * FileSystem . FileSystem ;
435- const baseDir = yield * fileSystem . makeTempDirectoryScoped ( {
436- prefix : "t3-desktop-observability-test-" ,
437- } ) ;
438- const environmentLayer = makeEnvironmentLayer ( baseDir , true , {
439- T3CODE_OTLP_METRICS_URL : "https://collector.example.com/v1/metrics" ,
440- } ) ;
441-
442- yield * Effect . scoped (
443- Metric . update ( Metric . counter ( "desktop_metrics_export_test_total" ) , 1 ) . pipe (
444- Effect . provide ( DesktopObservability . layer . pipe ( Layer . provideMerge ( environmentLayer ) ) ) ,
445- ) ,
446- ) ;
447-
448- assert . lengthOf ( requests , 1 ) ;
449- assert . strictEqual ( requests [ 0 ] ?. url , "https://collector.example.com/v1/metrics" ) ;
450- assert . include ( requests [ 0 ] ?. body ?? "" , "desktop_metrics_export_test_total" ) ;
451- } ) . pipe (
452- Effect . scoped ,
453- Effect . provide ( Layer . mergeAll ( NodeServices . layer , collectorLayer ( requests ) ) ) ,
454- ) ;
455- } ) ;
456-
457430 it . effect ( "reads every signal endpoint from Settings when the environment names none" , ( ) => {
458431 const requests : Array < ExportedRequest > = [ ] ;
459432 return Effect . gen ( function * ( ) {
@@ -463,30 +436,31 @@ describe("DesktopObservability", () => {
463436 } ) ;
464437 const environmentLayer = makeEnvironmentLayer ( baseDir ) ;
465438 yield * writeObservabilitySettings ( environmentLayer , {
439+ otlpTracesUrl : "https://settings.example.com/v1/traces" ,
466440 otlpLogsUrl : "https://settings.example.com/v1/logs" ,
441+ // The main process records no metrics yet, so this endpoint must
442+ // not produce a request.
467443 otlpMetricsUrl : "https://settings.example.com/v1/metrics" ,
468444 } ) ;
469445
470446 yield * Effect . scoped (
471- Effect . gen ( function * ( ) {
472- yield * Effect . logInfo ( "desktop log export from settings" ) ;
473- yield * Metric . update ( Metric . counter ( "desktop_settings_export_test_total" ) , 1 ) ;
474- } ) . pipe (
447+ Effect . logInfo ( "desktop log export from settings" ) . pipe (
448+ Effect . withSpan ( "desktop-settings-export-test" ) ,
475449 Effect . provide ( DesktopObservability . layer . pipe ( Layer . provideMerge ( environmentLayer ) ) ) ,
476450 ) ,
477451 ) ;
478452
479453 assert . deepEqual ( requests . map ( ( request ) => request . url ) . toSorted ( ) , [
480454 "https://settings.example.com/v1/logs" ,
481- "https://settings.example.com/v1/metrics " ,
455+ "https://settings.example.com/v1/traces " ,
482456 ] ) ;
483457 assert . include (
484458 requests . find ( ( request ) => request . url . endsWith ( "/v1/logs" ) ) ?. body ?? "" ,
485459 "desktop log export from settings" ,
486460 ) ;
487461 assert . include (
488- requests . find ( ( request ) => request . url . endsWith ( "/v1/metrics " ) ) ?. body ?? "" ,
489- "desktop_settings_export_test_total " ,
462+ requests . find ( ( request ) => request . url . endsWith ( "/v1/traces " ) ) ?. body ?? "" ,
463+ "desktop-settings-export-test " ,
490464 ) ;
491465 } ) . pipe (
492466 Effect . scoped ,
0 commit comments