Skip to content

Commit 863e0ed

Browse files
committed
Reduce code bloat a bit
1 parent f06f0b2 commit 863e0ed

File tree

1 file changed

+34
-48
lines changed

1 file changed

+34
-48
lines changed

exporters/otlp/src/otlp_environment.cc

Lines changed: 34 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,34 @@ static bool GetStringDualEnvVar(const char *signal_name,
8080
return exists;
8181
}
8282

83+
static std::uint32_t GetUintEnvVarOrDefault(opentelemetry::nostd::string_view signal_env,
84+
opentelemetry::nostd::string_view generic_env,
85+
std::uint32_t default_value)
86+
{
87+
std::string value;
88+
89+
if (GetStringDualEnvVar(signal_env.data(), generic_env.data(), value))
90+
{
91+
return static_cast<std::uint32_t>(std::strtoul(value.c_str(), nullptr, 10));
92+
}
93+
94+
return default_value;
95+
}
96+
97+
static float GetFloatEnvVarOrDefault(opentelemetry::nostd::string_view signal_env,
98+
opentelemetry::nostd::string_view generic_env,
99+
float default_value)
100+
{
101+
std::string value;
102+
103+
if (GetStringDualEnvVar(signal_env.data(), generic_env.data(), value))
104+
{
105+
return std::strtof(value.c_str(), nullptr);
106+
}
107+
108+
return default_value;
109+
}
110+
83111
std::string GetOtlpDefaultGrpcTracesEndpoint()
84112
{
85113
constexpr char kSignalEnv[] = "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT";
@@ -1125,48 +1153,6 @@ std::string GetOtlpDefaultLogsCompression()
11251153
return std::string{"none"};
11261154
}
11271155

1128-
std::uint32_t GetUintEnvVarOrDefault(opentelemetry::nostd::string_view signal_env,
1129-
opentelemetry::nostd::string_view generic_env,
1130-
std::uint32_t default_value)
1131-
{
1132-
std::string value;
1133-
1134-
if (GetStringDualEnvVar(signal_env.data(), generic_env.data(), value))
1135-
{
1136-
return static_cast<std::uint32_t>(std::strtoul(value.c_str(), nullptr, 10));
1137-
}
1138-
1139-
return default_value;
1140-
}
1141-
1142-
float GetFloatEnvVarOrDefault(opentelemetry::nostd::string_view signal_env,
1143-
opentelemetry::nostd::string_view generic_env,
1144-
float default_value)
1145-
{
1146-
std::string value;
1147-
1148-
if (GetStringDualEnvVar(signal_env.data(), generic_env.data(), value))
1149-
{
1150-
return std::strtof(value.c_str(), nullptr);
1151-
}
1152-
1153-
return default_value;
1154-
}
1155-
1156-
SecondsDecimal GetSecondsDecimalEnvVarOrDefault(opentelemetry::nostd::string_view signal_env,
1157-
opentelemetry::nostd::string_view generic_env,
1158-
SecondsDecimal default_value)
1159-
{
1160-
std::string value;
1161-
1162-
if (GetStringDualEnvVar(signal_env.data(), generic_env.data(), value))
1163-
{
1164-
return SecondsDecimal{std::strtof(value.c_str(), nullptr)};
1165-
}
1166-
1167-
return default_value;
1168-
}
1169-
11701156
std::uint32_t GetOtlpDefaultTracesRetryMaxAttempts()
11711157
{
11721158
constexpr char kSignalEnv[] = "OTEL_EXPORTER_OTLP_TRACES_RETRY_MAX_ATTEMPTS";
@@ -1192,42 +1178,42 @@ SecondsDecimal GetOtlpDefaultTracesRetryInitialBackoff()
11921178
{
11931179
constexpr char kSignalEnv[] = "OTEL_EXPORTER_OTLP_TRACES_RETRY_INITIAL_BACKOFF";
11941180
constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF";
1195-
return GetSecondsDecimalEnvVarOrDefault(kSignalEnv, kGenericEnv, SecondsDecimal{1.0});
1181+
return SecondsDecimal{GetFloatEnvVarOrDefault(kSignalEnv, kGenericEnv, 1.0)};
11961182
}
11971183

11981184
SecondsDecimal GetOtlpDefaultMetricsRetryInitialBackoff()
11991185
{
12001186
constexpr char kSignalEnv[] = "OTEL_EXPORTER_OTLP_METRICS_RETRY_INITIAL_BACKOFF";
12011187
constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF";
1202-
return GetSecondsDecimalEnvVarOrDefault(kSignalEnv, kGenericEnv, SecondsDecimal{1.0});
1188+
return SecondsDecimal{GetFloatEnvVarOrDefault(kSignalEnv, kGenericEnv, 1.0)};
12031189
}
12041190

12051191
SecondsDecimal GetOtlpDefaultLogsRetryInitialBackoff()
12061192
{
12071193
constexpr char kSignalEnv[] = "OTEL_EXPORTER_OTLP_LOGS_RETRY_INITIAL_BACKOFF";
12081194
constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_RETRY_INITIAL_BACKOFF";
1209-
return GetSecondsDecimalEnvVarOrDefault(kSignalEnv, kGenericEnv, SecondsDecimal{1.0});
1195+
return SecondsDecimal{GetFloatEnvVarOrDefault(kSignalEnv, kGenericEnv, 1.0)};
12101196
}
12111197

12121198
SecondsDecimal GetOtlpDefaultTracesRetryMaxBackoff()
12131199
{
12141200
constexpr char kSignalEnv[] = "OTEL_EXPORTER_OTLP_TRACES_RETRY_MAX_BACKOFF";
12151201
constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_RETRY_MAX_BACKOFF";
1216-
return GetSecondsDecimalEnvVarOrDefault(kSignalEnv, kGenericEnv, SecondsDecimal{5.0});
1202+
return SecondsDecimal{GetFloatEnvVarOrDefault(kSignalEnv, kGenericEnv, 5.0)};
12171203
}
12181204

12191205
SecondsDecimal GetOtlpDefaultMetricsRetryMaxBackoff()
12201206
{
12211207
constexpr char kSignalEnv[] = "OTEL_EXPORTER_OTLP_METRICS_RETRY_MAX_BACKOFF";
12221208
constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_RETRY_MAX_BACKOFF";
1223-
return GetSecondsDecimalEnvVarOrDefault(kSignalEnv, kGenericEnv, SecondsDecimal{5.0});
1209+
return SecondsDecimal{GetFloatEnvVarOrDefault(kSignalEnv, kGenericEnv, 5.0)};
12241210
}
12251211

12261212
SecondsDecimal GetOtlpDefaultLogsRetryMaxBackoff()
12271213
{
12281214
constexpr char kSignalEnv[] = "OTEL_EXPORTER_OTLP_LOGS_RETRY_MAX_BACKOFF";
12291215
constexpr char kGenericEnv[] = "OTEL_EXPORTER_OTLP_RETRY_MAX_BACKOFF";
1230-
return GetSecondsDecimalEnvVarOrDefault(kSignalEnv, kGenericEnv, SecondsDecimal{5.0});
1216+
return SecondsDecimal{GetFloatEnvVarOrDefault(kSignalEnv, kGenericEnv, 5.0)};
12311217
}
12321218

12331219
float GetOtlpDefaultTracesRetryBackoffMultiplier()

0 commit comments

Comments
 (0)