.github/pull_request_template.md

@@ -34,6 +34,5 @@
   during the review but the signing off is to be done by the reviewer(s).
 -->
 
-- [ ] If known, an appropriate milestone has been selected; otherwise the `Triage` milestone is set.
 - [ ] Changed code has unit tests for its functionality.
 - [ ] If this interacts with the agent in a new way, a system test has been added.

.github/workflows/appsec.yml

@@ -26,7 +26,7 @@ jobs:
   native:
     strategy:
       matrix:
-        runs-on: [ macos-12, macos-11, macos-10.15, ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, windows-latest ]
+        runs-on: [ macos-12, macos-11, macos-10.15, ubuntu-22.04, ubuntu-20.04, windows-latest ]
         go-version: [ "1.20", "1.19", "1.18" ]
         cgo_enabled: # test it compiles with and without cgo
           - 0

.github/workflows/system-tests.yml

@@ -21,22 +21,59 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
+        weblog-variant:
+          - net-http
+          - echo
+          - chi
+          - gin
+        scenario:
+          - DEFAULT
+          - APPSEC_DISABLED
+          - APPSEC_BLOCKING
+          - APPSEC_IP_BLOCKING
+          - APPSEC_REQUEST_BLOCKING
+          - APM_TRACING_E2E
+          - APM_TRACING_E2E_SINGLE_SPAN
         include:
-          - library: golang
-            weblog-variant: net-http
-          - library: golang
-            weblog-variant: gorilla
-          - library: golang
-            weblog-variant: echo
-          - library: golang
-            weblog-variant: chi
-          - library: golang
-            weblog-variant: gin
+          - weblog-variant: net-http
+            scenario: REMOTE_CONFIG_MOCKED_BACKEND_ASM_FEATURES
+          - weblog-variant: net-http
+            scenario: REMOTE_CONFIG_MOCKED_BACKEND_ASM_FEATURES
+          - weblog-variant: net-http
+            scenario: REMOTE_CONFIG_MOCKED_BACKEND_ASM_DD
+          # AppSec scenarios that don't depend on the integrations, so we just run on the net/http variant
+          - weblog-variant: net-http
+            scenario: APPSEC_RATE_LIMITER
+          - weblog-variant: net-http
+            scenario: APPSEC_CUSTOM_RULES
+          - weblog-variant: net-http
+            scenario: APPSEC_MISSING_RULES
+          - weblog-variant: net-http
+            scenario: APPSEC_CORRUPTED_RULES
+          - weblog-variant: net-http
+            scenario: APPSEC_LOW_WAF_TIMEOUT
+          - weblog-variant: net-http
+            scenario: APPSEC_CUSTOM_OBFUSCATION
+          # APM scenarios requiring specific environment settings
+          - scenario: APM_TRACING_E2E
+            env:
+              DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY
+              DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY
+              DD_SITE="datadoghq.com"
+          - scenario: APM_TRACING_E2E_SINGLE_SPAN
+            env:
+              DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY
+              DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY
+              DD_SITE="datadoghq.com"
+
       fail-fast: false
     env:
       TEST_LIBRARY: golang
       WEBLOG_VARIANT: ${{ matrix.weblog-variant }}
       DD_API_KEY: ${{ secrets.DD_API_KEY }}
+      SYSTEM_TESTS_E2E_DD_API_KEY: ${{ secrets.SYSTEM_TESTS_E2E_DD_API_KEY }}
+      SYSTEM_TESTS_E2E_DD_APP_KEY: ${{ secrets.SYSTEM_TESTS_E2E_DD_APP_KEY }}
+    name: Test (${{ matrix.weblog-variant }}, ${{ matrix.scenario }})
     steps:
       - name: Setup python 3.9
         uses: actions/setup-python@v4
@@ -57,21 +94,7 @@ jobs:
         run: ./build.sh
 
       - name: Run
-        run: ./run.sh
-
-      - name: Run APM E2E default tests
-        env:
-          DD_API_KEY: ${{ secrets.SYSTEM_TESTS_E2E_DD_API_KEY }}
-          DD_APPLICATION_KEY: ${{ secrets.SYSTEM_TESTS_E2E_DD_APP_KEY }}
-          DD_SITE: "datadoghq.com"
-        run: ./run.sh APM_TRACING_E2E
-
-      - name: Run APM E2E Single Span tests
-        env:
-          DD_API_KEY: ${{ secrets.SYSTEM_TESTS_E2E_DD_API_KEY }}
-          DD_APPLICATION_KEY: ${{ secrets.SYSTEM_TESTS_E2E_DD_APP_KEY }}
-          DD_SITE: "datadoghq.com"
-        run: ./run.sh APM_TRACING_E2E_SINGLE_SPAN
+        run: env ${{ matrix.env }} ./run.sh ${{ matrix.scenario }}
 
       - name: Compress artifact
         if: ${{ always() }}
@@ -81,5 +104,5 @@ jobs:
         uses: actions/upload-artifact@v2
         if: ${{ always() }}
         with:
-          name: logs_${{ matrix.weblog-variant }}
+          name: logs_${{ matrix.weblog-variant }}_${{ matrix.scenario }}
           path: artifact.tar.gz

.github/workflows/test-apps.yml

@@ -0,0 +1,56 @@
+name: Test Apps
+
+on:
+  workflow_dispatch: {} # manually
+  schedule:
+    - cron: "0 0 * * *" # nightly
+  pull_request: {} # on pull request
+
+env:
+  DD_ENV: github
+  DD_TAGS: "github_run_id:${{ github.run_id }} github_run_number:${{ github.run_number }}"
+
+jobs:
+  unit-of-work:
+    if: github.event_name != 'pull_request' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'DataDog/dd-trace-go')
+    strategy:
+      matrix:
+        include:
+          - job_name: prod
+            api_key: "DD_TEST_APP_API_KEY"
+            datadog_site: datadoghq.com
+          - job_name: staging
+            api_key: "DD_TEST_AND_DEMO_API_KEY"
+            datadog_site: datad0g.com
+    name: "unit-of-work (${{ matrix.job_name }})"
+
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          repository: 'DataDog/dd-trace-go'
+
+      - uses: datadog/agent-github-action@v1.3
+        with:
+            api_key: ${{ secrets[matrix.api_key] }}
+            datadog_site: ${{ matrix.datadog_site }}
+
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 'stable'
+          check-latest: true
+          cache: true
+
+      - name: "Configure nightly run to last 10 minutes and add nightly:true tag"
+        if: (github.event_name == 'schedule')
+        run: |
+          # 660s is enough time to capture 10 profiles without missing the last one
+          # (TODO: Implement profiler.StopFlush())
+          echo "DD_TEST_APPS_TOTAL_DURATION=660s" >> $GITHUB_ENV
+          echo "DD_TEST_APPS_PROFILE_PERIOD=60s" >> $GITHUB_ENV
+          echo "DD_TAGS=${DD_TAGS} nightly:true" >> $GITHUB_ENV
+
+      - name: Run unit of work app
+        run: |
+          cd ./internal/apps/unit-of-work && ./run.bash

.github/workflows/unit-integration-tests.yml

@@ -8,19 +8,6 @@ on:
         type: string
 
 jobs:
-  milestone:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'pull_request' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-        with:
-          repository: 'DataDog/dd-trace-go'
-      - name: Milestone
-        env:
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-        run: |
-          go run checkmilestone.go
   copyright:
     runs-on: ubuntu-latest
     steps:
@@ -31,6 +18,9 @@ jobs:
       - name: Copyright
         run: |
           go run checkcopyright.go
+
+  # Deprecated
+  # TODO remove this once the golangci-lint job is stable.
   lint:
     runs-on: ubuntu-latest
     steps:
@@ -57,9 +47,24 @@ jobs:
       - name: lint
         run: |
           go install golang.org/x/lint/golint@latest
-          curl -L https://git.io/vp6lP | sh # https://github.com/alecthomas/gometalinter#binary-releases
+          curl https://raw.githubusercontent.com/alecthomas/gometalinter/master/scripts/install.sh | sh # https://github.com/alecthomas/gometalinter#binary-releases
           ./bin/gometalinter --disable-all --vendor --deadline=120s --enable=golint ./...
 
+  golangci-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v4
+        with:
+          go-version: ${{ inputs.go-version }}
+          cache: true
+      - uses: actions/checkout@v3
+        with:
+          repository: 'DataDog/dd-trace-go'
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.52.2
+
   test-core:
     runs-on: ubuntu-latest
     env:

.gitlab-ci.yml

@@ -1,4 +1,14 @@
 stages:
   - benchmarks
+  - test-apps
 
-include: ".gitlab/benchmarks.yml"
+variables:
+  # This base image is created here: https://gitlab.ddbuild.io/DataDog/apm-reliability/relenv-microbenchmarking-platform/-/jobs/201492583
+  BASE_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/relenv-microbenchmarking-platform:dd-trace-go_knusbaum
+  INDEX_FILE: index.txt
+  KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: dd-trace-go
+  FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: "true"
+
+include:
+  - ".gitlab/benchmarks.yml"
+  - ".gitlab/test-apps.yml"

.gitlab/benchmarks.yml

@@ -1,11 +1,7 @@
-variables:
-  # This base image is created here: https://gitlab.ddbuild.io/DataDog/apm-reliability/relenv-microbenchmarking-platform/-/jobs/201492583
-  BASE_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/relenv-microbenchmarking-platform:dd-trace-go_knusbaum
-  INDEX_FILE: index.txt
-
 benchmark:
   stage: benchmarks
   image: $BASE_CI_IMAGE
+  when: on_success
   timeout: 1h
   only:
     refs:
@@ -24,6 +20,3 @@ benchmark:
     paths:
       - reports/
     expire_in: 3 months
-  variables:
-    KUBERNETES_SERVICE_ACCOUNT_OVERWRITE: dd-trace-go
-    FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: "true"

.gitlab/scripts/run-benchmarks.sh

@@ -4,6 +4,13 @@ set -ex
 
 source ./.gitlab/scripts/config-benchmarks.sh
 
+bench_loop_x10 () {
+  for i in {1..10}
+    do
+      go test -run=XXX -bench $BENCHMARK_TARGETS -benchmem -count 1 -benchtime 2s ./... | tee -a $1
+    done
+}
+
 CANDIDATE_BRANCH=$CI_COMMIT_REF_NAME
 CANDIDATE_COMMIT_SHA=$CI_COMMIT_SHA
 
@@ -14,7 +21,7 @@ git clone --branch "$CANDIDATE_BRANCH" https://github.com/DataDog/dd-trace-go "$
 
 # Run benchmarks for candidate release
 cd "$CANDIDATE_SRC/ddtrace/tracer/"
-go test -run=XXX -bench $BENCHMARK_TARGETS -benchmem -count 10 -benchtime 2s ./... | tee "${ARTIFACTS_DIR}/pr_bench.txt"
+bench_loop_x10 "${ARTIFACTS_DIR}/pr_bench.txt"
 
 BASELINE_BRANCH=$(github-find-merge-into-branch --for-repo="$CI_PROJECT_NAME" --for-pr="$CANDIDATE_BRANCH" || :)
 
@@ -29,5 +36,5 @@ if [ ! -z "$BASELINE_BRANCH" ]; then
 
   # Run benchmarks for baseline release
   cd "$BASELINE_SRC/ddtrace/tracer/"
-  go test -run=XXX -bench $BENCHMARK_TARGETS -benchmem -count 10 -benchtime 2s ./... | tee "${ARTIFACTS_DIR}/main_bench.txt"
+  bench_loop_x10 "${ARTIFACTS_DIR}/main_bench.txt"
 fi

.gitlab/scripts/run-test-apps.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -eu
+
+stop_agent() {
+  echo "-> Stopping agent"
+  service datadog-agent stop
+}
+trap "stop_agent" ERR
+
+echo "-> Installing agent"
+DD_HOSTNAME=$(hostname) \
+	DD_SITE="datad0g.com" \
+  DD_API_KEY="$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-go.dd_api_key --with-decryption --query "Parameter.Value" --out text)" \
+  DD_INSTALL_ONLY=true \
+  DD_AGENT_MAJOR_VERSION=7 \
+  bash -c "$(curl -L https://s3.amazonaws.com/dd-agent/scripts/install_script.sh)"
+
+echo "-> Starting agent"
+# see https://github.com/DataDog/datadog-agent/issues/14836
+cp /etc/datadog-agent/security-agent.yaml.example /etc/datadog-agent/security-agent.yaml
+service datadog-agent start
+
+echo "-> Running unit-of-work test app"
+cd ./internal/apps/unit-of-work && ./run.bash
+
+stop_agent

.gitlab/test-apps.yml

@@ -0,0 +1,16 @@
+unit-of-work:
+  stage: test-apps
+  when: manual
+  image: $BASE_CI_IMAGE
+  timeout: 1h
+  interruptible: true
+  tags: ["runner:apm-k8s-tweaked-metal"]
+  script:
+    - ./.gitlab/scripts/run-test-apps.sh
+  variables:
+    DD_ENV: "gitlab"
+    # 660s is enough time to capture 10 profiles without missing the last one
+    # (TODO: Implement profiler.StopFlush())
+    DD_TEST_APPS_TOTAL_DURATION: "660s"
+    DD_TEST_APPS_PROFILE_PERIOD: "60s"
+    DD_TEST_APPS_REQUESTS_PER_SECOND: 25

.golangci.yml

@@ -0,0 +1,11 @@
+run:
+  deadline: 10m
+  skip-dirs:
+    # This package is an exception and has its own test job (Testing outlier gRPC v1.2).
+    - contrib/google.golang.org/grpc.v12
+linters:
+  disable-all: true
+  enable:
+  - gofmt
+  - goimports
+  - revive

CONTRIBUTING.md

@@ -22,7 +22,7 @@ All new code is expected to be covered by tests.
 
 #### PR Checks
 
-We expect all PR checks to pass before we merge a PR. When opening a PR, the metadata check will fail until a repo maintainer assigns the PR a milestone. The other checks can be investigated by following the `Details` links to CircleCI and CodeCov for unit/integration tests and code coverage checks.
+We expect all PR checks to pass before we merge a PR, which can be investigated by following the `Details` links to CircleCI and CodeCov for unit/integration tests and code coverage checks.
 
 ![Screen Shot 2021-08-31 at 10 35 37 AM](https://user-images.githubusercontent.com/1819836/131533266-7c87305d-37df-4bd5-a9ea-6fb8e51e4b50.png)
 
@@ -41,6 +41,12 @@ If a PR sits open for more than a month awaiting work or replies by the author,
 A set of [Style guidelines](https://github.com/DataDog/dd-trace-go/wiki/Style-guidelines) was added to our Wiki. Please spend some time browsing it.
 It will help tremendously in avoiding comments and speeding up the PR process.
 
+To run golangci-lint locally:
+
+```
+docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint:v1.52.2 golangci-lint run -v
+```
+
 ### Integrations
 
 Please view our contrib [README.md](contrib/README.md) for information on new integrations. If you need support for a new integration, please file an issue to discuss before opening a PR.
@@ -55,10 +61,6 @@ This repository used to omit many dependencies from the `go.mod` file due to con
 git update-index --no-assume-unchanged go.*
 ```
 
-### Milestones
-
-The maintainers of this repository assign milestones to pull requests to classify them. `Triage` indicates that it is yet to be decided which version the change will go into. Pull requests that are ready get the upcoming release version assigned.
-
 ### Benchmarks
 
 Some benchmarks will run on any new PR commits, the results will be commented into the PR on completion.