Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-19 06:28:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Instrument credits spent

Browse Source
This commit is contained in:
Jon Chambers
2026-01-28 17:00:52 -05:00
committed by ravi-signal
parent fb1c20582e
commit c69abb5200
3 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
service/src/main/java/org/whispersystems/textsecuregcm/telephony/hlrlookup/HlrLookupCarrierDataProvider.java
View File

@@ -20,6 +20,8 @@ import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService;
import javax.annotation.Nullable;
import io.micrometer.core.instrument.Metrics;
import io.micrometer.core.instrument.Tag;
import io.micrometer.core.instrument.Tags;
import org.apache.commons.lang3.StringUtils;
import org.whispersystems.textsecuregcm.http.FaultTolerantHttpClient;
import org.whispersystems.textsecuregcm.metrics.MetricsUtil;
@@ -42,6 +44,9 @@ public class HlrLookupCarrierDataProvider implements CarrierDataProvider {
private static final ObjectMapper OBJECT_MAPPER = SystemMapper.jsonMapper();
private static final String REQUEST_COUNTER_NAME = MetricsUtil.name(HlrLookupCarrierDataProvider.class, "request");
private static final String RESULT_COUNTER_NAME = MetricsUtil.name(HlrLookupCarrierDataProvider.class, "result");
private static final String CREDITS_SPENT_TAG_NAME = "creditsSpent";
public HlrLookupCarrierDataProvider(final String apiKey,
final String apiSecret,
@@ -126,9 +131,17 @@ public class HlrLookupCarrierDataProvider implements CarrierDataProvider {
final HlrLookupResult result = response.results().getFirst();
if (!result.error().equals("NONE")) {
Metrics.counter(RESULT_COUNTER_NAME, Tags.of(
Tag.of("error", result.error()),
getCreditsSpentTag(result)))
.increment();
throw new CarrierDataException("Received a per-number error: " + result.error());
}
Metrics.counter(RESULT_COUNTER_NAME, Tags.of(getCreditsSpentTag(result)))
.increment();
return getNetworkDetails(result)
.map(networkDetails -> new CarrierData(
networkDetails.name(),
@@ -137,6 +150,14 @@ public class HlrLookupCarrierDataProvider implements CarrierDataProvider {
mncFromMccMnc(networkDetails.mccmnc())));
}
private static Tag getCreditsSpentTag(final HlrLookupResult hlrLookupResult) {
// HLR Lookup's docs at https://www.hlrlookup.com/knowledge/full-api-result suggest:
//
// > Please parse the full float to 1 decimal place to allow for future changes (e.g. service which consumes 1.5 or
// > 0.5 credits).
return Tag.of(CREDITS_SPENT_TAG_NAME, "%.1f".formatted(hlrLookupResult.creditsSpent()));
}
@VisibleForTesting
static Optional<String> mccFromMccMnc(@Nullable final String mccMnc) {
// MCCs are always 3 digits

1
service/src/main/java/org/whispersystems/textsecuregcm/telephony/hlrlookup/HlrLookupResult.java
View File

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.annotation.JsonNaming;
@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
record HlrLookupResult(String error,
float creditsSpent,
String originalNetwork,
NetworkDetails originalNetworkDetails,
String currentNetwork,