From 76ce532b894054b84a83513d81b3aaf6d80a8695 Mon Sep 17 00:00:00 2001
From: Andrei Markin <andrey.markin.ppc@gmail.com>
Date: Sat, 7 Mar 2026 17:13:46 +0400
Subject: [PATCH] fix(executors): use conventional OTEL_SERVICE_NAME env
 variable

* Ensure that otel_service_name can also be overwritten programmatically
---
 .../garf/executors/entrypoints/tracer.py      | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/libs/executors/garf/executors/entrypoints/tracer.py b/libs/executors/garf/executors/entrypoints/tracer.py
index 0b2d4be..8c28795 100644
--- a/libs/executors/garf/executors/entrypoints/tracer.py
+++ b/libs/executors/garf/executors/entrypoints/tracer.py
@@ -16,6 +16,7 @@
 
 import logging
 import os
+from typing import Optional
 
 from opentelemetry import metrics, trace
 from opentelemetry._logs import set_logger_provider
@@ -41,11 +42,18 @@
 DEFAULT_SERVICE_NAME = 'garf'
 
 
-def initialize_tracer():
-  resource = Resource.create(
-    {SERVICE_NAME: os.getenv('OTLP_SERVICE_NAME', DEFAULT_SERVICE_NAME)}
+def _init_resource(otel_service_name: Optional[str] = None) -> Resource:
+  return Resource.create(
+    {
+      SERVICE_NAME: otel_service_name
+      or os.getenv('OTEL_SERVICE_NAME', DEFAULT_SERVICE_NAME)
+    }
   )
 
+
+def initialize_tracer(otel_service_name: Optional[str] = None):
+  resource = _init_resource(otel_service_name)
+
   tracer_provider = TracerProvider(resource=resource)
 
   if otel_endpoint := os.getenv('OTEL_EXPORTER_OTLP_ENDPOINT'):
@@ -71,10 +79,8 @@ def initialize_tracer():
   trace.set_tracer_provider(tracer_provider)
 
 
-def initialize_meter():
-  resource = Resource.create(
-    {SERVICE_NAME: os.getenv('OTLP_SERVICE_NAME', DEFAULT_SERVICE_NAME)}
-  )
+def initialize_meter(otel_service_name: Optional[str] = None):
+  resource = _init_resource(otel_service_name)
   meter_provider = MeterProvider(resource=resource)
 
   if otel_endpoint := os.getenv('OTEL_EXPORTER_OTLP_ENDPOINT'):
@@ -106,10 +112,8 @@ def initialize_meter():
   return meter_provider
 
 
-def initialize_logger():
-  resource = Resource.create(
-    {SERVICE_NAME: os.getenv('OTLP_SERVICE_NAME', DEFAULT_SERVICE_NAME)}
-  )
+def initialize_logger(otel_service_name: Optional[str] = None):
+  resource = _init_resource(otel_service_name)
   logger_provider = LoggerProvider(resource=resource)
   set_logger_provider(logger_provider)
   if otel_endpoint := os.getenv('OTEL_EXPORTER_OTLP_ENDPOINT'):