Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2935b99 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Handle new location config proto field 

Bug: 356347453
Test: atest InternalTests:com.android.internal.protolog.PerfettoProtoLogImplTes
Flag: android.tracing.perfetto_protolog_tracing
Change-Id: I302eb151c79dc64f0649bb08ef639ea5d53f21b3
parent cc76d06b

core/java/com/android/internal/protolog/PerfettoProtoLogImpl.java

+3 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.Gro 
import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.MESSAGES;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.MessageData.GROUP_ID;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.MessageData.LEVEL;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.MessageData.LOCATION;

import static android.internal.perfetto.protos.Protolog.ProtoLogViewerConfig.MessageData.MESSAGE;

import static android.internal.perfetto.protos.TracePacketOuterClass.TracePacket.INTERNED_DATA;

import static android.internal.perfetto.protos.TracePacketOuterClass.TracePacket.PROTOLOG_MESSAGE;
@@ -449,6 +450,8 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto 
                case (int) GROUP_ID:

                    os.write(GROUP_ID, pis.readInt(GROUP_ID));

                    break;

                case (int) LOCATION:

                    os.write(LOCATION, pis.readInt(LOCATION));

                default:

                    throw new RuntimeException(

                            "Unexpected field id " + pis.getFieldNumber());

tests/Internal/src/com/android/internal/protolog/PerfettoProtoLogImplTest.java

+25 −0
Original line number Diff line number Diff line
@@ -126,30 +126,35 @@ public class PerfettoProtoLogImplTest { 
                                .setMessage("My Test Debug Log Message %b")

                                .setLevel(ProtologCommon.ProtoLogLevel.PROTOLOG_LEVEL_DEBUG)

                                .setGroupId(1)

                                .setLocation("com/test/MyTestClass.java:123")

                ).addMessages(

                        Protolog.ProtoLogViewerConfig.MessageData.newBuilder()

                                .setMessageId(2)

                                .setMessage("My Test Verbose Log Message %b")

                                .setLevel(ProtologCommon.ProtoLogLevel.PROTOLOG_LEVEL_VERBOSE)

                                .setGroupId(1)

                                .setLocation("com/test/MyTestClass.java:342")

                ).addMessages(

                        Protolog.ProtoLogViewerConfig.MessageData.newBuilder()

                                .setMessageId(3)

                                .setMessage("My Test Warn Log Message %b")

                                .setLevel(ProtologCommon.ProtoLogLevel.PROTOLOG_LEVEL_WARN)

                                .setGroupId(1)

                                .setLocation("com/test/MyTestClass.java:563")

                ).addMessages(

                        Protolog.ProtoLogViewerConfig.MessageData.newBuilder()

                                .setMessageId(4)

                                .setMessage("My Test Error Log Message %b")

                                .setLevel(ProtologCommon.ProtoLogLevel.PROTOLOG_LEVEL_ERROR)

                                .setGroupId(1)

                                .setLocation("com/test/MyTestClass.java:156")

                ).addMessages(

                        Protolog.ProtoLogViewerConfig.MessageData.newBuilder()

                                .setMessageId(5)

                                .setMessage("My Test WTF Log Message %b")

                                .setLevel(ProtologCommon.ProtoLogLevel.PROTOLOG_LEVEL_WTF)

                                .setGroupId(1)

                                .setLocation("com/test/MyTestClass.java:192")

                );



        ViewerConfigInputStreamProvider viewerConfigInputStreamProvider = Mockito.mock(
@@ -465,6 +470,26 @@ public class PerfettoProtoLogImplTest { 
                .isEqualTo("My test message :: test, 2, 4, 6, 0.400000, true");

    }



    @Test

    public  void supportsLocationInformation() throws IOException {

        PerfettoTraceMonitor traceMonitor =

                PerfettoTraceMonitor.newBuilder().enableProtoLog(true).build();

        try {

            traceMonitor.start();

            mProtoLog.log(LogLevel.DEBUG, TestProtoLogGroup.TEST_GROUP, 1,

                    LogDataType.BOOLEAN, new Object[]{true});

        } finally {

            traceMonitor.stop(mWriter);

        }



        final ResultReader reader = new ResultReader(mWriter.write(), mTraceConfig);

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(1);

        Truth.assertThat(protolog.messages.get(0).getLocation())

                .isEqualTo("com/test/MyTestClass.java:123");

    }



    private long addMessageToConfig(ProtologCommon.ProtoLogLevel logLevel, String message) {

        final long messageId = new Random().nextLong();

        mViewerConfigBuilder.addMessages(Protolog.ProtoLogViewerConfig.MessageData.newBuilder()