diff --git a/.gitlab/generate-appsec.php b/.gitlab/generate-appsec.php index c90ccc9ea1f..ea385e4c892 100644 --- a/.gitlab/generate-appsec.php +++ b/.gitlab/generate-appsec.php @@ -178,20 +178,12 @@ sudo sed -i 's|http://deb.debian.org/debian|http://archive.debian.org/debian|g; s|http://security.debian.org/debian-security|http://archive.debian.org/debian-security|g' /etc/apt/sources.list sudo apt-get update && sudo apt-get install -y jq gcovr llvm-17 clang-17 - echo "Installing codecov" - - CODECOV_TOKEN=$(vault kv get --format=json kv/k8s/gitlab-runner/dd-trace-php/codecov | jq -r .data.data.token) - CODECOV_VERSION=0.6.1 - CODECOV_ARCH=linux - curl https://keybase.io/codecovsecurity/pgp_keys.asc | gpg --no-default-keyring --keyring trustedkeys.gpg --import - curl -Os https://uploader.codecov.io/v${CODECOV_VERSION}/${CODECOV_ARCH}/codecov - curl -Os https://uploader.codecov.io/v${CODECOV_VERSION}/${CODECOV_ARCH}/codecov.SHA256SUM - curl -Os https://uploader.codecov.io/v${CODECOV_VERSION}/${CODECOV_ARCH}/codecov.SHA256SUM.sig - gpgv codecov.SHA256SUM.sig codecov.SHA256SUM - shasum -a 256 -c codecov.SHA256SUM - rm codecov.SHA256SUM.sig codecov.SHA256SUM - sudo mv codecov /usr/local/bin/codecov - sudo chmod +x /usr/local/bin/codecov + echo "Installing datadog-ci" + DATADOG_API_KEY=$(vault kv get --format=json kv/k8s/gitlab-runner/dd-trace-php/datadoghq-api-key | jq -r .data.data.key) + export DATADOG_API_KEY + export DD_SITE="datadoghq.com" + curl -L --fail https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_linux-x64 --output /usr/local/bin/datadog-ci + chmod +x /usr/local/bin/datadog-ci - cd appsec/build - | cmake .. -DCMAKE_BUILD_TYPE=Debug -DDD_APPSEC_ENABLE_COVERAGE=ON \ @@ -214,18 +206,18 @@ llvm-cov-17 export "$CI_PROJECT_DIR"/appsec/build/ddappsec.so \ -format=lcov -instr-profile=default.profdata \ > "$CI_PROJECT_DIR"/appsec/build/coverage-ext.lcov - echo "Uploading extension coverage to codecov" + echo "Uploading extension coverage to Datadog" cd "$CI_PROJECT_DIR" - codecov -t "$CODECOV_TOKEN" -n appsec-extension -v -f appsec/build/coverage-ext.lcov + datadog-ci coverage upload --verbose --flags appsec-extension appsec/build/coverage-ext.lcov - | cd /tmp/cov-helper llvm-profdata-17 merge -sparse *.profraw -o default.profdata llvm-cov-17 export "$CI_PROJECT_DIR"/appsec/build/tests/helper/ddappsec_helper_test \ -format=lcov -instr-profile=default.profdata \ > "$CI_PROJECT_DIR/appsec/build/coverage-helper.lcov" - echo "Uploading helper coverage to codecov" + echo "Uploading helper coverage to Datadog" cd "$CI_PROJECT_DIR" - codecov -t "$CODECOV_TOKEN" -n appsec-helper -v -f appsec/build/coverage-helper.lcov + datadog-ci coverage upload --verbose --flags appsec-helper appsec/build/coverage-helper.lcov "push appsec images": diff --git a/README.md b/README.md index 8864bb16a7a..df8de06b535 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # DD Trace PHP [![CircleCI](https://circleci.com/gh/DataDog/dd-trace-php/tree/master.svg?style=svg)](https://circleci.com/gh/DataDog/dd-trace-php/tree/master) -[![CodeCov](https://codecov.io/gh/DataDog/dd-trace-php/branch/master/graph/badge.svg?token=eXio8H7vwF)](https://codecov.io/gh/DataDog/dd-trace-php) [![OpenTracing Badge](https://img.shields.io/badge/OpenTracing-enabled-blue.svg)](http://opentracing.io) [![OpenTelemetry Badge](https://img.shields.io/badge/OpenTelemetry-enabled-blue.svg)](https://opentelemetry.io) [![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%207.0-8892BF.svg)](https://php.net/) diff --git a/code-coverage.datadog.yml b/code-coverage.datadog.yml new file mode 100644 index 00000000000..e3e7a32cd4c --- /dev/null +++ b/code-coverage.datadog.yml @@ -0,0 +1,11 @@ +schema-version: v1 + +ignore: + - "appsec/build/" + - "appsec/tests/" + - "appsec/third_party/" + +gates: + - type: patch_coverage_percentage + config: + threshold: 90 diff --git a/codecov.yml b/codecov.yml deleted file mode 100644 index 516f9ec23e3..00000000000 --- a/codecov.yml +++ /dev/null @@ -1,28 +0,0 @@ -# Validate using: cat codecov.yml | curl --data-binary @- https://codecov.io/validate -codecov: - require_ci_to_pass: false # See coverage on CI test failures - -coverage: - range: 90..100 - round: down - precision: 2 - status: # Blocking coverage targets - project: # Each PR must increase coverage - default: - target: auto - patch: # New code must be at least 90% tested - default: - target: 90% - - -comment: # See https://docs.codecov.com/docs/pull-request-comments - behavior: default - layout: "header,reach,diff,flags,files,footer" - require_changes: true - require_base: false - require_head: false - -ignore: - - appsec/build - - appsec/tests - - appsec/third_party