void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-08-02 23:12:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

logging & config update

Browse source
This commit is contained in:
Grant Limberg 2025-07-14 17:27:36 -07:00
parent 54fb480ade
commit 52b6355a54
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ext/central-controller-docker/main.sh
View file

@ -83,8 +83,10 @@ echo "{
\"lowBandwidthMode\": ${ZT_LB_MODE:-$DEFAULT_LB_MODE}, \"lowBandwidthMode\": ${ZT_LB_MODE:-$DEFAULT_LB_MODE},
\"ssoRedirectURL\": \"${ZT_SSO_REDIRECT_URL}\", \"ssoRedirectURL\": \"${ZT_SSO_REDIRECT_URL}\",
\"allowManagementFrom\": [\"127.0.0.1\", \"::1\", \"10.0.0.0/8\"], \"allowManagementFrom\": [\"127.0.0.1\", \"::1\", \"10.0.0.0/8\"],
\"exporterEndpoint\": \"${ZT_EXPORTER_ENDPOINT}\", \"otel\": {
\"exporterSampleRate\": ${ZT_EXPORTER_SAMPLE_RATE:-0}, \"exporterEndpoint\": \"${ZT_EXPORTER_ENDPOINT}\",
\"exporterSampleRate\": ${ZT_EXPORTER_SAMPLE_RATE:-0}
},
${REDIS} ${REDIS}
} }
} }

8
service/OneService.cpp
View file

@ -1057,7 +1057,9 @@ class OneServiceImpl : public OneService {
auto sampler = std::unique_ptr<sdktrace::TraceIdRatioBasedSampler>(new sdktrace::TraceIdRatioBasedSampler(_exporterSampleRate)); auto sampler = std::unique_ptr<sdktrace::TraceIdRatioBasedSampler>(new sdktrace::TraceIdRatioBasedSampler(_exporterSampleRate));
auto tracer_context = std::make_shared<sdktrace::TracerContext>(std::move(processor), resource, std::move(sampler)); auto tracer_context = std::make_shared<sdktrace::TracerContext>(std::move(processor), resource, std::move(sampler));
_traceProvider = nostd::shared_ptr<sdktrace::TracerProvider>(new sdktrace::TracerProvider(tracer_context)); _traceProvider = nostd::shared_ptr<sdktrace::TracerProvider>(new sdktrace::TracerProvider(tracer_context));
opentelemetry::trace::Provider::SetTracerProvider(_traceProvider); opentelemetry::trace::Provider::SetTracerProvider(_traceProvider);
opentelemetry::trace::Provider::
} }
} }
@ -1601,6 +1603,12 @@ class OneServiceImpl : public OneService {
if (_exporterEndpoint.empty()) { if (_exporterEndpoint.empty()) {
fprintf(stderr, "WARNING: OpenTelemetry exporter endpoint is not set. Metrics will not be exported." ZT_EOL_S); fprintf(stderr, "WARNING: OpenTelemetry exporter endpoint is not set. Metrics will not be exported." ZT_EOL_S);
} }
if (_exporterSampleRate <= 0.0) {
fprintf(stderr, "WARNING: OpenTelemetry exporter sample rate is not set or invalid. Metrics will not be exported." ZT_EOL_S);
}
}
else {
fprintf(stderr, "WARNING: OpenTelemetry exporter settings are not set. Metrics will not be exported." ZT_EOL_S);
} }
#endif #endif