Skip to content

Move all the gauges related classes to its own package. #2534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 24, 2021
Merged

Move all the gauges related classes to its own package. #2534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36b7440
Move all the gauges related classes to its own package.
visumickey Mar 23, 2021
3f6b069
Updated tests.
visumickey Mar 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerformance.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import com.google.firebase.perf.metrics.HttpMetric;
import com.google.firebase.perf.metrics.Trace;
import com.google.firebase.perf.metrics.validator.PerfMetricValidator;
import com.google.firebase.perf.session.GaugeManager;
import com.google.firebase.perf.session.gauges.GaugeManager;
import com.google.firebase.perf.transport.TransportManager;
import com.google.firebase.perf.util.Constants;
import com.google.firebase.perf.util.ImmutableBundle;
Expand Down
2 changes: 1 addition & 1 deletion ...f/src/main/java/com/google/firebase/perf/injection/modules/FirebasePerformanceModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import com.google.firebase.perf.FirebasePerformance;
import com.google.firebase.perf.config.ConfigResolver;
import com.google.firebase.perf.config.RemoteConfigManager;
import com.google.firebase.perf.session.GaugeManager;
import com.google.firebase.perf.session.gauges.GaugeManager;
import com.google.firebase.remoteconfig.RemoteConfigComponent;
import dagger.Module;
import dagger.Provides;
Expand Down
2 changes: 1 addition & 1 deletion ...base-perf/src/main/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
import com.google.firebase.perf.application.AppStateMonitor;
import com.google.firebase.perf.application.AppStateUpdateHandler;
import com.google.firebase.perf.logging.AndroidLogger;
import com.google.firebase.perf.session.GaugeManager;
import com.google.firebase.perf.session.PerfSession;
import com.google.firebase.perf.session.SessionAwareObject;
import com.google.firebase.perf.session.SessionManager;
import com.google.firebase.perf.session.gauges.GaugeManager;
import com.google.firebase.perf.transport.TransportManager;
import com.google.firebase.perf.util.Constants;
import com.google.firebase.perf.util.Timer;
Expand Down
2 changes: 1 addition & 1 deletion firebase-perf/src/main/java/com/google/firebase/perf/metrics/Trace.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
import com.google.firebase.perf.config.ConfigResolver;
import com.google.firebase.perf.logging.AndroidLogger;
import com.google.firebase.perf.metrics.validator.PerfMetricValidator;
import com.google.firebase.perf.session.GaugeManager;
import com.google.firebase.perf.session.PerfSession;
import com.google.firebase.perf.session.SessionAwareObject;
import com.google.firebase.perf.session.SessionManager;
import com.google.firebase.perf.session.gauges.GaugeManager;
import com.google.firebase.perf.transport.TransportManager;
import com.google.firebase.perf.util.Clock;
import com.google.firebase.perf.util.Constants;
Expand Down
1 change: 1 addition & 0 deletions firebase-perf/src/main/java/com/google/firebase/perf/session/SessionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.google.android.gms.common.util.VisibleForTesting;
import com.google.firebase.perf.application.AppStateMonitor;
import com.google.firebase.perf.application.AppStateUpdateHandler;
import com.google.firebase.perf.session.gauges.GaugeManager;
import com.google.firebase.perf.v1.ApplicationProcessState;
import com.google.firebase.perf.v1.GaugeMetadata;
import com.google.firebase.perf.v1.GaugeMetric;
Expand Down
2 changes: 1 addition & 1 deletion ...session/collectors/CpuGaugeCollector.java → ...erf/session/gauges/CpuGaugeCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.firebase.perf.session.collectors;
package com.google.firebase.perf.session.gauges;

import static android.system.Os.sysconf;

Expand Down
7 changes: 3 additions & 4 deletions ...e/firebase/perf/session/GaugeManager.java → ...ase/perf/session/gauges/GaugeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,15 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.firebase.perf.session;
package com.google.firebase.perf.session.gauges;

import android.content.Context;
import androidx.annotation.Keep;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import com.google.firebase.perf.config.ConfigResolver;
import com.google.firebase.perf.logging.AndroidLogger;
import com.google.firebase.perf.session.collectors.CpuGaugeCollector;
import com.google.firebase.perf.session.collectors.MemoryGaugeCollector;
import com.google.firebase.perf.session.PerfSession;
import com.google.firebase.perf.transport.TransportManager;
import com.google.firebase.perf.util.Timer;
import com.google.firebase.perf.v1.AndroidMemoryReading;
Expand Down Expand Up @@ -253,7 +252,7 @@ private void syncFlush(String sessionId, ApplicationProcessState appState) {
* @param appState The {@link ApplicationProcessState} for which these gauges are collected.
* @return true if GaugeMetadata was logged, false otherwise.
*/
boolean logGaugeMetadata(String sessionId, ApplicationProcessState appState) {
public boolean logGaugeMetadata(String sessionId, ApplicationProcessState appState) {
if (gaugeMetadataManager != null) {
GaugeMetric gaugeMetric =
GaugeMetric.newBuilder()
Expand Down
2 changes: 1 addition & 1 deletion ...se/perf/session/GaugeMetadataManager.java → .../session/gauges/GaugeMetadataManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.firebase.perf.session;
package com.google.firebase.perf.session.gauges;

import android.app.ActivityManager;
import android.app.ActivityManager.MemoryInfo;
Expand Down
2 changes: 1 addition & 1 deletion ...sion/collectors/MemoryGaugeCollector.java → .../session/gauges/MemoryGaugeCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.firebase.perf.session.collectors;
package com.google.firebase.perf.session.gauges;

import android.annotation.SuppressLint;
import androidx.annotation.Nullable;
Expand Down
18 changes: 18 additions & 0 deletions firebase-perf/src/main/java/com/google/firebase/perf/session/gauges/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Copyright 2021 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

/** @hide */
/** @hide */
package com.google.firebase.perf.session.gauges;

2 changes: 1 addition & 1 deletion firebase-perf/src/test/java/com/google/firebase/perf/FirebasePerformanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import com.google.firebase.perf.config.ConfigResolver;
import com.google.firebase.perf.config.DeviceCacheManager;
import com.google.firebase.perf.config.RemoteConfigManager;
import com.google.firebase.perf.session.GaugeManager;
import com.google.firebase.perf.session.gauges.GaugeManager;
import com.google.firebase.perf.util.Constants;
import com.google.firebase.perf.util.ImmutableBundle;
import com.google.firebase.remoteconfig.RemoteConfigComponent;
Expand Down
2 changes: 1 addition & 1 deletion firebase-perf/src/test/java/com/google/firebase/perf/application/AppStateMonitorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import com.google.firebase.perf.config.DeviceCacheManager;
import com.google.firebase.perf.metrics.NetworkRequestMetricBuilder;
import com.google.firebase.perf.metrics.Trace;
import com.google.firebase.perf.session.GaugeManager;
import com.google.firebase.perf.session.gauges.GaugeManager;
import com.google.firebase.perf.transport.TransportManager;
import com.google.firebase.perf.util.Clock;
import com.google.firebase.perf.util.Constants;
Expand Down
2 changes: 1 addition & 1 deletion ...-perf/src/test/java/com/google/firebase/perf/metrics/NetworkRequestMetricBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

import com.google.firebase.perf.FirebasePerformanceTestBase;
import com.google.firebase.perf.application.AppStateMonitor;
import com.google.firebase.perf.session.GaugeManager;
import com.google.firebase.perf.session.PerfSession;
import com.google.firebase.perf.session.SessionManager;
import com.google.firebase.perf.session.gauges.GaugeManager;
import com.google.firebase.perf.transport.TransportManager;
import com.google.firebase.perf.util.Constants;
import com.google.firebase.perf.util.Timer;
Expand Down
2 changes: 1 addition & 1 deletion firebase-perf/src/test/java/com/google/firebase/perf/metrics/TraceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
import com.google.firebase.perf.application.AppStateMonitor;
import com.google.firebase.perf.config.ConfigResolver;
import com.google.firebase.perf.config.DeviceCacheManager;
import com.google.firebase.perf.session.GaugeManager;
import com.google.firebase.perf.session.PerfSession;
import com.google.firebase.perf.session.SessionManager;
import com.google.firebase.perf.session.gauges.GaugeManager;
import com.google.firebase.perf.transport.TransportManager;
import com.google.firebase.perf.util.Clock;
import com.google.firebase.perf.util.Constants;
Expand Down
1 change: 1 addition & 0 deletions firebase-perf/src/test/java/com/google/firebase/perf/session/SessionManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

import com.google.firebase.perf.FirebasePerformanceTestBase;
import com.google.firebase.perf.application.AppStateMonitor;
import com.google.firebase.perf.session.gauges.GaugeManager;
import com.google.firebase.perf.v1.ApplicationProcessState;
import java.lang.ref.WeakReference;
import org.junit.Before;
Expand Down
4 changes: 2 additions & 2 deletions ...ion/collectors/CpuGaugeCollectorTest.java → ...session/gauges/CpuGaugeCollectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.firebase.perf.session.collectors;
package com.google.firebase.perf.session.gauges;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;
Expand All @@ -34,7 +34,7 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.shadows.ShadowEnvironment;

/** Unit tests for {@link com.google.firebase.perf.session.collectors.CpuGaugeCollector} */
/** Unit tests for {@link com.google.firebase.perf.session.gauges.CpuGaugeCollector} */
@RunWith(RobolectricTestRunner.class)
public final class CpuGaugeCollectorTest {
private static final long MICROSECONDS_PER_SECOND = TimeUnit.SECONDS.toMicros(1);
Expand Down
7 changes: 3 additions & 4 deletions ...rebase/perf/session/GaugeManagerTest.java → ...perf/session/gauges/GaugeManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.firebase.perf.session;
package com.google.firebase.perf.session.gauges;

import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.eq;
Expand All @@ -28,8 +28,7 @@

import com.google.firebase.perf.FirebasePerformanceTestBase;
import com.google.firebase.perf.config.ConfigResolver;
import com.google.firebase.perf.session.collectors.CpuGaugeCollector;
import com.google.firebase.perf.session.collectors.MemoryGaugeCollector;
import com.google.firebase.perf.session.PerfSession;
import com.google.firebase.perf.transport.TransportManager;
import com.google.firebase.perf.util.Clock;
import com.google.firebase.perf.util.Timer;
Expand All @@ -48,7 +47,7 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;

/** Unit tests for {@link GaugeManager} */
/** Unit tests for {@link com.google.firebase.perf.session.gauges.GaugeManager} */
@RunWith(RobolectricTestRunner.class)
public final class GaugeManagerTest extends FirebasePerformanceTestBase {

Expand Down
4 changes: 2 additions & 2 deletions ...erf/session/GaugeMetadataManagerTest.java → ...sion/gauges/GaugeMetadataManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.firebase.perf.session;
package com.google.firebase.perf.session.gauges;

import static com.google.common.truth.Truth.assertThat;
import static java.nio.charset.StandardCharsets.UTF_8;
Expand Down Expand Up @@ -41,7 +41,7 @@
import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowEnvironment;

/** Unit tests for {@link com.google.firebase.perf.session.GaugeMetadataManager} */
/** Unit tests for {@link com.google.firebase.perf.session.gauges.GaugeMetadataManager} */
@RunWith(RobolectricTestRunner.class)
public class GaugeMetadataManagerTest extends FirebasePerformanceTestBase {

Expand Down
4 changes: 2 additions & 2 deletions .../collectors/MemoryGaugeCollectorTest.java → ...sion/gauges/MemoryGaugeCollectorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.firebase.perf.session.collectors;
package com.google.firebase.perf.session.gauges;

import static com.google.common.truth.Truth.assertThat;
import static org.mockito.MockitoAnnotations.initMocks;
Expand All @@ -29,7 +29,7 @@
import org.mockito.Mock;
import org.robolectric.RobolectricTestRunner;

/** Unit tests for {@link com.google.firebase.perf.session.collectors.MemoryGaugeCollector} */
/** Unit tests for {@link com.google.firebase.perf.session.gauges.MemoryGaugeCollector} */
@RunWith(RobolectricTestRunner.class)
public class MemoryGaugeCollectorTest {

Expand Down