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

Commit bb33b803 authored by tsaichristine's avatar tsaichristine
Browse files

(Part 2.1) Use new socket schema in ValueMetricProducer_test 

Sending ValueMetricProducer_test as multiple CLs to retain diff and make
it easier to review.

I added a few different CreateLogEvent functions that account for tests
that need events with 0, 2, and 3 values.

The old #createEvent function took in one value but added it twice to the
LogEvent. I replaced this with #CreateRepeatedValueLogEvent. Any events
made with #createEvent or that took the form of:
event.write(tagId)
event.write(value)

was replaced with a call to #CreateRepeatedValueLogEvent. I assumed
that the tagId was used as the first field because an arbitrary number
was needed.

Test: bit statsd_test:*
Bug: 149590301
Change-Id: I26de8074a66babcf3ab7ee395be0598d88b4ba59
parent 28ab4933

cmds/statsd/tests/metrics/ValueMetricProducer_test.cpp

+586 −618

File changed.

Preview size limit exceeded, changes collapsed.

cmds/statsd/tests/statsd_test_util.cpp

+121 −0
Original line number Diff line number Diff line
@@ -410,6 +410,127 @@ FieldMatcher CreateDimensions(const int atomId, const std::vector<int>& fields) 
    return dimensions;

}



shared_ptr<LogEvent> CreateTwoValueLogEvent(int atomId, int64_t eventTimeNs, int32_t value1,

                                            int32_t value2) {

    AStatsEvent* statsEvent = AStatsEvent_obtain();

    AStatsEvent_setAtomId(statsEvent, atomId);

    AStatsEvent_overwriteTimestamp(statsEvent, eventTimeNs);



    AStatsEvent_writeInt32(statsEvent, value1);

    AStatsEvent_writeInt32(statsEvent, value2);

    AStatsEvent_build(statsEvent);



    size_t size;

    uint8_t* buf = AStatsEvent_getBuffer(statsEvent, &size);

    shared_ptr<LogEvent> logEvent = std::make_shared<LogEvent>(/*uid=*/0, /*pid=*/0);

    logEvent->parseBuffer(buf, size);

    AStatsEvent_release(statsEvent);



    return logEvent;

}

//

void CreateTwoValueLogEvent(LogEvent* logEvent, int atomId, int64_t eventTimeNs, int32_t value1,

                            int32_t value2) {

    AStatsEvent* statsEvent = AStatsEvent_obtain();

    AStatsEvent_setAtomId(statsEvent, atomId);

    AStatsEvent_overwriteTimestamp(statsEvent, eventTimeNs);



    AStatsEvent_writeInt32(statsEvent, value1);

    AStatsEvent_writeInt32(statsEvent, value2);

    AStatsEvent_build(statsEvent);



    size_t size;

    uint8_t* buf = AStatsEvent_getBuffer(statsEvent, &size);

    logEvent->parseBuffer(buf, size);

    AStatsEvent_release(statsEvent);

}



shared_ptr<LogEvent> CreateThreeValueLogEvent(int atomId, int64_t eventTimeNs, int32_t value1,

                                              int32_t value2, int32_t value3) {

    AStatsEvent* statsEvent = AStatsEvent_obtain();

    AStatsEvent_setAtomId(statsEvent, atomId);

    AStatsEvent_overwriteTimestamp(statsEvent, eventTimeNs);



    AStatsEvent_writeInt32(statsEvent, value1);

    AStatsEvent_writeInt32(statsEvent, value2);

    AStatsEvent_writeInt32(statsEvent, value3);

    AStatsEvent_build(statsEvent);



    size_t size;

    uint8_t* buf = AStatsEvent_getBuffer(statsEvent, &size);

    shared_ptr<LogEvent> logEvent = std::make_shared<LogEvent>(/*uid=*/0, /*pid=*/0);

    logEvent->parseBuffer(buf, size);

    AStatsEvent_release(statsEvent);



    return logEvent;

}



void CreateThreeValueLogEvent(LogEvent* logEvent, int atomId, int64_t eventTimeNs, int32_t value1,

                              int32_t value2, int32_t value3) {

    AStatsEvent* statsEvent = AStatsEvent_obtain();

    AStatsEvent_setAtomId(statsEvent, atomId);

    AStatsEvent_overwriteTimestamp(statsEvent, eventTimeNs);



    AStatsEvent_writeInt32(statsEvent, value1);

    AStatsEvent_writeInt32(statsEvent, value2);

    AStatsEvent_writeInt32(statsEvent, value3);

    AStatsEvent_build(statsEvent);



    size_t size;

    uint8_t* buf = AStatsEvent_getBuffer(statsEvent, &size);

    logEvent->parseBuffer(buf, size);

    AStatsEvent_release(statsEvent);

}



shared_ptr<LogEvent> CreateRepeatedValueLogEvent(int atomId, int64_t eventTimeNs, int32_t value) {

    AStatsEvent* statsEvent = AStatsEvent_obtain();

    AStatsEvent_setAtomId(statsEvent, atomId);

    AStatsEvent_overwriteTimestamp(statsEvent, eventTimeNs);



    AStatsEvent_writeInt32(statsEvent, value);

    AStatsEvent_writeInt32(statsEvent, value);

    AStatsEvent_build(statsEvent);



    size_t size;

    uint8_t* buf = AStatsEvent_getBuffer(statsEvent, &size);

    shared_ptr<LogEvent> logEvent = std::make_shared<LogEvent>(/*uid=*/0, /*pid=*/0);

    logEvent->parseBuffer(buf, size);

    AStatsEvent_release(statsEvent);



    return logEvent;

}



void CreateRepeatedValueLogEvent(LogEvent* logEvent, int atomId, int64_t eventTimeNs,

                                 int32_t value) {

    AStatsEvent* statsEvent = AStatsEvent_obtain();

    AStatsEvent_setAtomId(statsEvent, atomId);

    AStatsEvent_overwriteTimestamp(statsEvent, eventTimeNs);



    AStatsEvent_writeInt32(statsEvent, value);

    AStatsEvent_writeInt32(statsEvent, value);

    AStatsEvent_build(statsEvent);



    size_t size;

    uint8_t* buf = AStatsEvent_getBuffer(statsEvent, &size);

    logEvent->parseBuffer(buf, size);

    AStatsEvent_release(statsEvent);

}



shared_ptr<LogEvent> CreateNoValuesLogEvent(int atomId, int64_t eventTimeNs) {

    AStatsEvent* statsEvent = AStatsEvent_obtain();

    AStatsEvent_setAtomId(statsEvent, atomId);

    AStatsEvent_overwriteTimestamp(statsEvent, eventTimeNs);

    AStatsEvent_build(statsEvent);



    size_t size;

    uint8_t* buf = AStatsEvent_getBuffer(statsEvent, &size);

    shared_ptr<LogEvent> logEvent = std::make_shared<LogEvent>(/*uid=*/0, /*pid=*/0);

    logEvent->parseBuffer(buf, size);

    AStatsEvent_release(statsEvent);



    return logEvent;

}



std::unique_ptr<LogEvent> CreateScreenStateChangedEvent(

        uint64_t timestampNs, const android::view::DisplayStateEnum state) {

    AStatsEvent* statsEvent = AStatsEvent_obtain();

cmds/statsd/tests/statsd_test_util.h

+23 −0
Original line number Diff line number Diff line
@@ -164,6 +164,29 @@ FieldMatcher CreateAttributionUidAndTagDimensions(const int atomId, 
FieldMatcher CreateAttributionUidDimensions(const int atomId,

                                            const std::vector<Position>& positions);



shared_ptr<LogEvent> CreateTwoValueLogEvent(int atomId, int64_t eventTimeNs, int32_t value1,

                                            int32_t value2);



void CreateTwoValueLogEvent(LogEvent* logEvent, int atomId, int64_t eventTimeNs, int32_t value1,

                            int32_t value2);



shared_ptr<LogEvent> CreateThreeValueLogEvent(int atomId, int64_t eventTimeNs, int32_t value1,

                                              int32_t value2, int32_t value3);



void CreateThreeValueLogEvent(LogEvent* logEvent, int atomId, int64_t eventTimeNs, int32_t value1,

                              int32_t value2, int32_t value3);



// The repeated value log event helpers create a log event with two int fields, both

// set to the same value. This is useful for testing metrics that are only interested

// in the value of the second field but still need the first field to be populated.

std::shared_ptr<LogEvent> CreateRepeatedValueLogEvent(int atomId, int64_t eventTimeNs,

                                                      int32_t value);



void CreateRepeatedValueLogEvent(LogEvent* logEvent, int atomId, int64_t eventTimeNs,

                                 int32_t value);



std::shared_ptr<LogEvent> CreateNoValuesLogEvent(int atomId, int64_t eventTimeNs);



// Create log event for screen state changed.

std::unique_ptr<LogEvent> CreateScreenStateChangedEvent(

        uint64_t timestampNs, const android::view::DisplayStateEnum state);