From ee7c7ff381bf7b725fd5ad7e9d00803b26e1c9f4 Mon Sep 17 00:00:00 2001
From: Ivan Burkov <burkov_i@ekb.sima-land.ru>
Date: Mon, 14 Jul 2025 15:27:41 +0500
Subject: [PATCH 1/2] =?UTF-8?q?fix(otel):=20=D1=83=D0=B1=D1=80=D0=B0=D0=BD?=
 =?UTF-8?q?=20url=20=D0=B2=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83=20=D1=88?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=BD=D0=BE=D0=B9=20=D1=81=D1=82?=
 =?UTF-8?q?=D1=80=D0=BE=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat(otel): переменная hostname
---
 docs/docs/telemetry.md                         | 13 ++++++++-----
 .../telemetry-tracer-span-exporter.ts          | 18 +++++++++---------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/docs/docs/telemetry.md b/docs/docs/telemetry.md
index 4cc3d3f..0d04493 100644
--- a/docs/docs/telemetry.md
+++ b/docs/docs/telemetry.md
@@ -16,11 +16,14 @@ sidebar_position: 4
 
 Конфигурация инструмента выгрузки опциональна.
 
-|     Переменная окружения     | Описание                                                                       |  Значение по-умолчанию  |
-| :--------------------------: | ------------------------------------------------------------------------------ | :---------------------: |
-|   `OTEL_EXPORTER_OTLP_URL`   | URL коллектора телеметрии.                                                     | `http://localhost:4317` |
-|  `OTEL_EXPORTER_OTLP_PORT`   | Порт коллектора телеметрии. Переписывает значение из `OTEL_EXPORTER_OTLP_URL`. |            —            |
-| `OTEL_EXPORTER_OTLP_HEADERS` | Заголовки для транспорта в формате строки JSON.                                |            —            |
+|     Переменная окружения      | Описание                                                        | Значение по-умолчанию |
+| :---------------------------: | --------------------------------------------------------------- | :-------------------: |
+|   `OTEL_EXPORTER_OTLP_URI`    | URI коллектора телеметрии (`<schema>://<hostname>:<port>/...`). |           —           |
+|                               | <center>**ИЛИ**</center>                                        |                       |
+| `OTEL_EXPORTER_OTLP_HOSTNAME` | Хост коллектора телеметрии.                                     |      `localhost`      |
+|   `OTEL_EXPORTER_OTLP_PORT`   | Порт коллектора телеметрии.                                     |        `4317`         |
+|                               |                                                                 |                       |
+| `OTEL_EXPORTER_OTLP_HEADERS`  | Заголовки для транспорта в формате строки JSON.                 |           —           |
 
 **Пример:**
 
diff --git a/src/preset/node/providers/telemetry-tracer-span-exporter.ts b/src/preset/node/providers/telemetry-tracer-span-exporter.ts
index 247157a..c09170e 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,14 +13,14 @@ const envPrefix = 'OTEL_EXPORTER_OTLP_';
 export function provideSpanExporter(resolve: Resolve): OTLPTraceExporter {
   const source = resolve(KnownToken.Config.source);
   const headers = source.has(`${envPrefix}HEADERS`)
-    ? JSON.parse(source.get(`${envPrefix}HEADERS`, '{}'))
+    ? JSON.parse(source.get(`${envPrefix}HEADERS`, "{}"))
     : undefined;
-  const url = new URL(source.get(`${envPrefix}URL`, 'http://localhost:4317'));
-
-  if (source.has(`${envPrefix}PORT`)) url.port = source.get(`${envPrefix}PORT`, '');
 
   return new OTLPTraceExporter({
-    url: url.toString(),
+    url: source.get(
+      `${envPrefix}URI`,
+      `${source.get(`${envPrefix}HOSTNAME`, "localhost")}:${source.get(`${envPrefix}PORT`, "4317")}`,
+    ),
     headers,
   });
 }

From d75988fdb6a91f77bcc6e5c13781b22b25cee59f Mon Sep 17 00:00:00 2001
From: Ivan Burkov <burkov_i@ekb.sima-land.ru>
Date: Mon, 14 Jul 2025 16:26:56 +0500
Subject: [PATCH 2/2] fix: prettier write

---
 .../node/providers/telemetry-tracer-span-exporter.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/preset/node/providers/telemetry-tracer-span-exporter.ts b/src/preset/node/providers/telemetry-tracer-span-exporter.ts
index c09170e..2568896 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,13 +13,13 @@ const envPrefix = "OTEL_EXPORTER_OTLP_";
 export function provideSpanExporter(resolve: Resolve): OTLPTraceExporter {
   const source = resolve(KnownToken.Config.source);
   const headers = source.has(`${envPrefix}HEADERS`)
-    ? JSON.parse(source.get(`${envPrefix}HEADERS`, "{}"))
+    ? JSON.parse(source.get(`${envPrefix}HEADERS`, '{}'))
     : undefined;
 
   return new OTLPTraceExporter({
     url: source.get(
       `${envPrefix}URI`,
-      `${source.get(`${envPrefix}HOSTNAME`, "localhost")}:${source.get(`${envPrefix}PORT`, "4317")}`,
+      `${source.get(`${envPrefix}HOSTNAME`, 'localhost')}:${source.get(`${envPrefix}PORT`, '4317')}`,
     ),
     headers,
   });