Skip to content

Commit c1be5f9

Browse files
authored
Make default sampling rates for when RC fetch failed 1/1000 typical (#5071)
* Make default sampling rates for when RC fetch failed 1/1000 typical default * Fix tests * Change log message to warn and link to support
1 parent ad22aeb commit c1be5f9

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

firebase-perf/src/main/java/com/google/firebase/perf/config/ConfigurationConstants.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ protected Double getDefault() {
154154

155155
@Override
156156
protected Double getDefaultOnRcFetchFail() {
157-
// Reduce the typical default by 2 orders of magnitude.
158-
return getDefault() / 100;
157+
// Reduce the typical default by 3 orders of magnitude.
158+
return getDefault() / 1000;
159159
}
160160

161161
@Override
@@ -193,8 +193,8 @@ protected Double getDefault() {
193193

194194
@Override
195195
protected Double getDefaultOnRcFetchFail() {
196-
// Reduce the typical default by 2 orders of magnitude.
197-
return getDefault() / 100;
196+
// Reduce the typical default by 3 orders of magnitude.
197+
return getDefault() / 1000;
198198
}
199199

200200
@Override
@@ -579,8 +579,8 @@ protected Double getDefault() {
579579

580580
@Override
581581
protected Double getDefaultOnRcFetchFail() {
582-
// Reduce the typical default by 2 orders of magnitude.
583-
return getDefault() / 100;
582+
// Reduce the typical default by 3 orders of magnitude.
583+
return getDefault() / 1000;
584584
}
585585

586586
@Override

firebase-perf/src/main/java/com/google/firebase/perf/config/RemoteConfigManager.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,9 @@ private void triggerFirebaseRemoteConfigFetchAndActivateOnSuccessfulFetch() {
347347
.addOnFailureListener(
348348
executor,
349349
ex -> {
350-
logger.debug("Remote config fetch failed: %s", ex);
350+
logger.warn(
351+
"Call to Remote Config failed: %s. This may cause a degraded experience with Firebase Performance. Please reach out to Firebase Support https://firebase.google.com/support/",
352+
ex);
351353
firebaseRemoteConfigLastFetchTimestampMs = FETCH_NEVER_HAPPENED_TIMESTAMP_MS;
352354
});
353355
}

firebase-perf/src/test/java/com/google/firebase/perf/config/ConfigResolverTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1685,7 +1685,7 @@ public void getTraceSamplingRate_remoteConfigFetchFailed_returnsRCFailureDefault
16851685
.thenReturn(Optional.absent());
16861686
when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(true);
16871687

1688-
assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(1.00 / 100);
1688+
assertThat(testConfigResolver.getTraceSamplingRate()).isEqualTo(1.00 / 1000);
16891689
}
16901690

16911691
@Test
@@ -1757,7 +1757,7 @@ public void getNetworkRequestSamplingRate_remoteConfigFetchFailed_returnsRCFailu
17571757
.thenReturn(Optional.absent());
17581758
when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(true);
17591759

1760-
assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(1.00 / 100);
1760+
assertThat(testConfigResolver.getNetworkRequestSamplingRate()).isEqualTo(1.00 / 1000);
17611761
}
17621762

17631763
@Test
@@ -1989,7 +1989,7 @@ public void getSessionsSamplingRate_remoteConfigFetchFailed_returnsRCFailureDefa
19891989
.thenReturn(Optional.absent());
19901990
when(mockRemoteConfigManager.isLastFetchFailed()).thenReturn(true);
19911991

1992-
assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01 / 100);
1992+
assertThat(testConfigResolver.getSessionsSamplingRate()).isEqualTo(0.01 / 1000);
19931993
}
19941994

19951995
@Test

firebase-perf/src/test/java/com/google/firebase/perf/config/ConfigurationConstantsTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public void getInstance_TraceSamplingRate_validateConstants() {
155155
TraceSamplingRate configFlag = TraceSamplingRate.getInstance();
156156

157157
assertThat(configFlag.getDefault()).isEqualTo(1.00);
158-
assertThat(configFlag.getDefaultOnRcFetchFail()).isEqualTo(0.01);
158+
assertThat(configFlag.getDefaultOnRcFetchFail()).isEqualTo(0.001);
159159
assertThat(configFlag.getDeviceCacheFlag())
160160
.isEqualTo("com.google.firebase.perf.TraceSamplingRate");
161161
assertThat(configFlag.getRemoteConfigFlag()).isEqualTo("fpr_vc_trace_sampling_rate");
@@ -167,7 +167,7 @@ public void getInstance_NetworkRequestSamplingRate_validateConstants() {
167167
NetworkRequestSamplingRate configFlag = NetworkRequestSamplingRate.getInstance();
168168

169169
assertThat(configFlag.getDefault()).isEqualTo(1.00);
170-
assertThat(configFlag.getDefaultOnRcFetchFail()).isEqualTo(0.01);
170+
assertThat(configFlag.getDefaultOnRcFetchFail()).isEqualTo(0.001);
171171
assertThat(configFlag.getDeviceCacheFlag())
172172
.isEqualTo("com.google.firebase.perf.NetworkRequestSamplingRate");
173173
assertThat(configFlag.getRemoteConfigFlag()).isEqualTo("fpr_vc_network_request_sampling_rate");
@@ -179,7 +179,7 @@ public void getInstance_SessionsSamplingRate_validateConstants() {
179179
SessionsSamplingRate configFlag = SessionsSamplingRate.getInstance();
180180

181181
assertThat(configFlag.getDefault()).isEqualTo(0.01);
182-
assertThat(configFlag.getDefaultOnRcFetchFail()).isEqualTo(0.0001);
182+
assertThat(configFlag.getDefaultOnRcFetchFail()).isEqualTo(0.00001);
183183
assertThat(configFlag.getDeviceCacheFlag())
184184
.isEqualTo("com.google.firebase.perf.SessionSamplingRate");
185185
assertThat(configFlag.getRemoteConfigFlag()).isEqualTo("fpr_vc_session_sampling_rate");

0 commit comments

Comments
 (0)