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

Commit 5e0e771f authored by Adam Pardyl's avatar Adam Pardyl
Browse files

Remove line numbers from protolog config. 

Having line numbers in log statement location info in protolog viewer
config makes the config file invalid after every code merge.

Bug:
Test: atest protologtool-tests
Change-Id: I7e9ae434517bc94ecfc7f421e71d21b07f3c233f
parent 09aea812

data/etc/services.core.protolog.json

+2 −2
Original line number Diff line number Diff line 
{

  "version": "1.0.0",

  "messages": {

    "594230385": {

    "676824470": {

      "message": "Test completed successfully: %b %d %o %x %e %g %f %% %s.",

      "level": "ERROR",

      "group": "TEST_GROUP",

      "at": "com\/android\/server\/wm\/ProtoLogGroup.java:94"

      "at": "com\/android\/server\/wm\/ProtoLogGroup.java"

    }

  },

  "groups": {

tools/protologtool/src/com/android/protolog/tool/CodeUtils.kt

+1 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import com.github.javaparser.ast.CompilationUnit 
import com.github.javaparser.ast.ImportDeclaration

import com.github.javaparser.ast.expr.BinaryExpr

import com.github.javaparser.ast.expr.Expression

import com.github.javaparser.ast.expr.MethodCallExpr

import com.github.javaparser.ast.expr.StringLiteralExpr



object CodeUtils {
@@ -74,9 +73,8 @@ object CodeUtils { 
        }

    }



    fun getPositionString(call: MethodCallExpr, fileName: String): String {

    fun getPositionString(fileName: String): String {

        return when {

            call.range.isPresent -> "$fileName:${call.range.get().begin.line}"

            else -> fileName

        }

    }

tools/protologtool/src/com/android/protolog/tool/SourceTransformer.kt

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ class SourceTransformer( 
        }

        val ifStmt: IfStmt

        if (group.enabled) {

            val position = CodeUtils.getPositionString(call, fileName)

            val position = CodeUtils.getPositionString(fileName)

            val hash = CodeUtils.hash(position, messageString, level, group)

            val newCall = call.clone()

            if (!group.textEnabled) {

tools/protologtool/src/com/android/protolog/tool/ViewerConfigBuilder.kt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class ViewerConfigBuilder( 
        group: LogGroup

    ) {

        if (group.enabled) {

            val position = CodeUtils.getPositionString(call, fileName)

            val position = CodeUtils.getPositionString(fileName)

            val key = CodeUtils.hash(position, messageString, level, group)

            if (statements.containsKey(key)) {

                if (statements[key] != LogCall(messageString, level, group, position)) {

tools/protologtool/tests/com/android/protolog/tool/SourceTransformerTest.kt

+13 −13
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ class SourceTransformerTest { 


            class Test {

                void test() {

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1922613844, 9, "test %d %f", protoLogParam0, protoLogParam1); }

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1698911065, 9, "test %d %f", protoLogParam0, protoLogParam1); }

                }

            }

            """.trimIndent()
@@ -88,7 +88,7 @@ class SourceTransformerTest { 


            class Test {

                void test() {

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; String protoLogParam2 = String.valueOf("test"); org.example.ProtoLogImpl.w(TEST_GROUP, 805272208, 9, "test %d %f " + "abc %s\n test", protoLogParam0, protoLogParam1, protoLogParam2); 

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; String protoLogParam2 = String.valueOf("test"); org.example.ProtoLogImpl.w(TEST_GROUP, 1780316587, 9, "test %d %f " + "abc %s\n test", protoLogParam0, protoLogParam1, protoLogParam2); 

            

            }

                }
@@ -100,8 +100,8 @@ class SourceTransformerTest { 


            class Test {

                void test() {

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1922613844, 9, "test %d %f", protoLogParam0, protoLogParam1); } /* ProtoLog.w(TEST_GROUP, "test %d %f", 100, 0.1); */ if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1922613844, 9, "test %d %f", protoLogParam0, protoLogParam1); }

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, -154595499, 9, "test %d %f", protoLogParam0, protoLogParam1); }

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1698911065, 9, "test %d %f", protoLogParam0, protoLogParam1); } /* ProtoLog.w(TEST_GROUP, "test %d %f", 100, 0.1); */ if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1698911065, 9, "test %d %f", protoLogParam0, protoLogParam1); }

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1698911065, 9, "test %d %f", protoLogParam0, protoLogParam1); }

                }

            }

            """.trimIndent()
@@ -111,7 +111,7 @@ class SourceTransformerTest { 


            class Test {

                void test() {

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { org.example.ProtoLogImpl.w(TEST_GROUP, 1913810354, 0, "test", (Object[]) null); }

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { org.example.ProtoLogImpl.w(TEST_GROUP, -1741986185, 0, "test", (Object[]) null); }

                }

            }

            """.trimIndent()
@@ -121,7 +121,7 @@ class SourceTransformerTest { 


            class Test {

                void test() {

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1922613844, 9, null, protoLogParam0, protoLogParam1); }

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; org.example.ProtoLogImpl.w(TEST_GROUP, 1698911065, 9, null, protoLogParam0, protoLogParam1); }

                }

            }

            """.trimIndent()
@@ -131,7 +131,7 @@ class SourceTransformerTest { 


            class Test {

                void test() {

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; String protoLogParam2 = String.valueOf("test"); org.example.ProtoLogImpl.w(TEST_GROUP, 805272208, 9, null, protoLogParam0, protoLogParam1, protoLogParam2); 

                    if (org.example.ProtoLogImpl.isEnabled(TEST_GROUP)) { long protoLogParam0 = 100; double protoLogParam1 = 0.1; String protoLogParam2 = String.valueOf("test"); org.example.ProtoLogImpl.w(TEST_GROUP, 1780316587, 9, null, protoLogParam0, protoLogParam1, protoLogParam2); 

            

            }

                }
@@ -199,7 +199,7 @@ class SourceTransformerTest { 
        assertEquals("w", methodCall.name.asString())

        assertEquals(6, methodCall.arguments.size)

        assertEquals("TEST_GROUP", methodCall.arguments[0].toString())

        assertEquals("1922613844", methodCall.arguments[1].toString())

        assertEquals("1698911065", methodCall.arguments[1].toString())

        assertEquals(0b1001.toString(), methodCall.arguments[2].toString())

        assertEquals("\"test %d %f\"", methodCall.arguments[3].toString())

        assertEquals("protoLogParam0", methodCall.arguments[4].toString())
@@ -241,7 +241,7 @@ class SourceTransformerTest { 
        assertEquals("w", methodCall.name.asString())

        assertEquals(6, methodCall.arguments.size)

        assertEquals("TEST_GROUP", methodCall.arguments[0].toString())

        assertEquals("1922613844", methodCall.arguments[1].toString())

        assertEquals("1698911065", methodCall.arguments[1].toString())

        assertEquals(0b1001.toString(), methodCall.arguments[2].toString())

        assertEquals("\"test %d %f\"", methodCall.arguments[3].toString())

        assertEquals("protoLogParam0", methodCall.arguments[4].toString())
@@ -279,7 +279,7 @@ class SourceTransformerTest { 
        assertEquals("w", methodCall.name.asString())

        assertEquals(7, methodCall.arguments.size)

        assertEquals("TEST_GROUP", methodCall.arguments[0].toString())

        assertEquals("805272208", methodCall.arguments[1].toString())

        assertEquals("1780316587", methodCall.arguments[1].toString())

        assertEquals(0b001001.toString(), methodCall.arguments[2].toString())

        assertEquals("protoLogParam0", methodCall.arguments[4].toString())

        assertEquals("protoLogParam1", methodCall.arguments[5].toString())
@@ -316,7 +316,7 @@ class SourceTransformerTest { 
        assertEquals("w", methodCall.name.asString())

        assertEquals(5, methodCall.arguments.size)

        assertEquals("TEST_GROUP", methodCall.arguments[0].toString())

        assertEquals("1913810354", methodCall.arguments[1].toString())

        assertEquals("-1741986185", methodCall.arguments[1].toString())

        assertEquals(0.toString(), methodCall.arguments[2].toString())

        assertEquals(TRANSFORMED_CODE_NO_PARAMS, out)

    }
@@ -350,7 +350,7 @@ class SourceTransformerTest { 
        assertEquals("w", methodCall.name.asString())

        assertEquals(6, methodCall.arguments.size)

        assertEquals("TEST_GROUP", methodCall.arguments[0].toString())

        assertEquals("1922613844", methodCall.arguments[1].toString())

        assertEquals("1698911065", methodCall.arguments[1].toString())

        assertEquals(0b1001.toString(), methodCall.arguments[2].toString())

        assertEquals("null", methodCall.arguments[3].toString())

        assertEquals("protoLogParam0", methodCall.arguments[4].toString())
@@ -388,7 +388,7 @@ class SourceTransformerTest { 
        assertEquals("w", methodCall.name.asString())

        assertEquals(7, methodCall.arguments.size)

        assertEquals("TEST_GROUP", methodCall.arguments[0].toString())

        assertEquals("805272208", methodCall.arguments[1].toString())

        assertEquals("1780316587", methodCall.arguments[1].toString())

        assertEquals(0b001001.toString(), methodCall.arguments[2].toString())

        assertEquals("null", methodCall.arguments[3].toString())

        assertEquals("protoLogParam0", methodCall.arguments[4].toString())