Aqs sdk processinfo

buildSrc/src/main/java/com/google/firebase/gradle/plugins/FirebaseLibraryPlugin.kt

@@ -85,7 +85,7 @@ class FirebaseLibraryPlugin : BaseFirebaseLibraryPlugin() {
     android.testServer(FirebaseTestServer(project, firebaseLibrary.testLab, android))
     setupStaticAnalysis(project, firebaseLibrary)
     getIsPomValidTask(project, firebaseLibrary)
-    setupVersionCheckTasks(project, firebaseLibrary)
+    // setupVersionCheckTasks(project, firebaseLibrary)
     configurePublishing(project, firebaseLibrary, android)
   }
 

firebase-common/src/main/java/com/google/firebase/processinfo/ProcessDetails.java

@@ -0,0 +1,42 @@
+package com.google.firebase.processinfo;
+
+import androidx.annotation.NonNull;
+
+import com.google.auto.value.AutoValue;
+
+@AutoValue
+public abstract class ProcessDetails {
+    @NonNull
+    public abstract String getProcessName();
+
+    public abstract int getPid();
+
+    public abstract int getImportance();
+
+    public abstract boolean isDefaultProcess();
+
+    @NonNull
+    public static Builder builder() {
+        return new AutoValue_ProcessDetails
+                .Builder();
+    }
+
+    /** Builder for {@link ProcessDetails}. */
+    @AutoValue.Builder
+    public abstract static class Builder {
+        @NonNull
+        public abstract Builder setProcessName(@NonNull String processName);
+
+        @NonNull
+        public abstract Builder setPid(int pid);
+
+        @NonNull
+        public abstract Builder setImportance(int importance);
+
+        @NonNull
+        public abstract Builder setDefaultProcess(boolean isDefaultProcess);
+
+        @NonNull
+        public abstract ProcessDetails build();
+    }
+}

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/ProcessDetailsProvider.kt → firebase-common/src/main/java/com/google/firebase/processinfo/ProcessDetailsProvider.kt

@@ -14,20 +14,19 @@
  * limitations under the License.
  */
 
-package com.google.firebase.crashlytics.internal
+package com.google.firebase.processinfo
 
 import android.app.ActivityManager
 import android.content.Context
 import android.os.Build
 import android.os.Process
-import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.ProcessDetails
 
 /**
  * Provider of ProcessDetails.
  *
  * @hide
  */
-internal object ProcessDetailsProvider {
+object ProcessDetailsProvider {
   /** Gets the details of all running app processes. */
   fun getAppProcessDetails(context: Context): List<ProcessDetails> {
     val defaultProcessName = context.applicationInfo.processName

firebase-crashlytics/firebase-crashlytics.gradle

@@ -88,11 +88,11 @@ dependencies {
          exclude group: 'com.google.firebase', module: 'firebase-components'
      }
     implementation(libs.androidx.annotation)
-    implementation("com.google.firebase:firebase-common:20.4.2")
-    implementation("com.google.firebase:firebase-common-ktx:20.4.2")
+    implementation("com.google.firebase:firebase-common:20.4.3")
+    implementation("com.google.firebase:firebase-common-ktx:20.4.3")
     implementation("com.google.firebase:firebase-components:17.1.3")
     implementation("com.google.firebase:firebase-installations:17.2.0")
-    implementation("com.google.firebase:firebase-sessions:1.1.0") {
+    implementation(project(':firebase-sessions')) {
          exclude group: 'com.google.firebase', module: 'firebase-common'
          exclude group: 'com.google.firebase', module: 'firebase-components'
      }

firebase-crashlytics/src/androidTest/java/com/google/firebase/crashlytics/internal/persistence/CrashlyticsReportPersistenceTest.java

@@ -31,10 +31,11 @@
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution.Signal;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution.Thread.Frame;
-import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.ProcessDetails;
 import com.google.firebase.crashlytics.internal.settings.Settings;
 import com.google.firebase.crashlytics.internal.settings.Settings.FeatureFlagData;
 import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
+import com.google.firebase.processinfo.ProcessDetails;
+
 import java.io.IOException;
 import java.text.DecimalFormat;
 import java.util.ArrayList;

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/CrashlyticsRegistrar.java

@@ -69,6 +69,6 @@ private FirebaseCrashlytics buildCrashlytics(ComponentContainer container) {
     FirebaseSessions firebaseSessions = container.get(FirebaseSessions.class);
 
     return FirebaseCrashlytics.init(
-        app, firebaseInstallations, firebaseSessions, nativeComponent, analyticsConnector);
+        app, firebaseInstallations, nativeComponent, analyticsConnector);
   }
 }

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java

@@ -41,7 +41,7 @@
 import com.google.firebase.crashlytics.internal.settings.SettingsController;
 import com.google.firebase.inject.Deferred;
 import com.google.firebase.installations.FirebaseInstallationsApi;
-import com.google.firebase.sessions.FirebaseSessions;
+import com.google.firebase.sessions.api.FirebaseSessionsDependencies;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
@@ -64,7 +64,6 @@ public class FirebaseCrashlytics {
   static @Nullable FirebaseCrashlytics init(
       @NonNull FirebaseApp app,
       @NonNull FirebaseInstallationsApi firebaseInstallationsApi,
-      @NonNull FirebaseSessions firebaseSessions,
       @NonNull Deferred<CrashlyticsNativeComponent> nativeComponent,
       @NonNull Deferred<AnalyticsConnector> analyticsConnector) {
 
@@ -93,7 +92,7 @@ public class FirebaseCrashlytics {
 
     CrashlyticsAppQualitySessionsSubscriber sessionsSubscriber =
         new CrashlyticsAppQualitySessionsSubscriber(arbiter, fileStore);
-    firebaseSessions.register(sessionsSubscriber);
+    FirebaseSessionsDependencies.register(sessionsSubscriber);
 
     final CrashlyticsCore core =
         new CrashlyticsCore(

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsReportDataCapture.java

@@ -25,16 +25,17 @@
 import android.os.StatFs;
 import android.text.TextUtils;
 import com.google.firebase.crashlytics.BuildConfig;
-import com.google.firebase.crashlytics.internal.ProcessDetailsProvider;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Architecture;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution;
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.Execution.BinaryImage;
-import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event.Application.ProcessDetails;
 import com.google.firebase.crashlytics.internal.settings.SettingsProvider;
 import com.google.firebase.crashlytics.internal.stacktrace.StackTraceTrimmingStrategy;
 import com.google.firebase.crashlytics.internal.stacktrace.TrimmedThrowableData;
+import com.google.firebase.processinfo.ProcessDetails;
+import com.google.firebase.processinfo.ProcessDetailsProvider;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/CrashlyticsReport.java

@@ -23,6 +23,8 @@
 import com.google.firebase.encoders.annotations.Encodable;
 import com.google.firebase.encoders.annotations.Encodable.Field;
 import com.google.firebase.encoders.annotations.Encodable.Ignore;
+import com.google.firebase.processinfo.ProcessDetails;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.nio.charset.Charset;
@@ -962,43 +964,6 @@ public abstract static class Builder {
           }
         }
 
-        @AutoValue
-        public abstract static class ProcessDetails {
-          @NonNull
-          public abstract String getProcessName();
-
-          public abstract int getPid();
-
-          public abstract int getImportance();
-
-          public abstract boolean isDefaultProcess();
-
-          @NonNull
-          public static Builder builder() {
-            return new AutoValue_CrashlyticsReport_Session_Event_Application_ProcessDetails
-                .Builder();
-          }
-
-          /** Builder for {@link ProcessDetails}. */
-          @AutoValue.Builder
-          public abstract static class Builder {
-            @NonNull
-            public abstract Builder setProcessName(@NonNull String processName);
-
-            @NonNull
-            public abstract Builder setPid(int pid);
-
-            @NonNull
-            public abstract Builder setImportance(int importance);
-
-            @NonNull
-            public abstract Builder setDefaultProcess(boolean isDefaultProcess);
-
-            @NonNull
-            public abstract ProcessDetails build();
-          }
-        }
-
         /** Builder for {@link Application}. */
         @AutoValue.Builder
         public abstract static class Builder {

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/model/serialization/CrashlyticsReportJsonTransform.java

@@ -24,6 +24,8 @@
 import com.google.firebase.crashlytics.internal.model.CrashlyticsReport.Session.Event;
 import com.google.firebase.encoders.DataEncoder;
 import com.google.firebase.encoders.json.JsonDataEncoderBuilder;
+import com.google.firebase.processinfo.ProcessDetails;
+
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.ArrayList;
@@ -497,9 +499,9 @@ private static Event.Application parseEventApp(@NonNull JsonReader jsonReader)
   }
 
   @NonNull
-  private static Event.Application.ProcessDetails parseProcessDetails(
+  private static ProcessDetails parseProcessDetails(
       @NonNull JsonReader jsonReader) throws IOException {
-    Event.Application.ProcessDetails.Builder builder = Event.Application.ProcessDetails.builder();
+    ProcessDetails.Builder builder = ProcessDetails.builder();
 
     jsonReader.beginObject();
     while (jsonReader.hasNext()) {

firebase-perf/CHANGELOG.md

@@ -1,23 +1,18 @@
 # Unreleased
-
+* [changed] Make Fireperf generate its own session Id.
 
 # 20.5.0
 * [changed] Added Kotlin extensions (KTX) APIs from `com.google.firebase:firebase-perf-ktx`
   to `com.google.firebase:firebase-perf` under the `com.google.firebase.perf` package.
   For details, see the
   [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
+
 * [deprecated] All the APIs from `com.google.firebase:firebase-perf-ktx` have been added to
   `com.google.firebase:firebase-perf` under the `com.google.firebase.perf` package,
   and all the Kotlin extensions (KTX) APIs in `com.google.firebase:firebase-perf-ktx` are
   now deprecated. As early as April 2024, we'll no longer release KTX modules. For details, see the
   [FAQ about this initiative](https://firebase.google.com/docs/android/kotlin-migration)
 
-
-## Kotlin
-The Kotlin extensions library transitively includes the updated
-`firebase-performance` library. The Kotlin extensions library has no additional
-updates.
-
 # 20.4.1
 * [changed] Updated `firebase-sessions` dependency to v1.0.2
 * [fixed] Make fireperf data collection state is reliable for Firebase Sessions library.
@@ -369,4 +364,3 @@ updates.
 
 # 16.1.0
 * [fixed] Fixed a `SecurityException` crash on certain devices that do not have Google Play Services on them.
-

firebase-perf/firebase-perf.gradle

@@ -114,7 +114,7 @@ dependencies {
     implementation("com.google.firebase:firebase-components:17.1.3")
     implementation("com.google.firebase:firebase-config:21.5.0")
     implementation("com.google.firebase:firebase-installations:17.2.0")
-    implementation("com.google.firebase:firebase-sessions:1.1.0") {
+    implementation(project(':firebase-sessions')) {
          exclude group: 'com.google.firebase', module: 'firebase-common'
          exclude group: 'com.google.firebase', module: 'firebase-common-ktx'
          exclude group: 'com.google.firebase', module: 'firebase-components'

firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfEarly.java

@@ -15,17 +15,13 @@
 package com.google.firebase.perf;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.StartupTime;
 import com.google.firebase.perf.application.AppStateMonitor;
 import com.google.firebase.perf.config.ConfigResolver;
 import com.google.firebase.perf.metrics.AppStartTrace;
-import com.google.firebase.perf.session.PerfSession;
 import com.google.firebase.perf.session.SessionManager;
-import com.google.firebase.sessions.FirebaseSessions;
-import com.google.firebase.sessions.api.SessionSubscriber;
 import java.util.concurrent.Executor;
 
 /**
@@ -38,10 +34,7 @@
 public class FirebasePerfEarly {
 
   public FirebasePerfEarly(
-      FirebaseApp app,
-      FirebaseSessions firebaseSessions,
-      @Nullable StartupTime startupTime,
-      Executor uiExecutor) {
+      FirebaseApp app, @Nullable StartupTime startupTime, Executor uiExecutor) {
     Context context = app.getApplicationContext();
 
     // Initialize ConfigResolver early for accessing device caching layer.
@@ -58,31 +51,7 @@ public FirebasePerfEarly(
       uiExecutor.execute(new AppStartTrace.StartFromBackgroundRunnable(appStartTrace));
     }
 
-    // Register with Firebase sessions to receive updates about session changes.
-    firebaseSessions.register(
-        new SessionSubscriber() {
-          @Override
-          public void onSessionChanged(@NonNull SessionDetails sessionDetails) {
-            PerfSession perfSession = PerfSession.createWithId(sessionDetails.getSessionId());
-            SessionManager.getInstance().updatePerfSession(perfSession);
-          }
-
-          @Override
-          public boolean isDataCollectionEnabled() {
-            // If there is no cached config data available for data collection, be conservative.
-            // Return false.
-            if (!configResolver.isCollectionEnabledConfigValueAvailable()) {
-              return false;
-            }
-            return ConfigResolver.getInstance().isPerformanceMonitoringEnabled();
-          }
-
-          @NonNull
-          @Override
-          public Name getSessionSubscriberName() {
-            return SessionSubscriber.Name.PERFORMANCE;
-          }
-        });
+    // TODO: Bring back Firebase Sessions dependency to watch for updates to sessions.
 
     // In the case of cold start, we create a session and start collecting gauges as early as
     // possible.

firebase-perf/src/main/java/com/google/firebase/perf/FirebasePerfRegistrar.java

@@ -30,9 +30,6 @@
 import com.google.firebase.perf.injection.modules.FirebasePerformanceModule;
 import com.google.firebase.platforminfo.LibraryVersionComponent;
 import com.google.firebase.remoteconfig.RemoteConfigComponent;
-import com.google.firebase.sessions.FirebaseSessions;
-import com.google.firebase.sessions.api.FirebaseSessionsDependencies;
-import com.google.firebase.sessions.api.SessionSubscriber;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Executor;
@@ -50,10 +47,6 @@ public class FirebasePerfRegistrar implements ComponentRegistrar {
   private static final String LIBRARY_NAME = "fire-perf";
   private static final String EARLY_LIBRARY_NAME = "fire-perf-early";
 
-  static {
-    FirebaseSessionsDependencies.INSTANCE.addDependency(SessionSubscriber.Name.PERFORMANCE);
-  }
-
   @Override
   @Keep
   public List<Component<?>> getComponents() {
@@ -71,15 +64,13 @@ public List<Component<?>> getComponents() {
         Component.builder(FirebasePerfEarly.class)
             .name(EARLY_LIBRARY_NAME)
             .add(Dependency.required(FirebaseApp.class))
-            .add(Dependency.required(FirebaseSessions.class))
             .add(Dependency.optionalProvider(StartupTime.class))
             .add(Dependency.required(uiExecutor))
             .eagerInDefaultApp()
             .factory(
                 container ->
                     new FirebasePerfEarly(
                         container.get(FirebaseApp.class),
-                        container.get(FirebaseSessions.class),
                         container.getProvider(StartupTime.class).get(),
                         container.get(uiExecutor)))
             .build(),