From 65a3bf52a7c553a6b4c1a2ea2cd8a83b4065f434 Mon Sep 17 00:00:00 2001 From: Ivan Burkov Date: Tue, 22 Jul 2025 16:30:28 +0500 Subject: [PATCH 1/3] =?UTF-8?q?fix(prettier):=20=D0=BF=D0=BE=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20prettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix(otel): поправлена сборка URL --- .../telemetry-tracer-span-exporter.ts | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/src/preset/node/providers/telemetry-tracer-span-exporter.ts b/src/preset/node/providers/telemetry-tracer-span-exporter.ts index 407695b..09daea4 100644 --- a/src/preset/node/providers/telemetry-tracer-span-exporter.ts +++ b/src/preset/node/providers/telemetry-tracer-span-exporter.ts @@ -1,9 +1,9 @@ -import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-grpc"; -import { KnownToken } from "../../../tokens"; +import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc'; +import { KnownToken } from '../../../tokens'; -import type { Resolve } from "../../../di"; +import type { Resolve } from '../../../di'; -const envPrefix = "OTEL_EXPORTER_OTLP_"; +const envPrefix = 'OTEL_EXPORTER_OTLP_'; /** * Провайдер объекта SpanExporter. @@ -13,17 +13,14 @@ const envPrefix = "OTEL_EXPORTER_OTLP_"; export function provideSpanExporter(resolve: Resolve): OTLPTraceExporter { const source = resolve(KnownToken.Config.source); const headers = source.has(`${envPrefix}REQUEST_HEADERS`) - ? JSON.parse(source.get(`${envPrefix}REQUEST_HEADERS`, "{}")) + ? JSON.parse(source.get(`${envPrefix}REQUEST_HEADERS`, '{}')) : undefined; - - const url = [ - `${envPrefix}PROTOCOL`, - `${envPrefix}HOSTNAME`, - `${envPrefix}PORT`, - ].reduce((acc, envPart) => acc + source.get(envPart, ""), ""); + + const url = new URL(source.get(`${envPrefix}ENTRYPOINT`) || `${source.get(`${envPrefix}PROTOCOL`, 'https')}://${source.get(`${envPrefix}HOSTNAME`, 'localhost')}`); + url.port = source.get(`${envPrefix}PORT`, url.port); return new OTLPTraceExporter({ - ...(url && { url }), + url: url.toString(), ...(headers && { headers }), }); } From 6eec4e2da776fa7b4a10e63131f0383764b07429 Mon Sep 17 00:00:00 2001 From: Ivan Burkov Date: Tue, 22 Jul 2025 16:32:22 +0500 Subject: [PATCH 2/3] =?UTF-8?q?fix(otel):=20=D0=BF=D0=BE=D1=80=D1=82=20?= =?UTF-8?q?=D0=BF=D0=BE-=D1=83=D0=BC=D0=BE=D0=BB=D1=87=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/preset/node/providers/telemetry-tracer-span-exporter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/preset/node/providers/telemetry-tracer-span-exporter.ts b/src/preset/node/providers/telemetry-tracer-span-exporter.ts index 09daea4..f5bce0a 100644 --- a/src/preset/node/providers/telemetry-tracer-span-exporter.ts +++ b/src/preset/node/providers/telemetry-tracer-span-exporter.ts @@ -17,7 +17,7 @@ export function provideSpanExporter(resolve: Resolve): OTLPTraceExporter { : undefined; const url = new URL(source.get(`${envPrefix}ENTRYPOINT`) || `${source.get(`${envPrefix}PROTOCOL`, 'https')}://${source.get(`${envPrefix}HOSTNAME`, 'localhost')}`); - url.port = source.get(`${envPrefix}PORT`, url.port); + url.port = source.get(`${envPrefix}PORT`, '4317'); return new OTLPTraceExporter({ url: url.toString(), From e8587d024ec06b4c94a978f1efb83474a92f98ba Mon Sep 17 00:00:00 2001 From: Ivan Burkov Date: Tue, 22 Jul 2025 16:33:01 +0500 Subject: [PATCH 3/3] =?UTF-8?q?fix(prettier):=20=D0=BF=D0=BE=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20prettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/preset/node/providers/telemetry-tracer-span-exporter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/preset/node/providers/telemetry-tracer-span-exporter.ts b/src/preset/node/providers/telemetry-tracer-span-exporter.ts index f5bce0a..918b891 100644 --- a/src/preset/node/providers/telemetry-tracer-span-exporter.ts +++ b/src/preset/node/providers/telemetry-tracer-span-exporter.ts @@ -15,7 +15,7 @@ export function provideSpanExporter(resolve: Resolve): OTLPTraceExporter { const headers = source.has(`${envPrefix}REQUEST_HEADERS`) ? JSON.parse(source.get(`${envPrefix}REQUEST_HEADERS`, '{}')) : undefined; - + const url = new URL(source.get(`${envPrefix}ENTRYPOINT`) || `${source.get(`${envPrefix}PROTOCOL`, 'https')}://${source.get(`${envPrefix}HOSTNAME`, 'localhost')}`); url.port = source.get(`${envPrefix}PORT`, '4317');