Merge main into develop-graphql-async

.devcontainer/Dockerfile

@@ -0,0 +1,4 @@
+ARG IMAGE=ghcr.io/newrelic-experimental/pyenv-devcontainer:latest
+
+# To target other architectures, change the --platform directive in the Dockerfile.
+FROM --platform=linux/amd64 ${IMAGE}

.devcontainer/devcontainer.json

@@ -0,0 +1,35 @@
+// For format details, see https://containers.dev/implementors/json_reference/.
+{
+	"name": "pyenv",
+	"build":{
+		// To target other architectures, change the --platform directive in the Dockerfile.
+		"dockerfile": "Dockerfile",
+		"args": {
+			"IMAGE": "ghcr.io/newrelic-experimental/pyenv-devcontainer:latest"
+		}
+	},
+	"remoteUser": "vscode",
+	"runArgs": ["--network=host"],
+	"features": {
+	// Available Features: https://containers.dev/features
+		// "ghcr.io/devcontainers/features/docker-from-docker:1": {"moby": false},
+		// "ghcr.io/devcontainers/features/aws-cli:1": {},
+		// "ghcr.io/devcontainers/features/github-cli:1": {}
+	},
+	"containerEnv": {
+		"NEW_RELIC_HOST": "${localEnv:NEW_RELIC_HOST}",
+		"NEW_RELIC_LICENSE_KEY": "${localEnv:NEW_RELIC_LICENSE_KEY}",
+		"NEW_RELIC_INSERT_KEY": "${localEnv:NEW_RELIC_INSERT_KEY}",
+		"NEW_RELIC_DEVELOPER_MODE": "${localEnv:NEW_RELIC_DEVELOPER_MODE}"
+	},
+	"customizations": {
+		"vscode": {
+			"settings": {},
+			"extensions": [
+				"ms-python.python",
+				"ms-vsliveshare.vsliveshare",
+				"eamodio.gitlens"
+			]
+		}
+	}
+}

.github/containers/Dockerfile

@@ -0,0 +1,98 @@
+
+# Copyright 2010 New Relic, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM ubuntu:20.04
+
+# Install OS packages
+RUN export DEBIAN_FRONTEND=noninteractive && \
+    apt-get update && \
+    apt-get install -y \
+        bash \
+        build-essential \
+        curl \
+        expat \
+        freetds-common \
+        freetds-dev \
+        gcc \
+        git \
+        libbz2-dev \
+        libcurl4-openssl-dev \
+        libffi-dev \
+        libgmp-dev \
+        libkrb5-dev \
+        liblzma-dev \
+        libmpfr-dev \
+        libncurses-dev \
+        libpq-dev \
+        libreadline-dev \
+        libsqlite3-dev \
+        libssl-dev \
+        locales \
+        make \
+        odbc-postgresql \
+        openssl \
+        python2-dev \
+        python3-dev \
+        python3-pip \
+        tzdata \
+        unixodbc-dev \
+        unzip \
+        wget \
+        zip \
+        zlib1g \
+        zlib1g-dev && \
+    rm -rf /var/lib/apt/lists/*
+
+# Build librdkafka from source
+ARG LIBRDKAFKA_VERSION=2.1.1
+RUN cd /tmp && \
+    wget https://github.com/confluentinc/librdkafka/archive/refs/tags/v${LIBRDKAFKA_VERSION}.zip -O ./librdkafka.zip && \
+    unzip ./librdkafka.zip && \
+    rm ./librdkafka.zip && \
+    cd ./librdkafka-${LIBRDKAFKA_VERSION} && \
+    ./configure && \
+    make all install && \
+    cd /tmp && \
+    rm -rf ./librdkafka-${LIBRDKAFKA_VERSION}
+
+# Setup ODBC config
+RUN sed -i 's|Driver=psqlodbca.so|Driver=/usr/lib/x86_64-linux-gnu/odbc/psqlodbca.so|g' /etc/odbcinst.ini && \
+    sed -i 's|Driver=psqlodbcw.so|Driver=/usr/lib/x86_64-linux-gnu/odbc/psqlodbcw.so|g' /etc/odbcinst.ini && \
+    sed -i 's|Setup=libodbcpsqlS.so|Setup=/usr/lib/x86_64-linux-gnu/odbc/libodbcpsqlS.so|g' /etc/odbcinst.ini
+
+# Set the locale
+RUN locale-gen --no-purge en_US.UTF-8
+ENV LANG=en_US.UTF-8 \ LANGUAGE=en_US:en \ LC_ALL=en_US.UTF-8
+ENV TZ="Etc/UTC"
+RUN ln -fs "/usr/share/zoneinfo/${TZ}" /etc/localtime && \
+    dpkg-reconfigure -f noninteractive tzdata
+
+# Use root user
+ENV HOME /root
+WORKDIR "${HOME}"
+
+# Install pyenv
+ENV PYENV_ROOT="${HOME}/.pyenv"
+RUN curl https://pyenv.run/ | /bin/bash
+ENV PATH="$PYENV_ROOT/bin:$PYENV_ROOT/shims:${PATH}"
+RUN echo 'eval "$(pyenv init -)"' >>$HOME/.bashrc && \
+    pyenv update
+
+# Install Python
+ARG PYTHON_VERSIONS="3.10 3.9 3.8 3.7 3.11 2.7 pypy2.7-7.3.12 pypy3.8-7.3.11"
+COPY --chown=1000:1000 --chmod=+x ./install-python.sh /tmp/install-python.sh
+COPY ./requirements.txt /requirements.txt
+RUN /tmp/install-python.sh && \
+    rm /tmp/install-python.sh

.github/containers/Makefile

@@ -0,0 +1,48 @@
+# Copyright 2010 New Relic, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Repository root for mounting into container.
+MAKEFILE_DIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+REPO_ROOT:=$(realpath $(MAKEFILE_DIR)../../)
+
+.PHONY: default
+default: test
+
+.PHONY: build
+build:
+	@# Perform a shortened build for testing
+	@docker build $(MAKEFILE_DIR) \
+		-t ghcr.io/newrelic/newrelic-python-agent-ci:local \
+		--build-arg='PYTHON_VERSIONS=3.10 2.7'
+
+.PHONY: test
+test: build
+	@# Ensure python versions are usable
+	@docker run --rm ghcr.io/newrelic/python-agent-ci:local /bin/bash -c '\
+		python3.10 --version && \
+		python2.7 --version && \
+		touch tox.ini && tox --version && \
+		echo "Success! Python versions installed."'
+
+.PHONY: run
+run: build
+	@docker run --rm -it \
+		--mount type=bind,source="$(REPO_ROOT)",target=/home/github/python-agent \
+		--workdir=/home/github/python-agent \
+		--add-host=host.docker.internal:host-gateway \
+		-e NEW_RELIC_HOST="${NEW_RELIC_HOST}" \
+		-e NEW_RELIC_LICENSE_KEY="${NEW_RELIC_LICENSE_KEY}" \
+		-e NEW_RELIC_DEVELOPER_MODE="${NEW_RELIC_DEVELOPER_MODE}" \
+		-e GITHUB_ACTIONS="true" \
+		ghcr.io/newrelic/newrelic-python-agent-ci:local /bin/bash

.github/containers/install-python.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+# Copyright 2010 New Relic, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+main() {
+    # Coerce space separated string to array
+    if [[ ${#PYTHON_VERSIONS[@]} -eq 1 ]]; then
+        PYTHON_VERSIONS=($PYTHON_VERSIONS)
+    fi
+
+    if [[ -z "${PYTHON_VERSIONS[@]}" ]]; then
+        echo "No python versions specified. Make sure PYTHON_VERSIONS is set." 1>&2
+        exit 1
+    fi
+
+    # Find all latest pyenv supported versions for requested python versions
+    PYENV_VERSIONS=()
+    for v in "${PYTHON_VERSIONS[@]}"; do
+        LATEST=$(pyenv latest -k "$v" || pyenv latest -k "$v-dev")
+        if [[ -z "$LATEST" ]]; then
+            echo "Latest version could not be found for ${v}." 1>&2
+            exit 1
+        fi
+        PYENV_VERSIONS+=($LATEST)
+    done
+
+    # Install each specific version
+    for v in "${PYENV_VERSIONS[@]}"; do
+        pyenv install "$v" &
+    done
+    wait
+
+    # Set all installed versions as globally accessible
+    pyenv global ${PYENV_VERSIONS[@]}
+
+    # Install dependencies for main python installation
+    pyenv exec pip install --upgrade -r /requirements.txt
+}
+
+main

.github/containers/requirements.txt

@@ -0,0 +1,5 @@
+pip
+setuptools
+wheel
+virtualenv<20.22.0
+tox

.github/mergify.yml

@@ -0,0 +1,80 @@
+# For condition grammar see: https://docs.mergify.com/conditions/#grammar
+
+shared:
+  conditions:
+    - and: &pr_ready_checks
+        - "#approved-reviews-by>=1" # A '#' pulls the length of the underlying list
+        - "label=ready-to-merge"
+        - "check-success=tests"
+        - "-draft" # Don't include draft PRs
+        - "-merged"
+        - or: # Only handle branches that target main or develop branches
+            - "base=main"
+            - "base~=^develop"
+
+queue_rules:
+  - name: default
+    conditions:
+      - and: *pr_ready_checks
+    merge_method: squash
+
+pull_request_rules:
+  # Merge Queue PR Rules
+  - name: Regular PRs - Add to merge queue on approval (squash)
+    conditions:
+      - and: *pr_ready_checks
+      - "-head~=^develop" # Don't include PRs from develop branches
+    actions:
+      queue:
+        method: squash
+
+  # Automatic PR Updates
+  - name: Automatic PR branch updates
+    conditions:
+      - "queue-position=-1" # Not queued
+      - "-draft" # Don't include draft PRs
+      - "-merged"
+    actions:
+      update:
+
+  # Automatic Labeling
+  - name: Clean up after merge
+    conditions:
+      - merged
+    actions:
+      delete_head_branch:
+      label:
+        remove:
+          - "merge-conflicts"
+          - "ready-to-merge"
+          - "tests-failing"
+
+  - name: Toggle label on merge conflicts
+    conditions:
+      - "-merged"
+      - conflict
+    actions:
+      label:
+        toggle:
+          - "merge-conflicts"
+
+  # Don't use a toggle for this, as the label constantly gets applied and removed when tests are rerun.
+  - name: Add label on test failures
+    conditions:
+      - "-merged"
+      - or:
+          - check-failure=tests
+          - check-skipped=tests
+    actions:
+      label:
+        add:
+          - "tests-failing"
+
+  - name: Remove label on test success
+    conditions:
+      - "-merged"
+      - check-success=tests
+    actions:
+      label:
+        remove:
+          - "tests-failing"