Skip to content

Commit a559292

Browse files
authored
chore: 补充 resource 的 host ip 信息 (#2879)
1 parent 7326fe4 commit a559292

2 files changed

Lines changed: 10 additions & 0 deletions

File tree

apiserver/paasng/paas_wl/workloads/tracing/setup.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# We undertake not to change the open source license (MIT license) applicable
1616
# to the current version of the project delivered to anyone in the future.
1717

18+
import socket
19+
1820
from django.conf import settings
1921
from opentelemetry import trace
2022
from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
@@ -32,12 +34,15 @@ def setup_trace_config():
3234

3335
# Note: Since v1.35, the Jaeger supports OTLP natively. Please use the OTLP exporter instead.
3436
# pypi ref: https://pypi.org/project/opentelemetry-exporter-jaeger/
37+
host_ip = socket.gethostbyname(socket.gethostname())
38+
3539
trace.set_tracer_provider(
3640
tracer_provider=TracerProvider(
3741
resource=Resource.create(
3842
{
3943
"service.name": settings.OTEL_SERVICE_NAME,
4044
"bk.data.token": settings.OTEL_BK_DATA_TOKEN,
45+
"net.host.ip": host_ip,
4146
},
4247
),
4348
sampler=_KNOWN_SAMPLERS[settings.OTEL_SAMPLER], # type: ignore

apiserver/paasng/paasng/misc/tracing/setup.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# We undertake not to change the open source license (MIT license) applicable
1616
# to the current version of the project delivered to anyone in the future.
1717

18+
import socket
19+
1820
from django.conf import settings
1921
from opentelemetry import trace
2022
from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
@@ -32,12 +34,15 @@ def setup_trace_config():
3234

3335
# Note: Since v1.35, the Jaeger supports OTLP natively. Please use the OTLP exporter instead.
3436
# pypi ref: https://pypi.org/project/opentelemetry-exporter-jaeger/
37+
host_ip = socket.gethostbyname(socket.gethostname())
38+
3539
trace.set_tracer_provider(
3640
tracer_provider=TracerProvider(
3741
resource=Resource.create(
3842
{
3943
"service.name": settings.OTEL_SERVICE_NAME,
4044
"bk.data.token": settings.OTEL_BK_DATA_TOKEN,
45+
"host_ip": host_ip,
4146
},
4247
),
4348
sampler=_KNOWN_SAMPLERS[settings.OTEL_SAMPLER], # type: ignore

0 commit comments

Comments
 (0)