@@ -93,6 +93,9 @@ const collectorLayer = (requests: Array<ExportedRequest>) =>
9393 ) ,
9494 ) ;
9595
96+ // A developer's own OTEL_* variables would otherwise pick the endpoints.
97+ const emptyEnv = ConfigProvider . layer ( ConfigProvider . fromEnv ( { env : { } } ) ) ;
98+
9699const encodeObservabilitySettingsFile = Schema . encodeSync (
97100 Schema . fromJsonString (
98101 Schema . Struct ( { observability : Schema . Record ( Schema . String , Schema . String ) } ) ,
@@ -182,7 +185,7 @@ describe("DesktopObservability", () => {
182185 assert . isFalse ( yield * fileSystem . exists ( logPath ) ) ;
183186 } ) . pipe (
184187 Effect . scoped ,
185- Effect . provide ( Layer . mergeAll ( NodeServices . layer , NodeHttpClient . layerUndici ) ) ,
188+ Effect . provide ( Layer . mergeAll ( NodeServices . layer , NodeHttpClient . layerUndici , emptyEnv ) ) ,
186189 ) ,
187190 ) ;
188191
@@ -260,7 +263,7 @@ describe("DesktopObservability", () => {
260263 ) ;
261264 } ) . pipe (
262265 Effect . scoped ,
263- Effect . provide ( Layer . mergeAll ( NodeServices . layer , NodeHttpClient . layerUndici ) ) ,
266+ Effect . provide ( Layer . mergeAll ( NodeServices . layer , NodeHttpClient . layerUndici , emptyEnv ) ) ,
264267 ) ,
265268 ) ;
266269
@@ -300,7 +303,7 @@ describe("DesktopObservability", () => {
300303 assert . equal ( records . at ( - 1 ) ?. annotations . details , "code=1" ) ;
301304 } ) . pipe (
302305 Effect . scoped ,
303- Effect . provide ( Layer . mergeAll ( NodeServices . layer , NodeHttpClient . layerUndici ) ) ,
306+ Effect . provide ( Layer . mergeAll ( NodeServices . layer , NodeHttpClient . layerUndici , emptyEnv ) ) ,
304307 ) ,
305308 ) ;
306309
@@ -344,7 +347,7 @@ describe("DesktopObservability", () => {
344347 assert . isFalse ( text . includes ( "y" ) ) ;
345348 } ) . pipe (
346349 Effect . scoped ,
347- Effect . provide ( Layer . mergeAll ( NodeServices . layer , NodeHttpClient . layerUndici ) ) ,
350+ Effect . provide ( Layer . mergeAll ( NodeServices . layer , NodeHttpClient . layerUndici , emptyEnv ) ) ,
348351 ) ,
349352 ) ;
350353
@@ -378,7 +381,7 @@ describe("DesktopObservability", () => {
378381 assert . equal ( lines . length , 258 ) ;
379382 } ) . pipe (
380383 Effect . scoped ,
381- Effect . provide ( Layer . mergeAll ( NodeServices . layer , NodeHttpClient . layerUndici ) ) ,
384+ Effect . provide ( Layer . mergeAll ( NodeServices . layer , NodeHttpClient . layerUndici , emptyEnv ) ) ,
382385 ) ,
383386 ) ;
384387
@@ -424,7 +427,136 @@ describe("DesktopObservability", () => {
424427 assert . lengthOf ( record ?. events ?? [ ] , 0 ) ;
425428 } ) . pipe (
426429 Effect . scoped ,
427- Effect . provide ( Layer . mergeAll ( NodeServices . layer , collectorLayer ( requests ) ) ) ,
430+ Effect . provide ( Layer . mergeAll ( NodeServices . layer , collectorLayer ( requests ) , emptyEnv ) ) ,
431+ ) ;
432+ } ) ;
433+
434+ it . effect ( "exports to an OTEL endpoint over Settings, with its own headers and protocol" , ( ) => {
435+ const requests : Array < ExportedRequest > = [ ] ;
436+ return Effect . gen ( function * ( ) {
437+ const fileSystem = yield * FileSystem . FileSystem ;
438+ const baseDir = yield * fileSystem . makeTempDirectoryScoped ( {
439+ prefix : "t3-desktop-observability-test-" ,
440+ } ) ;
441+ const environmentLayer = makeEnvironmentLayer ( baseDir , true , {
442+ T3CODE_OTLP_HEADERS : "x-scope=desktop" ,
443+ } ) ;
444+ yield * writeObservabilitySettings ( environmentLayer , {
445+ otlpLogsUrl : "https://settings.example.com/v1/logs" ,
446+ } ) ;
447+
448+ yield * Effect . scoped (
449+ Effect . logInfo ( "desktop otel export" ) . pipe (
450+ Effect . provide ( DesktopObservability . layer . pipe ( Layer . provideMerge ( environmentLayer ) ) ) ,
451+ ) ,
452+ ) ;
453+
454+ assert . lengthOf ( requests , 1 ) ;
455+ const [ request ] = requests ;
456+ assert . strictEqual ( request ?. url , "https://collector.example.com/v1/logs" ) ;
457+ assert . strictEqual ( request ?. headers [ "x-otel" ] , "desktop" ) ;
458+ assert . strictEqual ( request ?. headers [ "x-scope" ] , undefined ) ;
459+ assert . strictEqual ( request ?. headers [ "content-type" ] , "application/json" ) ;
460+ } ) . pipe (
461+ Effect . scoped ,
462+ Effect . provide (
463+ Layer . mergeAll (
464+ NodeServices . layer ,
465+ collectorLayer ( requests ) ,
466+ ConfigProvider . layer (
467+ ConfigProvider . fromEnv ( {
468+ env : {
469+ OTEL_EXPORTER_OTLP_ENDPOINT : "https://collector.example.com" ,
470+ OTEL_EXPORTER_OTLP_HEADERS : "x-otel=desktop" ,
471+ OTEL_EXPORTER_OTLP_LOGS_PROTOCOL : "http/json" ,
472+ } ,
473+ } ) ,
474+ ) ,
475+ ) ,
476+ ) ,
477+ ) ;
478+ } ) ;
479+
480+ it . effect ( "keeps its service name while OTEL resource attributes add dimensions" , ( ) => {
481+ const requests : Array < ExportedRequest > = [ ] ;
482+ return Effect . gen ( function * ( ) {
483+ const fileSystem = yield * FileSystem . FileSystem ;
484+ const baseDir = yield * fileSystem . makeTempDirectoryScoped ( {
485+ prefix : "t3-desktop-observability-test-" ,
486+ } ) ;
487+ const environmentLayer = makeEnvironmentLayer ( baseDir , true , {
488+ T3CODE_OTLP_LOGS_URL : "https://collector.example.com/v1/logs" ,
489+ } ) ;
490+
491+ yield * Effect . scoped (
492+ Effect . logInfo ( "desktop service name" ) . pipe (
493+ Effect . provide ( DesktopObservability . layer . pipe ( Layer . provideMerge ( environmentLayer ) ) ) ,
494+ ) ,
495+ ) ;
496+
497+ assert . lengthOf ( requests , 1 ) ;
498+ const body = requests [ 0 ] ?. body ?? "" ;
499+ assert . include ( body , '"stringValue":"t3code-desktop"' ) ;
500+ assert . include ( body , "deployment.environment.name" ) ;
501+ assert . include ( body , '"key":"service.namespace","value":{"stringValue":"t3code"}' ) ;
502+ assert . notInclude ( body , "renamed" ) ;
503+ } ) . pipe (
504+ Effect . scoped ,
505+ Effect . provide (
506+ Layer . mergeAll (
507+ NodeServices . layer ,
508+ collectorLayer ( requests ) ,
509+ ConfigProvider . layer (
510+ ConfigProvider . fromEnv ( {
511+ env : {
512+ OTEL_SERVICE_NAME : "renamed" ,
513+ OTEL_RESOURCE_ATTRIBUTES :
514+ "service.name=renamed,service.namespace=renamed,deployment.environment.name=development" ,
515+ } ,
516+ } ) ,
517+ ) ,
518+ ) ,
519+ ) ,
520+ ) ;
521+ } ) ;
522+
523+ it . effect ( "exports nothing to Settings for logs an unusable OTEL endpoint claimed" , ( ) => {
524+ const requests : Array < ExportedRequest > = [ ] ;
525+ return Effect . gen ( function * ( ) {
526+ const fileSystem = yield * FileSystem . FileSystem ;
527+ const baseDir = yield * fileSystem . makeTempDirectoryScoped ( {
528+ prefix : "t3-desktop-observability-test-" ,
529+ } ) ;
530+ const environmentLayer = makeEnvironmentLayer ( baseDir , true , {
531+ T3CODE_OTLP_HEADERS : "x-scope=desktop" ,
532+ } ) ;
533+ yield * writeObservabilitySettings ( environmentLayer , {
534+ otlpLogsUrl : "https://settings.example.com/v1/logs" ,
535+ } ) ;
536+
537+ yield * Effect . scoped (
538+ Effect . logInfo ( "desktop otel off" ) . pipe (
539+ Effect . provide ( DesktopObservability . layer . pipe ( Layer . provideMerge ( environmentLayer ) ) ) ,
540+ ) ,
541+ ) ;
542+
543+ assert . lengthOf ( requests , 0 ) ;
544+ } ) . pipe (
545+ Effect . scoped ,
546+ Effect . provide (
547+ Layer . mergeAll (
548+ NodeServices . layer ,
549+ collectorLayer ( requests ) ,
550+ ConfigProvider . layer (
551+ ConfigProvider . fromEnv ( {
552+ env : {
553+ OTEL_EXPORTER_OTLP_ENDPOINT : "https://collector.example.com" ,
554+ OTEL_EXPORTER_OTLP_LOGS_PROTOCOL : "grpc" ,
555+ } ,
556+ } ) ,
557+ ) ,
558+ ) ,
559+ ) ,
428560 ) ;
429561 } ) ;
430562
@@ -495,7 +627,7 @@ describe("DesktopObservability", () => {
495627 ) ;
496628 } ) . pipe (
497629 Effect . scoped ,
498- Effect . provide ( Layer . mergeAll ( NodeServices . layer , collectorLayer ( requests ) ) ) ,
630+ Effect . provide ( Layer . mergeAll ( NodeServices . layer , collectorLayer ( requests ) , emptyEnv ) ) ,
499631 ) ;
500632 } ) ;
501633
@@ -519,7 +651,7 @@ describe("DesktopObservability", () => {
519651 assert . lengthOf ( requests , 0 ) ;
520652 } ) . pipe (
521653 Effect . scoped ,
522- Effect . provide ( Layer . mergeAll ( NodeServices . layer , collectorLayer ( requests ) ) ) ,
654+ Effect . provide ( Layer . mergeAll ( NodeServices . layer , collectorLayer ( requests ) , emptyEnv ) ) ,
523655 ) ;
524656 } ) ;
525657
0 commit comments