Skip to content

Commit 39c062b

Browse files
authored
Enable global custom attributes on Network Requests (#3399)
1 parent 5bbd6be commit 39c062b

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

firebase-perf/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ Refer [GMaven](https://maven.google.com/web/index.html?q=firebase-perf#com.googl
2020
> **Note:** Refer go/firebase-android-release for `MXX` info.
2121
2222
## Unreleased
23+
* {{feature}} Enable global custom attributes on Network Requests
24+
* {{fixed}} Update log statement to differentiate event drop because of rate limiting and sampling.
2325

2426
## Released
2527

firebase-perf/src/main/java/com/google/firebase/perf/transport/TransportManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ private PerfMetric setApplicationInfoAndBuild(
502502
ApplicationInfo.Builder appInfoBuilder =
503503
applicationInfoBuilder.setApplicationProcessState(appState);
504504

505-
if (perfMetricBuilder.hasTraceMetric()) {
505+
if (perfMetricBuilder.hasTraceMetric() || perfMetricBuilder.hasNetworkRequestMetric()) {
506506
appInfoBuilder =
507507
appInfoBuilder
508508
.clone() // Needed so that we don't add global custom attributes everywhere

firebase-perf/src/test/java/com/google/firebase/perf/transport/TransportManagerTest.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ public void logTraceMetric_globalCustomAttributesAreAdded() {
11191119
}
11201120

11211121
@Test
1122-
public void logNetworkMetric_globalCustomAttributesAreNotAdded() {
1122+
public void logNetworkMetric_globalCustomAttributesAreAdded() {
11231123
FirebasePerformance.getInstance().putAttribute("test_key1", "test_value1");
11241124
FirebasePerformance.getInstance().putAttribute("test_key2", "test_value2");
11251125
NetworkRequestMetric validNetworkRequest = createValidNetworkRequestMetric();
@@ -1131,7 +1131,12 @@ public void logNetworkMetric_globalCustomAttributesAreNotAdded() {
11311131
assertThat(loggedPerfMetric.getNetworkRequestMetric()).isEqualTo(validNetworkRequest);
11321132
validateApplicationInfo(
11331133
loggedPerfMetric, ApplicationProcessState.APPLICATION_PROCESS_STATE_UNKNOWN);
1134-
assertThat(loggedPerfMetric.getApplicationInfo().getCustomAttributesCount()).isEqualTo(0);
1134+
1135+
Map<String, String> globalCustomAttributes =
1136+
loggedPerfMetric.getApplicationInfo().getCustomAttributesMap();
1137+
assertThat(globalCustomAttributes).hasSize(2);
1138+
assertThat(globalCustomAttributes).containsEntry("test_key1", "test_value1");
1139+
assertThat(globalCustomAttributes).containsEntry("test_key2", "test_value2");
11351140
}
11361141

11371142
@Test

0 commit comments

Comments
 (0)