Release v7.6.12 (#430)

1. Adding Session Replay Functionality for Jetpack Compose.
2. Fixed Session Replay Bugs
3. This is the public preview of session replay

Author: ywang-nr

agent/build.gradle

@@ -1,3 +1,4 @@
+
 /*
  * Copyright (c) 2022 - present. New Relic Corporation. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
@@ -9,6 +10,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 plugins {
     id("com.github.johnrengelman.shadow")
     id("com.android.library")
+    id("org.jetbrains.kotlin.android")
 }
 
 apply from: "$project.rootDir/jacoco.gradle"
@@ -23,6 +25,15 @@ tasks.withType(JavaExec).configureEach {
     }
 }
 
+
+
+
+sourceSets {
+    main.java.srcDirs += 'src/main/kotlin'
+    main.resources.srcDirs += 'src/main/kotlin'
+
+}
+
 android {
     namespace "com.newrelic.agent.android"
     compileSdkVersion project.versions.agp.compileSdk
@@ -31,6 +42,13 @@ android {
         minSdkVersion project.versions.agp.minSdk
         targetSdkVersion project.versions.agp.targetSdk
     }
+    buildFeatures { // Enables Jetpack Compose for this module
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion versions.composeCompiler
+    }
+
 
     buildTypes {
         release {
@@ -103,12 +121,13 @@ android {
 dependencies {
     implementation project(path: ':agent-core', configuration: 'fat')
     implementation( 'com.squareup.curtains:curtains:1.2.5')
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:${versions.java.kotlin}")
 
     compileOnly fileTree(dir: 'libs', include: '*.jar')
     compileOnly newrelic.deps.ndk
 
     compileOnly "androidx.navigation:navigation-compose:${project.versions.jetpack}"
-
+    compileOnly "androidx.compose.ui:ui:${project.versions.composeui}"
     testImplementation project(path: ':agent-core', configuration: 'fat')
     testImplementation fileTree(dir: 'libs', include: '*.jar')
     testImplementation newrelic.deps.ndk
@@ -128,9 +147,17 @@ def toFatJarTask(def variant) {
     def unshadedJarProvider = project.tasks.register("unshadedJar${variant.name.capitalize()}", Jar) {
         dependsOn variant.runtimeConfiguration
         dependsOn variant.getJavaCompileProvider()
+        // Add dependency on Kotlin compilation if available
+        if (project.hasProperty('kotlin')) {
+            dependsOn "compile${variant.name.capitalize()}Kotlin"
+        }
         archiveClassifier = "u"
         include("**/GsonInstrumentation*")
         from variant.getJavaCompileProvider().get().destinationDir
+        // Include Kotlin compiled classes
+        if (project.hasProperty('kotlin')) {
+            from "$buildDir/tmp/kotlin-classes/${variant.name}"
+        }
         from {
             variant.runtimeConfiguration.collect { it.isDirectory() ? it : zipTree(it) }
         }
@@ -139,8 +166,16 @@ def toFatJarTask(def variant) {
     def shadedJarProvider = project.tasks.register("shadedJar${variant.name.capitalize()}", ShadowJar) {
         dependsOn variant.runtimeConfiguration
         dependsOn variant.getJavaCompileProvider()
+        // Add dependency on Kotlin compilation if available
+        if (project.hasProperty('kotlin')) {
+            dependsOn "compile${variant.name.capitalize()}Kotlin"
+        }
         archiveClassifier = "s"
         from variant.getJavaCompileProvider().get().destinationDir
+        // Include Kotlin compiled classes
+        if (project.hasProperty('kotlin')) {
+            from "$buildDir/tmp/kotlin-classes/${variant.name}"
+        }
         from {
             variant.runtimeConfiguration.collect { it.isDirectory() ? it : zipTree(it) }
         }

agent/src/main/java/com/newrelic/agent/android/AndroidAgentImpl.java

@@ -759,7 +759,12 @@ public void setLocation(String countryCode, String adminRegion) {
      * a Location to a country and region code.
      *
      * @param location An android.location.Location
+     * @deprecated This method is deprecated due to reliance on Geocoder which may fail or be unavailable.
+     *             Use {@link #setLocation(String, String)} instead to directly provide country code and
+     *             administrative region. This allows for more reliable location tracking without
+     *             dependency on the Geocoder service.
      */
+    @Deprecated
     public void setLocation(Location location) {
         if (location == null) {
             throw new IllegalArgumentException("Location must not be null.");

agent/src/main/java/com/newrelic/agent/android/sessionReplay/ImageCompressionUtils.java

@@ -0,0 +1,84 @@
+package com.newrelic.agent.android.sessionReplay;
+
+import android.annotation.SuppressLint;
+import android.graphics.Bitmap;
+import android.os.Build;
+import android.util.Base64;
+import android.util.Log;
+
+import androidx.annotation.WorkerThread;
+
+import java.io.ByteArrayOutputStream;
+
+/**
+ * Utility class for image compression and conversion operations
+ * Used by both SessionReplayImageViewThingy and ComposeImageThingy
+ */
+public class ImageCompressionUtils {
+    private static final String LOG_TAG = "ImageCompressionUtils";
+    private static final int DEFAULT_WEBP_QUALITY = 10;
+
+    /**
+     * Converts a bitmap to a Base64 encoded string with WEBP compression
+     * @param bitmap The bitmap to convert
+     * @return Base64 encoded image data or null if conversion fails
+     */
+    @WorkerThread
+    public static String bitmapToBase64(Bitmap bitmap) {
+        return bitmapToBase64(bitmap, DEFAULT_WEBP_QUALITY);
+    }
+
+    /**
+     * Converts a bitmap to a Base64 encoded string with WEBP compression
+     * @param bitmap The bitmap to convert
+     * @param quality The compression quality (0-100)
+     * @return Base64 encoded image data or null if conversion fails
+     */
+    @WorkerThread
+    public static String bitmapToBase64(Bitmap bitmap, int quality) {
+
+        Bitmap bitmapCopy;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && bitmap.getConfig() == Bitmap.Config.HARDWARE) {
+            bitmapCopy = bitmap;
+        } else {
+            bitmapCopy = bitmap.copy(Bitmap.Config.ARGB_8888, false);
+        }
+
+        try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
+            try {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    bitmapCopy.compress(Bitmap.CompressFormat.WEBP_LOSSY, quality, byteArrayOutputStream);
+                } else {
+                    @SuppressWarnings("deprecation")
+                    Bitmap.CompressFormat format = Bitmap.CompressFormat.WEBP;
+                    bitmapCopy.compress(format, quality, byteArrayOutputStream);
+                }
+
+                byte[] byteArray = byteArrayOutputStream.toByteArray();
+                return Base64.encodeToString(byteArray, Base64.NO_WRAP);
+            } catch (Exception e) {
+                Log.e(LOG_TAG, "Error converting bitmap to Base64", e);
+                return null;
+            }
+        } catch (Exception ignored) {
+            // Ignore cleanup errors
+        } finally {
+            if (bitmapCopy != null && bitmapCopy != bitmap) {
+                bitmapCopy.recycle();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Converts Base64 image data to a data URL for use in CSS or HTML
+     * @param base64Data The Base64 encoded image data
+     * @return A data URL string or null if input is null
+     */
+    public static String toImageDataUrl(String base64Data) {
+        if (base64Data != null) {
+            return "data:image/webp;base64," + base64Data;
+        }
+        return null;
+    }
+}

agent/src/main/java/com/newrelic/agent/android/sessionReplay/IncrementalDiffGenerator.java

@@ -18,6 +18,8 @@ public class IncrementalDiffGenerator {
     static class Symbol {
         boolean inNew;
         Integer indexInOld;
+        int occurrencesInOld = 0;
+        int occurrencesInNew = 0;
 
         Symbol(boolean inNew, Integer indexInOld) {
             this.inNew = inNew;
@@ -172,8 +174,12 @@ public static List<Operation> generateDiff(List<SessionReplayViewThingyInterface
 
         // Pass One: Each element of the New array is gone through, and an entry in the table made for each
         for (SessionReplayViewThingyInterface item : newList) {
-            Symbol entry = new Symbol(true);
-            table.put(item.getViewId(), entry);
+            Symbol entry = table.get(item.getViewId());
+            if (entry == null) {
+                entry = new Symbol(true);
+                table.put(item.getViewId(), entry);
+            }
+            entry.occurrencesInNew++;
             newArrayEntries.add(Entry.symbol(entry));
         }
 
@@ -186,8 +192,12 @@ public static List<Operation> generateDiff(List<SessionReplayViewThingyInterface
                 table.put(item.getViewId(), entry);
             } else {
                 entry = table.get(item.getViewId());
-                entry.indexInOld = index;
+                // Only set indexInOld if this is the first occurrence
+                if (entry.occurrencesInOld == 0) {
+                    entry.indexInOld = index;
+                }
             }
+            entry.occurrencesInOld++;
 
             oldArrayEntries.add(Entry.symbol(entry));
         }
@@ -197,7 +207,9 @@ public static List<Operation> generateDiff(List<SessionReplayViewThingyInterface
         // the two
         for (int index = 0; index < newArrayEntries.size(); index++) {
             Entry item = newArrayEntries.get(index);
-            if (item.isSymbol && item.symbol.inNew && item.symbol.indexInOld != null) {
+            // Only match if element appears exactly once in both old AND new
+            if (item.isSymbol && item.symbol.inNew && item.symbol.indexInOld != null
+                    && item.symbol.occurrencesInOld == 1 && item.symbol.occurrencesInNew == 1) {
                 newArrayEntries.set(index, Entry.index(item.symbol.indexInOld));
                 oldArrayEntries.set(item.symbol.indexInOld, Entry.index(index));
             }
@@ -251,7 +263,7 @@ public static List<Operation> generateDiff(List<SessionReplayViewThingyInterface
             deleteOffsets[index] = runningOffset;
             Entry entry = oldArrayEntries.get(index);
             if (entry.isSymbol) {
-                changes.add(Operation.remove(new Operation.RemoveChange(old.get(index).getViewDetails().parentId, old.get(index).getViewId())));
+                changes.add(Operation.remove(new Operation.RemoveChange(old.get(index).getParentViewId(), old.get(index).getViewId())));
                 runningOffset++;
             }
         }
@@ -262,7 +274,7 @@ public static List<Operation> generateDiff(List<SessionReplayViewThingyInterface
         for (int index = 0; index < newArrayEntries.size(); index++) {
             Entry entry = newArrayEntries.get(index);
             if (entry.isSymbol) {
-                changes.add(Operation.add(new Operation.AddChange(newList.get(index).getViewDetails().parentId, newList.get(index).getViewId(), newList.get(index))));
+                changes.add(Operation.add(new Operation.AddChange(newList.get(index).getParentViewId(), newList.get(index).getViewId(), newList.get(index))));
                 runningOffset++;
             } else {
                 int indexInOld = entry.index;
@@ -273,10 +285,11 @@ public static List<Operation> generateDiff(List<SessionReplayViewThingyInterface
                 if ((indexInOld - deleteOffset + runningOffset) != index) {
                     // If this doesn't get us back to where we currently are, then
                     // the thing was moved
-                    changes.add(Operation.remove(new Operation.RemoveChange(newElement.getViewDetails().parentId, newElement.getViewId())));
-                    changes.add(Operation.add(new Operation.AddChange(newElement.getViewDetails().parentId, newElement.getViewId(), newElement)));
+                    changes.add(Operation.remove(new Operation.RemoveChange(newElement.getParentViewId(), newElement.getViewId())));
+                    changes.add(Operation.add(new Operation.AddChange(newElement.getParentViewId(), newElement.getViewId(), newElement)));
                 } else if (newElement.getClass() == oldElement.getClass()) {
-                    if (newElement.hashCode() != oldElement.hashCode()) {
+                    // Use the hasChanged method from Diffable interface instead of hashCode
+                    if (newElement.hasChanged(oldElement)) {
                         changes.add(Operation.update(new Operation.UpdateChange(oldElement, newElement)));
                     }
                 }

agent/src/main/java/com/newrelic/agent/android/sessionReplay/NewRelicIdGenerator.java

@@ -4,18 +4,36 @@
 
 import android.util.Log;
 
+import java.util.concurrent.atomic.AtomicInteger;
+
 public class NewRelicIdGenerator {
 
     private static final String TAG = "NewRelicIdGenerator";
 
-     // This is a simple counter to generate unique IDs.
-     // In a real-world scenario, you might want to use a more robust method to ensure uniqueness,
-     // especially in a multi-threaded environment.
-     // For example, you could use AtomicInteger or UUIDs.
-    static int counter = 0;
 
-     static int generateId() {
-         Log.d(TAG, "generateId: " + counter);
-        return counter++;
+    /**
+     * ID offset to avoid collision with Compose SemanticsNode IDs.
+     * SemanticsNode IDs start at 0 and increment, so we offset our generated IDs
+     * to a high value (1,000,000) to ensure no overlap between traditional View IDs
+     * and Compose node IDs in the same screen.
+     */
+    private static final int ID_OFFSET = 1_000_000;
+
+    /**
+     * Counter for generating unique IDs for traditional Android Views.
+     * Starts at ID_OFFSET to avoid collision with Compose SemanticsNode IDs (which start at 0).
+     *
+     * Note: This is a simple counter. In a multi-threaded environment, consider using AtomicInteger
+     * for thread-safety, though current usage via setTag/getTag on views is typically main-thread only.
+     */
+    private static final AtomicInteger counter = new AtomicInteger(ID_OFFSET);
+
+    /**
+     * Generates a unique ID for traditional Android Views that won't collide with Compose SemanticsNode IDs.
+     *
+     * @return A unique ID starting from 1,000,000 to avoid collision with Compose IDs (0-999,999 range)
+     */
+    public static int generateId() {
+        return  counter.getAndIncrement();
     }
 }