@alertlogic/al-collector-js 3.0.2 → 3.0.3

package/.ps_outputs/covertool.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 <!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
-<coverage lines-valid="2958" lines-covered="896" line-rate="0.3029" branches-valid="2383" branches-covered="297" branch-rate="0.1246" timestamp="1667387529354" complexity="0" version="0.1">
+<coverage lines-valid="2958" lines-covered="896" line-rate="0.3029" branches-valid="2383" branches-covered="297" branch-rate="0.1246" timestamp="1667389891613" complexity="0" version="0.1">
   <sources>
-    <source>/codebuild/output/src367490583/src/github.com/alertlogic/al-collector-js</source>
+    <source>/codebuild/output/src724962260/src/github.com/alertlogic/al-collector-js</source>
   </sources>
   <packages>
     <package name="al-collector-js" line-rate="0.9626" branch-rate="0.8843000000000001">

package/al-collector-js.coverage.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" ?>
 <!DOCTYPE coverage SYSTEM "http://cobertura.sourceforge.net/xml/coverage-04.dtd">
-<coverage lines-valid="2958" lines-covered="896" line-rate="0.3029" branches-valid="2383" branches-covered="297" branch-rate="0.1246" timestamp="1667387529354" complexity="0" version="0.1">
+<coverage lines-valid="2958" lines-covered="896" line-rate="0.3029" branches-valid="2383" branches-covered="297" branch-rate="0.1246" timestamp="1667389891613" complexity="0" version="0.1">
   <sources>
-    <source>/codebuild/output/src367490583/src/github.com/alertlogic/al-collector-js</source>
+    <source>/codebuild/output/src724962260/src/github.com/alertlogic/al-collector-js</source>
   </sources>
   <packages>
     <package name="al-collector-js" line-rate="0.9626" branch-rate="0.8843000000000001">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alertlogic/al-collector-js",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "license": "MIT",
   "description": "Alert Logic Collector Common Library",
   "repository": {

package/ps_spec.yml

@@ -23,6 +23,7 @@ stages:
             - git clone git@algithub.pd.alertlogic.net:alertlogic/al-ps-tools.git
             - cp coverage/cobertura-coverage.xml al-collector-js.coverage.xml
             - bash ./al-ps-tools/helpers/collect.sh -c 'al-collector-js.coverage.xml'
+            - rm -rf ./al-ps-tools/
             - |
               set -ex
               

package/al-ps-tools/helpers/collect.sh

@@ -1,56 +0,0 @@
-#!/bin/bash
-
-# Create ps_outputs repository
-DIR=".ps_outputs/"
-if [[ -d "$DIR" ]]; then
-    rm -rf $DIR
-fi
-mkdir $DIR
-
-showUssage()
-{
-   echo ""
-   echo "Usage: $0 -c [ COVERAGE_FILES ] -b [ UNITESTS_FILES ]"
-   echo -e "\t-c List of coverage reports to collect, i.e. '*.coverage.xml,coverage.xml,*.covertool.xml'"
-   echo -e "\t-u List of unit test reports to collect, i.e. 'junit.xml,junit_report.xml'"
-}
-
-while getopts "c:u:" opt
-do
-   case "$opt" in
-      c ) coverageFiles="$OPTARG" ;;
-      u ) unitTestFiles="$OPTARG" ;;
-      ? ) showUssage ;;
-   esac
-done
-
-if [ -z "$coverageFiles" ] && [ -z "$unitTestFiles" ]
-then
-   echo "Please provide one parameter at least";
-   showUssage
-   exit 1
-fi
-
-# Split coverageFiles and collect
-if [ "$coverageFiles" != "" ]; then
-    IFS=',' read -r -a coverage_reports <<< "$coverageFiles"
-    for element in "${coverage_reports[@]}"
-    do
-        find . -type f \( -name "$element" \) -exec cp {} .ps_outputs/covertool.xml \;
-    done
-fi
-
-# Split unitTestFiles and collect
-if [ "$unitTestFiles" != "" ]; then
-    IFS=',' read -r -a unit_tests <<< "$unitTestFiles"
-    for element in "${unit_tests[@]}"
-    do
-        find . -type f \( -name "$element" \) -exec cp {} .ps_outputs/ \;
-    done
-fi
-
-# Fail if it does not find any coverage report
-if [[ ! -e .ps_outputs/covertool.xml ]]; then
-  echo 'No coverage results, changed build result to FAILURE'
-  exit 1
-fi

package/al-ps-tools/helpers/coverage.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-mkdir .ps_outputs
-find . -type f \( -name '*.coverage.xml' -o -name '*.covertool.xml' \) -exec cp {} .ps_outputs/covertool.xml \;
-if [[ ! -e .ps_outputs/covertool.xml ]]; then
-  echo 'No coverage results, changed build result to FAILURE'
-  exit 1
-fi
-find . -type f \( -name 'logs/**/junit_report.xml' \) -exec cp {} .ps_outputs/ \;

package/al-ps-tools/helpers/dd_upload_metrics

@@ -1,37 +0,0 @@
-#!/bin/bash
-#
-# Post test run metrics to Datadog
-#
-
-: ${DATADOG_API_KEY:alps-env-secret}
-
-if [[ $# -ne 2 ]]
-then
-    echo "Usage: $0 <xml surefire report> <html coverage report>"
-    exit 1
-fi
-
-surefire_report=$1
-coverage_report=$2
-
-SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )";
-
-echo -n "==> posting datadog metrics from surefire report "
-curl -X POST \
-     "https://api.datadoghq.com/api/v1/series" \
-     -H "Content-Type: text/json" \
-     -H "DD-API-KEY: ${DATADOG_API_KEY}" \
-     -d @- << EOF
-$(${SCRIPT_DIR}/testreport_tool surefire-to-datadog --report $surefire_report  | jq .)
-EOF
-echo
-
-echo -n "==> posting datadog metrics from coverage report "
-curl -X POST \
-     "https://api.datadoghq.com/api/v1/series" \
-     -H "Content-Type: text/json" \
-     -H "DD-API-KEY: ${DATADOG_API_KEY}" \
-     -d @- << EOF
-$(${SCRIPT_DIR}/testreport_tool coverage-to-datadog --report $coverage_report  | jq .)
-EOF
-echo

package/al-ps-tools/helpers/testreport_tool

@@ -1,297 +0,0 @@
-#!/usr/bin/env python3
-'''Utility functions for test reports
-
-Provides the following functions:
-
-- Combine eunit and ct surefire test result into a single report that
-  an be uploaded to Datadog CI
-
-- Extract and transform
-  - aggregate html test coverage report generated by rebar3 coverage
-    to datadog POST metric API input
-  - surefire xml test report to datadog POST metric API input
-'''
-import argparse
-import json
-import os
-import subprocess
-import sys
-import traceback
-import xml.etree.ElementTree as ET
-
-from datetime import datetime
-from html.parser import HTMLParser
-from xml.etree.ElementTree import ElementTree
-
-APP = os.path.basename(os.getcwd())
-
-# ------------------------------------------------------------------------------
-# Helpers
-# ------------------------------------------------------------------------------
-class State:
-    '''HTML coverage parser states'''
-    aggregate = 1
-    collect = 2
-    reset = 0
-
-class Result:
-    '''Coverage result'''
-    __slot__ = ['total', 'modules']
-
-    class Module():
-        __slot__ = ['name', 'coverage']
-        def __init__(self, module, coverage):
-            self.name = module
-            self.coverage = coverage
-
-    def __init__(self):
-        self.modules = []
-        self.total = 0
-
-class CoverageReportParser(HTMLParser):
-    '''Custom HTML parser for rebar3 coverage reports
-
-    Extracts the aggregate coverage data from the report.
-    '''
-    _results = []
-    _state = State.reset
-
-    def handle_starttag(self, tag, attrs):
-        if self._state == State.aggregate and tag == 'td':
-            self._state = State.collect
-
-    def handle_endtag(self, tag):
-        if tag == 'table':
-            self._state = State.reset
-
-    def handle_data(self, data):
-        if data == 'aggregate summary':
-            self._state = State.aggregate
-        if self._state == State.collect:
-            data = data.strip()
-            if data:
-                self._results.append(data)
-
-    @property
-    def result(self):
-        modules = self._results[::2]
-        coverages = self._results[1::2]
-        result = Result()
-        for name, coverage in zip(modules, coverages):
-            coverage = int(coverage.replace('%', ''))
-            if name == 'Total':
-                result.total = coverage
-            else:
-                result.modules.append(Result.Module(name, coverage))
-        return result
-
-def git_describe():
-    try:
-        result = subprocess.check_output(['git', 'describe'])
-        result = result.decode('utf8')
-        result = result.strip()
-    except Exception:
-        result = None
-    return result
-
-def remove_attributes(xml):
-    '''Remove xml attributes that DataDog CI does not understand
-
-    DataDog CI silently fails to upload common test results with
-    timestamp attribute
-    '''
-    for testsuite in xml.findall('testsuite'):
-        if 'log' in testsuite.attrib:
-            del testsuite.attrib['log']
-        if 'timestamp' in testsuite.attrib:
-            del testsuite.attrib['timestamp']
-        for testcase in list(testsuite):
-            if 'timestamp' in testcase.attrib:
-                del testcase.attrib['timestamp']
-            if 'log' in testcase.attrib:
-                del testcase.attrib['log']
-    return xml
-
-def parse_coverage_report(report):
-    parser = CoverageReportParser()
-    with open(report, 'r') as f:
-        contents = f.readlines()
-    contents = ''.join(contents)
-    parser.feed(contents)
-    return parser.result
-
-# ------------------------------------------------------------------------------
-# Commands
-# ------------------------------------------------------------------------------
-def cmd_coverage_to_datadog(args):
-    now = int(datetime.now().timestamp())
-    git_repo = args.git_repo
-    git_tag = args.git_tag
-    metric_prefix = args.metric_prefix + '.coverage'
-
-    tags = [f'git_repo:{git_repo}', f'git_tag:{git_tag}']
-    result = parse_coverage_report(args.report)
-    series = []
-    for module in result.modules:
-        points = [[now, module.coverage]]
-        series.append({'metric': f'{metric_prefix}.module',
-                       'points': points,
-                       'tags': tags + [f'module:{module.name}']})
-    series.append({'metric': f'{metric_prefix}.total',
-                   'points': [[now, result.total]],
-                   'tags': tags})
-    print(json.dumps({'series': series}))
-
-def cmd_surefire_to_datadog(args):
-    now = int(datetime.now().timestamp())
-    git_repo = args.git_repo
-    git_tag = args.git_tag
-    metric_prefix = args.metric_prefix
-    report = args.report
-    xml = ET.parse(report)
-    result = []
-    for testsuite in xml.findall('testsuite'):
-        name = testsuite.attrib['name']
-        errors = int(testsuite.attrib['errors'])
-        skipped = int(testsuite.attrib['skipped'])
-        tests = int(testsuite.attrib['tests'])
-        time = float(testsuite.attrib['time'])
-        suite = {
-            'name': name,
-            'tests': tests,
-            'errors': errors,
-            'time_secs': time,
-            'skipped': skipped}
-        result.append(suite)
-    series = []
-    for suite in result:
-        time_secs = suite['time_secs']
-        tags = [f'git_repo:{git_repo}',
-                f'git_tag:{git_tag}',
-                f'suite:{suite["name"]}']
-        def to_series(type):
-            value = suite[type]
-            return {'metric': f'{metric_prefix}.count.{type}',
-                    'points': [[now, value]],
-                    'tags': tags}
-        series.append({
-            'metric': f'{metric_prefix}.time',
-            'points': [[now, time_secs]],
-            'tags': tags})
-        if args.send_zeros or suite['tests']:
-            series.append(to_series('tests')),
-        if args.send_zeros or suite['errors']:
-            series.append(to_series('errors'))
-        if args.send_zeros or suite['skipped']:
-            series.append(to_series('skipped'))
-    print(json.dumps({'series': series}))
-
-def cmd_surefire_combine(args):
-    # Parse arguments
-    service = args.service
-    ct_report = args.ct
-    eunit_report = args.eunit
-    combined_report = args.result
-    print(f'==> combining CT report {ct_report} and eunit report {eunit_report} to {combined_report}')
-
-    # Load ct and unit surefire repots
-    ct_xml = ET.parse(ct_report)
-    eunit_xml = ET.parse(eunit_report)
-
-    # Create result xml
-    result_xml = ElementTree(ET.Element('testsuites'))
-    result_root = result_xml.getroot()
-
-    # Add CT surefire results
-    ct_xml = remove_attributes(ct_xml)
-    for testsuite in ct_xml.findall('testsuite'):
-        result_root.append(testsuite)
-
-    # Add eunit surefire results
-    testsuite = eunit_xml.getroot()
-    testsuite.attrib['name'] = service
-    result_root.append(testsuite)
-
-    # Write result
-    result_xml.write(combined_report)
-    print(f'==> wrote combined report {combined_report}')
-
-# ------------------------------------------------------------------------------
-# Command line parsing
-# ------------------------------------------------------------------------------
-def cmd_coverage_to_datadog_subparser(subparsers):
-    s = subparsers.add_parser(
-        'coverage-to-datadog',
-        help='transform coverage html report to datdog series')
-    s.add_argument('--report',
-                   default='_build/test/cover/index.html',
-                   help='Path of the combined report')
-    s.set_defaults(func=cmd_coverage_to_datadog)
-
-def cmd_surefire_to_datadog_subparser(subparsers):
-    s = subparsers.add_parser(
-        'surefire-to-datadog',
-        help='transform surefire xml report to datadog series')
-    s.add_argument('--send-zeros',
-                   action='store_true',
-                   help='Genreate metriceven if the value is 0')
-    s.add_argument('--report',
-                   default=f'_build/test/report/{APP}_surefire_report.xml',
-                   help='Path of the combined report')
-    s.set_defaults(func=cmd_surefire_to_datadog)
-
-def cmd_surefire_combine_subparser(subparsers):
-    s = subparsers.add_parser(
-        'surefire-combine',
-        help='Combine eunit and ct surefire reports')
-    s.add_argument('--service',
-                   help='Name of the service')
-    s.add_argument('--ct',
-                   help='path to the CT surefire report')
-    s.add_argument('--eunit',
-                   help='path to the Eunit surefire report')
-    s.add_argument('--result',
-                   help='Path for the combined report')
-    s.set_defaults(func=cmd_surefire_combine)
-
-def init_argparse():
-    parser = argparse.ArgumentParser(
-        formatter_class=argparse.RawDescriptionHelpFormatter,
-        description='Surefire report helper')
-    parser.add_argument('--metric-prefix',
-                        default=os.environ.get('TRT_METRIC_PREFIX', 'ae.dev.test'),
-                        help='prefix value to use for metrics')
-    parser.add_argument(
-        '--git-repo',
-        default=APP,
-        help='Name of the git repository for the service')
-    parser.add_argument(
-        '--git-tag',
-        default=git_describe(),
-        help='Associated git tag for the reports')
-    subparsers = parser.add_subparsers(
-        title='commands',
-        metavar='cmd [opts]',
-        help='commands, use --help to see help')
-    cmd_surefire_combine_subparser(subparsers)
-    cmd_surefire_to_datadog_subparser(subparsers)
-    cmd_coverage_to_datadog_subparser(subparsers)
-    return parser
-
-# ------------------------------------------------------------------------------
-# Main
-# ------------------------------------------------------------------------------
-def main():
-    parser = init_argparse()
-    try:
-        args = parser.parse_args()
-        if 'func' in args:
-            args.func(args)
-        else:
-            parser.print_usage()
-    except Exception as e:
-        print(f'ERROR: {e}')
-        print(f'{traceback.format_exc()}')
-
-if __name__ == '__main__':
-    main()