Revamp 'make test' to not require local 'tox.ini' configuration.

Author: michaelsafyan

instrumentation-genai/opentelemetry-instrumentation-google-genai/pytest.ini

@@ -12,20 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 # This variant of the requirements aims to test the system using
 # the newest supported version of external depenendencies.
 
 pytest==7.4.4
 pytest-asyncio==0.21.0
 pytest-vcr==1.0.2
 
-google-auth ~= 2.38.0
-google-genai ~= 1.0.0
-opentelemetry-api ~= 1.30.0
-opentelemetry-sdk ~= 1.30.0
-opentelemetry-semantic-conventions ~= 0.51b0
-opentelemetry-instrumentation ~=0.51b0
+google-auth==2.38.0
+google-genai==1.0.0
+opentelemetry-api==1.30.0
+opentelemetry-sdk==1.30.0
+opentelemetry-semantic-conventions==0.51b0
+opentelemetry-instrumentation==0.51b0
 
 # Install locally from the folder. This path is relative to the
 # root directory, given invocation from "tox" at root level.

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/requirements.latest.txt

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Copyright The OpenTelemetry Authors
+#
+# 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.
+
+# Helper script of "test.sh".
+#
+# Assumptions:
+#   - Working directory: top-level root project directory
+#   - Virtual environment:
+#       - Activated
+#       - Contains the "tox" script
+#   - Arguments:
+#       - One argument
+#       - Argument supplies name of a configured tox environment
+#
+# Action:
+#
+#   Runs the given tox environment, with additional parameters
+#   to provide for more verbose debug output when testing.
+
+function main() {
+    local tox_env="$1"
+    tox -e "${tox_env}" -- -o log_cli_level=debug
+    exit $?
+}
+
+main "$@"

instrumentation-genai/opentelemetry-instrumentation-google-genai/tools/test-with-tox.sh

@@ -16,10 +16,16 @@
 
 SCRIPT_DIR=$(cd $(dirname "${BASH_SOURCE:-$0}"); pwd)
 PROJECT_DIR=$(readlink -f "${SCRIPT_DIR}/..")
+TOP_LEVEL_DIR=$(readlink -f "${PROJECT_DIR}/../../")
 TESTS_DIR="${PROJECT_DIR}/tests"
 TESTS_OUTPUT_DIR="${PROJECT_DIR}/.test"
 TEST_ENV="${TESTS_OUTPUT_DIR}/.venv"
 
+function run_tox_test() {
+    local tox_env="$1"
+    tox -e "${tox_env}" -- -o log_cli_level=debug 
+}
+
 function main() {
     if [ ! -d "${TEST_ENV}" ] ; then
       mkdir -p "${TEST_ENV}" || exit 1
@@ -28,11 +34,22 @@ function main() {
       python3 -m venv "${TEST_ENV}" || exit 1
     fi
     source "${TEST_ENV}/bin/activate" || exit 1
-    pip install -r "${TESTS_DIR}/requirements.txt" || exit 1
     pip install tox || exit 1
-    cd "${PROJECT_DIR}" || exit 1
-    make install || exit 1
-    python3 -m tox || exit 1
+    pip install pytest || exit 1
+    cd "${TOP_LEVEL_DIR_DIR}" || exit 1
+
+    local tox_environments=$(tox -l | grep 'test-instrumentation-google-genai')
+    local successful=0
+    for tox_environment in ${tox_environments} ; do
+      echo "[INFO] Testing environment: ${tox_environmenmt}" >&2
+      ${SCRIPT_DIR}/test-with-tox.sh "${tox_environment}"|| exit $?
+      successful=$(expr ${successful} + 1)
+    done
+    if [ $successful -eq 0 ] ; then
+      echo "[FATAL] No tests ran." >&2
+      exit 1
+    fi
+    echo "[DONE] Succesfully passed ${successful} environments." >&2
 }
 
 main

instrumentation-genai/opentelemetry-instrumentation-google-genai/tools/test.sh

@@ -20,7 +20,7 @@ envlist =
     lint-instrumentation-vertexai
 
     ; instrumentation-google-genai
-    py3{9, 10,11,12,13}-test-instrumentation-google-genai-{old-deps,recent-deps}
+    py3{9,10,11,12,13}-test-instrumentation-google-genai-{old-deps,recent-deps}
     # Disabling pypy3 as shapely does not have wheels and fails to compile
     # pypy3-test-instrumentation-google-genai-{0,1}
     lint-instrumentation-google-genai