Skip to content

Conversation

@mrodm
Copy link
Contributor

@mrodm mrodm commented Feb 9, 2024

Fixes #1666

This PR fixes a bug in how Generic reports are merged.

Checked running test pipeline with zoom package from the integrations repository

Before (everything false):

  <file path="packages/zoom/data_stream/webhook/elasticsearch/ingest_pipeline/zoomroom.yml">
    <lineToCover lineNumber="4" covered="false"></lineToCover>
    <lineToCover lineNumber="5" covered="false"></lineToCover>
    <lineToCover lineNumber="6" covered="false"></lineToCover>
    <lineToCover lineNumber="7" covered="false"></lineToCover>
    <lineToCover lineNumber="8" covered="false"></lineToCover>
    <lineToCover lineNumber="9" covered="false"></lineToCover>
    <lineToCover lineNumber="10" covered="false"></lineToCover>
    <lineToCover lineNumber="11" covered="false"></lineToCover>
    <lineToCover lineNumber="12" covered="false"></lineToCover>
    <lineToCover lineNumber="13" covered="false"></lineToCover>
    <lineToCover lineNumber="14" covered="false"></lineToCover>
    <lineToCover lineNumber="15" covered="false"></lineToCover>
    <lineToCover lineNumber="16" covered="false"></lineToCover>
    <lineToCover lineNumber="17" covered="false"></lineToCover>
    <lineToCover lineNumber="18" covered="false"></lineToCover>
    <lineToCover lineNumber="19" covered="false"></lineToCover>
  </file>

After:

  <file path="packages/zoom/data_stream/webhook/elasticsearch/ingest_pipeline/zoomroom.yml">
    <lineToCover lineNumber="4" covered="true"></lineToCover>
    <lineToCover lineNumber="5" covered="true"></lineToCover>
    <lineToCover lineNumber="6" covered="true"></lineToCover>
    <lineToCover lineNumber="7" covered="true"></lineToCover>
    <lineToCover lineNumber="8" covered="true"></lineToCover>
    <lineToCover lineNumber="9" covered="true"></lineToCover>
    <lineToCover lineNumber="10" covered="true"></lineToCover>
    <lineToCover lineNumber="11" covered="true"></lineToCover>
    <lineToCover lineNumber="12" covered="false"></lineToCover>
    <lineToCover lineNumber="13" covered="false"></lineToCover>
    <lineToCover lineNumber="14" covered="false"></lineToCover>
    <lineToCover lineNumber="15" covered="false"></lineToCover>
    <lineToCover lineNumber="16" covered="true"></lineToCover>
    <lineToCover lineNumber="17" covered="true"></lineToCover>
    <lineToCover lineNumber="18" covered="true"></lineToCover>
    <lineToCover lineNumber="19" covered="true"></lineToCover>
  </file>

To compare, this is the result for that data stream using Cobertura:

        <class name="zoomroom" filename="packages/zoom/data_stream/webhook/elasticsearch/ingest_pipeline/zoomroom.yml" line-rate="0" branch-rate="0" complexity="0">
          <methods>
            <method name="append" signature="" line-rate="0" branch-rate="0" complexity="0">
              <lines>
                <line number="4" hits="2"></line>
                <line number="5" hits="2"></line>
                <line number="6" hits="2"></line>
                <line number="7" hits="2"></line>
              </lines>
            </method>
            <method name="append" signature="" line-rate="0" branch-rate="0" complexity="0">
              <lines>
                <line number="8" hits="2"></line>
                <line number="9" hits="2"></line>
                <line number="10" hits="2"></line>
                <line number="11" hits="2"></line>
              </lines>
            </method>
            <method name="append" signature="" line-rate="0" branch-rate="0" complexity="0">
              <lines>
                <line number="12" hits="0"></line>
                <line number="13" hits="0"></line>
                <line number="14" hits="0"></line>
                <line number="15" hits="0"></line>
              </lines>
            </method>
            <method name="rename" signature="" line-rate="0" branch-rate="0" complexity="0">
              <lines>
                <line number="16" hits="4"></line>
                <line number="17" hits="4"></line>
                <line number="18" hits="4"></line>
                <line number="19" hits="4"></line>
              </lines>
            </method>
          </methods>
          <lines>
            <line number="4" hits="2"></line>
            <line number="5" hits="2"></line>
            <line number="6" hits="2"></line>
            <line number="7" hits="2"></line>
            <line number="8" hits="2"></line>
            <line number="9" hits="2"></line>
            <line number="10" hits="2"></line>
            <line number="11" hits="2"></line>
            <line number="12" hits="0"></line>
            <line number="13" hits="0"></line>
            <line number="14" hits="0"></line>
            <line number="15" hits="0"></line>
            <line number="16" hits="4"></line>
            <line number="17" hits="4"></line>
            <line number="18" hits="4"></line>
            <line number="19" hits="4"></line>
          </lines>
        </class>

Copy link
Member

@jsoriano jsoriano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@mrodm
Copy link
Contributor Author

mrodm commented Feb 9, 2024

test integrations

@elasticmachine
Copy link
Collaborator

Created or updated PR in integrations repository to test this version. Check elastic/integrations#9115

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

@mrodm mrodm merged commit 4af13a5 into elastic:main Feb 12, 2024
@mrodm mrodm deleted the fix_coverage_generic_merge branch February 12, 2024 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Missing coverage information in generic format

3 participants