From a2427d3c4c4a0c238529d5193dc2aab5c1226585 Mon Sep 17 00:00:00 2001 From: Jen Hamon Date: Wed, 23 Oct 2024 12:29:06 -0400 Subject: [PATCH 1/3] Initial datadog setup --- .github/actions/test-data-plane/action.yaml | 12 +- .github/workflows/testing-integration.yaml | 3 +- poetry.lock | 280 +++++++++++++++++++- pyproject.toml | 1 + 4 files changed, 290 insertions(+), 6 deletions(-) diff --git a/.github/actions/test-data-plane/action.yaml b/.github/actions/test-data-plane/action.yaml index 9fafc0d5..650e9c4e 100644 --- a/.github/actions/test-data-plane/action.yaml +++ b/.github/actions/test-data-plane/action.yaml @@ -29,6 +29,9 @@ inputs: description: 'The version of Python to use' required: false default: '3.9' + DATADOG_API_KEY: + description: 'The Datadog API key' + required: true outputs: index_name: @@ -52,10 +55,15 @@ runs: - name: Run data plane tests id: data-plane-tests shell: bash - run: poetry run pytest tests/integration/data + run: poetry run pytest tests/integration/data --ddtrace env: + DD_CIVISIBILITY_AGENTLESS_ENABLED: true + DD_API_KEY: ${{ inputs.DATADOG_API_KEY }} + DD_SITE: datadoghq.com + DD_ENV: ci + DD_SERVICE: pinecone-python-client PINECONE_API_KEY: ${{ inputs.PINECONE_API_KEY }} USE_GRPC: ${{ inputs.use_grpc }} METRIC: ${{ inputs.metric }} SPEC: ${{ inputs.spec }} - FRESHNESS_TIMEOUT_SECONDS: ${{ inputs.freshness_timeout_seconds }} \ No newline at end of file + FRESHNESS_TIMEOUT_SECONDS: ${{ inputs.freshness_timeout_seconds }} diff --git a/.github/workflows/testing-integration.yaml b/.github/workflows/testing-integration.yaml index fd6364b7..53b00429 100644 --- a/.github/workflows/testing-integration.yaml +++ b/.github/workflows/testing-integration.yaml @@ -33,7 +33,7 @@ jobs: matrix: python_version: [3.8, 3.12] use_grpc: [true, false] - metric: + metric: - cosine # - euclidean # - dotproduct @@ -43,6 +43,7 @@ jobs: - uses: actions/checkout@v4 - uses: ./.github/actions/test-data-plane with: + DATADOG_API_KEY: '${{ secrets.DATADOG_API_KEY }}' python_version: '${{ matrix.python_version }}' use_grpc: '${{ matrix.use_grpc }}' metric: '${{ matrix.metric }}' diff --git a/poetry.lock b/poetry.lock index 758f00d4..2c06c7a5 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "astunparse" @@ -15,6 +15,20 @@ files = [ six = ">=1.6.1,<2.0" wheel = ">=0.23.0,<1.0" +[[package]] +name = "bytecode" +version = "0.15.1" +description = "Python module to generate and modify bytecode" +optional = false +python-versions = ">=3.8" +files = [ + {file = "bytecode-0.15.1-py3-none-any.whl", hash = "sha256:0a1dc340cac823cff605609b8b214f7f9bf80418c6b9e0fc8c6db1793c27137d"}, + {file = "bytecode-0.15.1.tar.gz", hash = "sha256:7263239a8d3f70fc7c303862b20cd2c6788052e37ce0a26e67309d280e985984"}, +] + +[package.dependencies] +typing-extensions = {version = "*", markers = "python_version < \"3.10\""} + [[package]] name = "certifi" version = "2024.7.4" @@ -211,6 +225,109 @@ files = [ [package.extras] toml = ["tomli"] +[[package]] +name = "ddtrace" +version = "2.14.4" +description = "Datadog APM client library" +optional = false +python-versions = ">=3.7" +files = [ + {file = "ddtrace-2.14.4-cp310-cp310-macosx_12_0_universal2.whl", hash = "sha256:71879996aacda72bfbd8d4fc2906e8ba099b026d705943970e4b33074b977d32"}, + {file = "ddtrace-2.14.4-cp310-cp310-macosx_12_0_x86_64.whl", hash = "sha256:9eed749fe47d3f05f550048d89a4101a8419479df9ed48a0dcaf43edd9e93dab"}, + {file = "ddtrace-2.14.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:19946e04c42c28519e9e74c996feccdc64830d00375477e3bc92b5c36fcaa461"}, + {file = "ddtrace-2.14.4-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:893dec5458eee7a3f7fda6b6f254cf7b8bd00016bcc13befcad47c98a3acaeb6"}, + {file = "ddtrace-2.14.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:74794b9555b005e9be9dea9ae76350e218fdaddcf8070b1c8a4be7aeefa24433"}, + {file = "ddtrace-2.14.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:3fb952c31574dffbd5b8d95471f0941415748b5da309ba864c3751b12ea4a051"}, + {file = "ddtrace-2.14.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f5a4be0b64cdb88f634048f002418364f4fb5495577426296d5010cc2e27d4ca"}, + {file = "ddtrace-2.14.4-cp310-cp310-musllinux_1_2_i686.whl", hash = "sha256:034b0663b2d0db05debf7507e61f71c9e9d3f9706fe6aae5fb9c9ed0a9c2b7c9"}, + {file = "ddtrace-2.14.4-cp310-cp310-win32.whl", hash = "sha256:c11419f36f3fda698d50df411903d1baab58ccb220548bee24addbe4dc49b4d6"}, + {file = "ddtrace-2.14.4-cp310-cp310-win_amd64.whl", hash = "sha256:8235035451a5d560e6c7fe3cc789ae4d36b9276a6c7ca2979882f35aa67fadf1"}, + {file = "ddtrace-2.14.4-cp311-cp311-macosx_12_0_universal2.whl", hash = "sha256:92686e740679d60bb353cf822dbf2a9631d469bf5d19b02a14a195fc26421bbd"}, + {file = "ddtrace-2.14.4-cp311-cp311-macosx_12_0_x86_64.whl", hash = "sha256:9561d1808bf5b0108d19da72aad3b28fc8636444f1a67e62b4135dfa9796fa13"}, + {file = "ddtrace-2.14.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0bd22635660c70ad400057437255add66d588ee61ab0ae544f3b4a017f2ef758"}, + {file = "ddtrace-2.14.4-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:15912d9178af01a851fc578480b85917e2e8e51b16d18d3f58c2fa3435a162a7"}, + {file = "ddtrace-2.14.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dfc81f2771850e1b08fdc2fccf9fd58d2ae14f82dc26cf8dec25a364c6af4127"}, + {file = "ddtrace-2.14.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:39f853530e85fc95ba706da2a445c8b5034794f3c7d333e701807b1ce655fc9a"}, + {file = "ddtrace-2.14.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:769eb974c2500d7e8d70a916f324f3976dc2664eaf6c52e5553989c335a271b2"}, + {file = "ddtrace-2.14.4-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:87d594ebcf70714c9b6cbb2bdd9d3f77ada787be6fca99c9fe9230eb6c203d32"}, + {file = "ddtrace-2.14.4-cp311-cp311-win32.whl", hash = "sha256:775483c435719855cc5a6d9a6fd2a36246ede1ed038e30112a0a0c8f6cbe9b91"}, + {file = "ddtrace-2.14.4-cp311-cp311-win_amd64.whl", hash = "sha256:9a750a779813c72e469712f8e2bc8cf0c339ee9d5d9ffbcb51eccbd9391e77e6"}, + {file = "ddtrace-2.14.4-cp312-cp312-macosx_12_0_universal2.whl", hash = "sha256:84221097dd827d3ab4e36bfebd9007e6eb962d523f86a8fb9ee3c6d046bd800f"}, + {file = "ddtrace-2.14.4-cp312-cp312-macosx_12_0_x86_64.whl", hash = "sha256:4ebbf92529d00819dc79641c6334476023792da60fb6c889dca280e13ffbd6d3"}, + {file = "ddtrace-2.14.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b641f8665adadc45dda9887721bfcae09ce22ee853d993c4118e038e4d8493a5"}, + {file = "ddtrace-2.14.4-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd3c026104964845c770c37d85676d1e2ed22a62dcbff9a75410a15e672f5ea9"}, + {file = "ddtrace-2.14.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc58e1d10e97dcb2ea6f54bd11e2d1b381c202ab5c27ea3c92268093f9e0b219"}, + {file = "ddtrace-2.14.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:354080d26f159d997fd8c6b37f6d21665fb8c35291eed9b7603043a3da1695b6"}, + {file = "ddtrace-2.14.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:aeeb2e97ad31ecc8428c028689213b46ba9b862df1895082945f184ff1fac570"}, + {file = "ddtrace-2.14.4-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:2aedc0a26a9c109fe04fa1c4e8c42fb8977f59d4c5495c20573624ebdc74c585"}, + {file = "ddtrace-2.14.4-cp312-cp312-win32.whl", hash = "sha256:b74e05d56fafbd49999e1db9fbabfaa9d1733a693a9a22dd8c1455e8871095af"}, + {file = "ddtrace-2.14.4-cp312-cp312-win_amd64.whl", hash = "sha256:8fd863bb363fcaa01290c979eb3061a865998c3ef2484ab0ed09f523a4b7191f"}, + {file = "ddtrace-2.14.4-cp37-cp37m-macosx_12_0_x86_64.whl", hash = "sha256:cbedfeeaa01fe4a3519caeb29edd189e19440bdffea9e310fe2c40acbda0eeef"}, + {file = "ddtrace-2.14.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e3f6f88039dd1b2f826d39ac1c629c3444ac456a4c933e364243b86e38dbaf7"}, + {file = "ddtrace-2.14.4-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4a21ef11b6f59237315320014a77c47ed37a5834cc8599e255dffba90398dc40"}, + {file = "ddtrace-2.14.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:32790eab788ea63c33a61239a09bf777ed5a969827770e6c9a0d2d4591e9c26b"}, + {file = "ddtrace-2.14.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:01b315024ee8cda0673f443bcd5d0015f4e37934e511d6c6899c54a6c6010751"}, + {file = "ddtrace-2.14.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:c42766844344a6e1452cb887962d2cf72a765c4578ebafd67ed0816b4bf2eaba"}, + {file = "ddtrace-2.14.4-cp37-cp37m-musllinux_1_2_i686.whl", hash = "sha256:c204378e098383e9c01c6d64575966ace0c289fabfc2725580f14bfa999a199d"}, + {file = "ddtrace-2.14.4-cp37-cp37m-win32.whl", hash = "sha256:503c1b1791f6d804535fdab0908a3a79e6751e47ecd5c465dabcffd335e35c0a"}, + {file = "ddtrace-2.14.4-cp37-cp37m-win_amd64.whl", hash = "sha256:73bc80aac53922b81f6705333854f2fc8efe7e3f3499ea276268873a9e855e8b"}, + {file = "ddtrace-2.14.4-cp38-cp38-macosx_12_0_universal2.whl", hash = "sha256:c22d4ca64f6646838ef85eed1f25c82c568546d1ea7df4a524f03d17ac64a420"}, + {file = "ddtrace-2.14.4-cp38-cp38-macosx_12_0_x86_64.whl", hash = "sha256:26124bca28d33d4e6991aa653c401e5bdafac4f1d21a55f24a53f355f6c27d85"}, + {file = "ddtrace-2.14.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3f6a1b8a2e6e2b6b964cbf375af916625e28d77ef6fe3e0e4e5f2a7fc9a5f712"}, + {file = "ddtrace-2.14.4-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fe5f224786dc5f80f09238098d0863e5eb7f870b46a65295c380851e34f0cc5e"}, + {file = "ddtrace-2.14.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:41f5f617bab1f1287a085268b4e95a1d90bb5b324859dd2ae0b59d7d2dab1001"}, + {file = "ddtrace-2.14.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:793b8e269c196dc9449b87914df95b4e6a2c69de10a12d42fd4a5184d5eca423"}, + {file = "ddtrace-2.14.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:eb48e26b1f4f09e426a154473000f4b1cd80615df0a07b4a9cfc6ec7bce86cc9"}, + {file = "ddtrace-2.14.4-cp38-cp38-musllinux_1_2_i686.whl", hash = "sha256:7091390be67ba711d0a5aa4886fca1124b541c6ca575010f8bd5abc448176ac8"}, + {file = "ddtrace-2.14.4-cp38-cp38-win32.whl", hash = "sha256:b76e27fddc9727b07aed1995bcca04e71c0c2ff4c6bafb78a30695979af8153d"}, + {file = "ddtrace-2.14.4-cp38-cp38-win_amd64.whl", hash = "sha256:d6f0f6c8eb2e2f2516191c27e019d634522d9c9c0e8fa267edaa05bfe851661d"}, + {file = "ddtrace-2.14.4-cp39-cp39-macosx_12_0_universal2.whl", hash = "sha256:b00db880723c4e7717d17c1e9bb03669aece42fa5375b577ed8a6fbdf30fe7df"}, + {file = "ddtrace-2.14.4-cp39-cp39-macosx_12_0_x86_64.whl", hash = "sha256:cbcb98cf777df17b07241e735877cfd2adf99d0d93fcdc9b23df0fbbc74268c1"}, + {file = "ddtrace-2.14.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dedfe6ae56875af16763cb9919d4a337ee0b1878c580eb81eef70928a44543af"}, + {file = "ddtrace-2.14.4-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e3558c54f78d07738cc6244d30be5c402c4efb0df6751ddb0010d1c8d18a6bf1"}, + {file = "ddtrace-2.14.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:502826c8ba30a7b59d72dbf0bbc71e131dd274e01a107edd6116c400c2c5e46b"}, + {file = "ddtrace-2.14.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0d01c0c1611aa89aa96f0fa55c354f7279d4927c515a67ebd10ddba1d53c753f"}, + {file = "ddtrace-2.14.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:190312f0c278c2c4245bc08e16de8e2127bc584a796860ad22b2ac89a4e1b340"}, + {file = "ddtrace-2.14.4-cp39-cp39-musllinux_1_2_i686.whl", hash = "sha256:9593407a7eaf1de0faf50ad787412a599ea0036c1bed53015e8ac8bb02d25dfe"}, + {file = "ddtrace-2.14.4-cp39-cp39-win32.whl", hash = "sha256:c5d888fb987500803809ba65e7d753397b7bf1b1cb38b958fd2daee40a500f89"}, + {file = "ddtrace-2.14.4-cp39-cp39-win_amd64.whl", hash = "sha256:0725a8515526caef46defbe1a84a33b459016a6e0bd240a4f54eaa7b6c07b515"}, + {file = "ddtrace-2.14.4.tar.gz", hash = "sha256:558fe292d0c03aac6b034c2014489881c0a36390aca4f49bc199cdd9880faa44"}, +] + +[package.dependencies] +bytecode = [ + {version = ">=0.13.0", markers = "python_version < \"3.11.0\""}, + {version = ">=0.14.0", markers = "python_version ~= \"3.11.0\""}, + {version = ">=0.15.0", markers = "python_version >= \"3.12.0\""}, +] +envier = ">=0.5,<1.0" +opentelemetry-api = ">=1" +protobuf = ">=3" +typing-extensions = "*" +wrapt = ">=1" +xmltodict = ">=0.12" + +[package.extras] +openai = ["tiktoken"] +opentracing = ["opentracing (>=2.0.0)"] + +[[package]] +name = "deprecated" +version = "1.2.14" +description = "Python @deprecated decorator to deprecate old python classes, functions or methods." +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +files = [ + {file = "Deprecated-1.2.14-py2.py3-none-any.whl", hash = "sha256:6fac8b097794a90302bdbb17b9b815e732d3c4720583ff1b198499d78470466c"}, + {file = "Deprecated-1.2.14.tar.gz", hash = "sha256:e5323eb936458dccc2582dc6f9c322c852a775a27065ff2b0c4970b9d53d01b3"}, +] + +[package.dependencies] +wrapt = ">=1.10,<2" + +[package.extras] +dev = ["PyTest", "PyTest-Cov", "bump2version (<1)", "sphinx (<2)", "tox"] + [[package]] name = "distlib" version = "0.3.8" @@ -222,6 +339,20 @@ files = [ {file = "distlib-0.3.8.tar.gz", hash = "sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64"}, ] +[[package]] +name = "envier" +version = "0.6.1" +description = "Python application configuration via the environment" +optional = false +python-versions = ">=3.7" +files = [ + {file = "envier-0.6.1-py3-none-any.whl", hash = "sha256:73609040a76be48bbcb97074d9969666484aa0de706183a6e9ef773156a8a6a9"}, + {file = "envier-0.6.1.tar.gz", hash = "sha256:3309a01bb3d8850c9e7a31a5166d5a836846db2faecb79b9cb32654dd50ca9f9"}, +] + +[package.extras] +mypy = ["mypy"] + [[package]] name = "exceptiongroup" version = "1.1.3" @@ -374,6 +505,25 @@ files = [ {file = "idna-3.7.tar.gz", hash = "sha256:028ff3aadf0609c1fd278d8ea3089299412a7a8b9bd005dd08b9f8285bcb5cfc"}, ] +[[package]] +name = "importlib-metadata" +version = "8.4.0" +description = "Read metadata from Python packages" +optional = false +python-versions = ">=3.8" +files = [ + {file = "importlib_metadata-8.4.0-py3-none-any.whl", hash = "sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1"}, + {file = "importlib_metadata-8.4.0.tar.gz", hash = "sha256:9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5"}, +] + +[package.dependencies] +zipp = ">=0.5" + +[package.extras] +doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +perf = ["ipython"] +test = ["flufl.flake8", "importlib-resources (>=1.3)", "jaraco.test (>=5.4)", "packaging", "pyfakefs", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-perf (>=0.9.2)", "pytest-ruff (>=0.2.1)"] + [[package]] name = "iniconfig" version = "2.0.0" @@ -670,6 +820,21 @@ files = [ {file = "numpy-1.26.3.tar.gz", hash = "sha256:697df43e2b6310ecc9d95f05d5ef20eacc09c7c4ecc9da3f235d39e71b7da1e4"}, ] +[[package]] +name = "opentelemetry-api" +version = "1.27.0" +description = "OpenTelemetry Python API" +optional = false +python-versions = ">=3.8" +files = [ + {file = "opentelemetry_api-1.27.0-py3-none-any.whl", hash = "sha256:953d5871815e7c30c81b56d910c707588000fff7a3ca1c73e6531911d53065e7"}, + {file = "opentelemetry_api-1.27.0.tar.gz", hash = "sha256:ed673583eaa5f81b5ce5e86ef7cdaf622f88ef65f0b9aab40b843dcae5bef342"}, +] + +[package.dependencies] +deprecated = ">=1.2.6" +importlib-metadata = ">=6.0,<=8.4.0" + [[package]] name = "packaging" version = "23.2" @@ -875,7 +1040,7 @@ virtualenv = ">=20.10.0" name = "protobuf" version = "5.28.2" description = "" -optional = true +optional = false python-versions = ">=3.8" files = [ {file = "protobuf-5.28.2-cp310-abi3-win32.whl", hash = "sha256:eeea10f3dc0ac7e6b4933d32db20662902b4ab81bf28df12218aa389e9c2102d"}, @@ -1306,10 +1471,119 @@ files = [ [package.extras] test = ["pytest (>=6.0.0)", "setuptools (>=65)"] +[[package]] +name = "wrapt" +version = "1.16.0" +description = "Module for decorators, wrappers and monkey patching." +optional = false +python-versions = ">=3.6" +files = [ + {file = "wrapt-1.16.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:ffa565331890b90056c01db69c0fe634a776f8019c143a5ae265f9c6bc4bd6d4"}, + {file = "wrapt-1.16.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e4fdb9275308292e880dcbeb12546df7f3e0f96c6b41197e0cf37d2826359020"}, + {file = "wrapt-1.16.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bb2dee3874a500de01c93d5c71415fcaef1d858370d405824783e7a8ef5db440"}, + {file = "wrapt-1.16.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2a88e6010048489cda82b1326889ec075a8c856c2e6a256072b28eaee3ccf487"}, + {file = "wrapt-1.16.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ac83a914ebaf589b69f7d0a1277602ff494e21f4c2f743313414378f8f50a4cf"}, + {file = "wrapt-1.16.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:73aa7d98215d39b8455f103de64391cb79dfcad601701a3aa0dddacf74911d72"}, + {file = "wrapt-1.16.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:807cc8543a477ab7422f1120a217054f958a66ef7314f76dd9e77d3f02cdccd0"}, + {file = "wrapt-1.16.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bf5703fdeb350e36885f2875d853ce13172ae281c56e509f4e6eca049bdfb136"}, + {file = "wrapt-1.16.0-cp310-cp310-win32.whl", hash = "sha256:f6b2d0c6703c988d334f297aa5df18c45e97b0af3679bb75059e0e0bd8b1069d"}, + {file = "wrapt-1.16.0-cp310-cp310-win_amd64.whl", hash = "sha256:decbfa2f618fa8ed81c95ee18a387ff973143c656ef800c9f24fb7e9c16054e2"}, + {file = "wrapt-1.16.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1a5db485fe2de4403f13fafdc231b0dbae5eca4359232d2efc79025527375b09"}, + {file = "wrapt-1.16.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:75ea7d0ee2a15733684badb16de6794894ed9c55aa5e9903260922f0482e687d"}, + {file = "wrapt-1.16.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a452f9ca3e3267cd4d0fcf2edd0d035b1934ac2bd7e0e57ac91ad6b95c0c6389"}, + {file = "wrapt-1.16.0-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:43aa59eadec7890d9958748db829df269f0368521ba6dc68cc172d5d03ed8060"}, + {file = "wrapt-1.16.0-cp311-cp311-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72554a23c78a8e7aa02abbd699d129eead8b147a23c56e08d08dfc29cfdddca1"}, + {file = "wrapt-1.16.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d2efee35b4b0a347e0d99d28e884dfd82797852d62fcd7ebdeee26f3ceb72cf3"}, + {file = "wrapt-1.16.0-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:6dcfcffe73710be01d90cae08c3e548d90932d37b39ef83969ae135d36ef3956"}, + {file = "wrapt-1.16.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:eb6e651000a19c96f452c85132811d25e9264d836951022d6e81df2fff38337d"}, + {file = "wrapt-1.16.0-cp311-cp311-win32.whl", hash = "sha256:66027d667efe95cc4fa945af59f92c5a02c6f5bb6012bff9e60542c74c75c362"}, + {file = "wrapt-1.16.0-cp311-cp311-win_amd64.whl", hash = "sha256:aefbc4cb0a54f91af643660a0a150ce2c090d3652cf4052a5397fb2de549cd89"}, + {file = "wrapt-1.16.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:5eb404d89131ec9b4f748fa5cfb5346802e5ee8836f57d516576e61f304f3b7b"}, + {file = "wrapt-1.16.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:9090c9e676d5236a6948330e83cb89969f433b1943a558968f659ead07cb3b36"}, + {file = "wrapt-1.16.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94265b00870aa407bd0cbcfd536f17ecde43b94fb8d228560a1e9d3041462d73"}, + {file = "wrapt-1.16.0-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f2058f813d4f2b5e3a9eb2eb3faf8f1d99b81c3e51aeda4b168406443e8ba809"}, + {file = "wrapt-1.16.0-cp312-cp312-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:98b5e1f498a8ca1858a1cdbffb023bfd954da4e3fa2c0cb5853d40014557248b"}, + {file = "wrapt-1.16.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:14d7dc606219cdd7405133c713f2c218d4252f2a469003f8c46bb92d5d095d81"}, + {file = "wrapt-1.16.0-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:49aac49dc4782cb04f58986e81ea0b4768e4ff197b57324dcbd7699c5dfb40b9"}, + {file = "wrapt-1.16.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:418abb18146475c310d7a6dc71143d6f7adec5b004ac9ce08dc7a34e2babdc5c"}, + {file = "wrapt-1.16.0-cp312-cp312-win32.whl", hash = "sha256:685f568fa5e627e93f3b52fda002c7ed2fa1800b50ce51f6ed1d572d8ab3e7fc"}, + {file = "wrapt-1.16.0-cp312-cp312-win_amd64.whl", hash = "sha256:dcdba5c86e368442528f7060039eda390cc4091bfd1dca41e8046af7c910dda8"}, + {file = "wrapt-1.16.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:d462f28826f4657968ae51d2181a074dfe03c200d6131690b7d65d55b0f360f8"}, + {file = "wrapt-1.16.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a33a747400b94b6d6b8a165e4480264a64a78c8a4c734b62136062e9a248dd39"}, + {file = "wrapt-1.16.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b3646eefa23daeba62643a58aac816945cadc0afaf21800a1421eeba5f6cfb9c"}, + {file = "wrapt-1.16.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ebf019be5c09d400cf7b024aa52b1f3aeebeff51550d007e92c3c1c4afc2a40"}, + {file = "wrapt-1.16.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:0d2691979e93d06a95a26257adb7bfd0c93818e89b1406f5a28f36e0d8c1e1fc"}, + {file = "wrapt-1.16.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:1acd723ee2a8826f3d53910255643e33673e1d11db84ce5880675954183ec47e"}, + {file = "wrapt-1.16.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:bc57efac2da352a51cc4658878a68d2b1b67dbe9d33c36cb826ca449d80a8465"}, + {file = "wrapt-1.16.0-cp36-cp36m-win32.whl", hash = "sha256:da4813f751142436b075ed7aa012a8778aa43a99f7b36afe9b742d3ed8bdc95e"}, + {file = "wrapt-1.16.0-cp36-cp36m-win_amd64.whl", hash = "sha256:6f6eac2360f2d543cc875a0e5efd413b6cbd483cb3ad7ebf888884a6e0d2e966"}, + {file = "wrapt-1.16.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a0ea261ce52b5952bf669684a251a66df239ec6d441ccb59ec7afa882265d593"}, + {file = "wrapt-1.16.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7bd2d7ff69a2cac767fbf7a2b206add2e9a210e57947dd7ce03e25d03d2de292"}, + {file = "wrapt-1.16.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9159485323798c8dc530a224bd3ffcf76659319ccc7bbd52e01e73bd0241a0c5"}, + {file = "wrapt-1.16.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a86373cf37cd7764f2201b76496aba58a52e76dedfaa698ef9e9688bfd9e41cf"}, + {file = "wrapt-1.16.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:73870c364c11f03ed072dda68ff7aea6d2a3a5c3fe250d917a429c7432e15228"}, + {file = "wrapt-1.16.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b935ae30c6e7400022b50f8d359c03ed233d45b725cfdd299462f41ee5ffba6f"}, + {file = "wrapt-1.16.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:db98ad84a55eb09b3c32a96c576476777e87c520a34e2519d3e59c44710c002c"}, + {file = "wrapt-1.16.0-cp37-cp37m-win32.whl", hash = "sha256:9153ed35fc5e4fa3b2fe97bddaa7cbec0ed22412b85bcdaf54aeba92ea37428c"}, + {file = "wrapt-1.16.0-cp37-cp37m-win_amd64.whl", hash = "sha256:66dfbaa7cfa3eb707bbfcd46dab2bc6207b005cbc9caa2199bcbc81d95071a00"}, + {file = "wrapt-1.16.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1dd50a2696ff89f57bd8847647a1c363b687d3d796dc30d4dd4a9d1689a706f0"}, + {file = "wrapt-1.16.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:44a2754372e32ab315734c6c73b24351d06e77ffff6ae27d2ecf14cf3d229202"}, + {file = "wrapt-1.16.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e9723528b9f787dc59168369e42ae1c3b0d3fadb2f1a71de14531d321ee05b0"}, + {file = "wrapt-1.16.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dbed418ba5c3dce92619656802cc5355cb679e58d0d89b50f116e4a9d5a9603e"}, + {file = "wrapt-1.16.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:941988b89b4fd6b41c3f0bfb20e92bd23746579736b7343283297c4c8cbae68f"}, + {file = "wrapt-1.16.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6a42cd0cfa8ffc1915aef79cb4284f6383d8a3e9dcca70c445dcfdd639d51267"}, + {file = "wrapt-1.16.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1ca9b6085e4f866bd584fb135a041bfc32cab916e69f714a7d1d397f8c4891ca"}, + {file = "wrapt-1.16.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:d5e49454f19ef621089e204f862388d29e6e8d8b162efce05208913dde5b9ad6"}, + {file = "wrapt-1.16.0-cp38-cp38-win32.whl", hash = "sha256:c31f72b1b6624c9d863fc095da460802f43a7c6868c5dda140f51da24fd47d7b"}, + {file = "wrapt-1.16.0-cp38-cp38-win_amd64.whl", hash = "sha256:490b0ee15c1a55be9c1bd8609b8cecd60e325f0575fc98f50058eae366e01f41"}, + {file = "wrapt-1.16.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9b201ae332c3637a42f02d1045e1d0cccfdc41f1f2f801dafbaa7e9b4797bfc2"}, + {file = "wrapt-1.16.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2076fad65c6736184e77d7d4729b63a6d1ae0b70da4868adeec40989858eb3fb"}, + {file = "wrapt-1.16.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c5cd603b575ebceca7da5a3a251e69561bec509e0b46e4993e1cac402b7247b8"}, + {file = "wrapt-1.16.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b47cfad9e9bbbed2339081f4e346c93ecd7ab504299403320bf85f7f85c7d46c"}, + {file = "wrapt-1.16.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f8212564d49c50eb4565e502814f694e240c55551a5f1bc841d4fcaabb0a9b8a"}, + {file = "wrapt-1.16.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:5f15814a33e42b04e3de432e573aa557f9f0f56458745c2074952f564c50e664"}, + {file = "wrapt-1.16.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:db2e408d983b0e61e238cf579c09ef7020560441906ca990fe8412153e3b291f"}, + {file = "wrapt-1.16.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:edfad1d29c73f9b863ebe7082ae9321374ccb10879eeabc84ba3b69f2579d537"}, + {file = "wrapt-1.16.0-cp39-cp39-win32.whl", hash = "sha256:ed867c42c268f876097248e05b6117a65bcd1e63b779e916fe2e33cd6fd0d3c3"}, + {file = "wrapt-1.16.0-cp39-cp39-win_amd64.whl", hash = "sha256:eb1b046be06b0fce7249f1d025cd359b4b80fc1c3e24ad9eca33e0dcdb2e4a35"}, + {file = "wrapt-1.16.0-py3-none-any.whl", hash = "sha256:6906c4100a8fcbf2fa735f6059214bb13b97f75b1a61777fcf6432121ef12ef1"}, + {file = "wrapt-1.16.0.tar.gz", hash = "sha256:5f370f952971e7d17c7d1ead40e49f32345a7f7a5373571ef44d800d06b1899d"}, +] + +[[package]] +name = "xmltodict" +version = "0.14.2" +description = "Makes working with XML feel like you are working with JSON" +optional = false +python-versions = ">=3.6" +files = [ + {file = "xmltodict-0.14.2-py2.py3-none-any.whl", hash = "sha256:20cc7d723ed729276e808f26fb6b3599f786cbc37e06c65e192ba77c40f20aac"}, + {file = "xmltodict-0.14.2.tar.gz", hash = "sha256:201e7c28bb210e374999d1dde6382923ab0ed1a8a5faeece48ab525b7810a553"}, +] + +[[package]] +name = "zipp" +version = "3.20.2" +description = "Backport of pathlib-compatible object wrapper for zip files" +optional = false +python-versions = ">=3.8" +files = [ + {file = "zipp-3.20.2-py3-none-any.whl", hash = "sha256:a817ac80d6cf4b23bf7f2828b7cabf326f15a001bea8b1f9b49631780ba28350"}, + {file = "zipp-3.20.2.tar.gz", hash = "sha256:bc9eb26f4506fda01b81bcde0ca78103b6e62f991b381fec825435c836edbc29"}, +] + +[package.extras] +check = ["pytest-checkdocs (>=2.4)", "pytest-ruff (>=0.2.1)"] +cover = ["pytest-cov"] +doc = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +enabler = ["pytest-enabler (>=2.2)"] +test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-ignore-flaky"] +type = ["pytest-mypy"] + [extras] grpc = ["googleapis-common-protos", "grpcio", "grpcio", "lz4", "protobuf", "protoc-gen-openapiv2"] [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "a82474ddea48c5918581d11b25eb9398e8b6241770245a79101d1a8be9803cd5" +content-hash = "f988990fe9fad3734a0c80fae15227e50e6461cf599f456b3d8e7b7a2cb71127" diff --git a/pyproject.toml b/pyproject.toml index 7b571682..18e69fbd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -84,6 +84,7 @@ pytest-mock = "3.6.1" pytest-timeout = "2.2.0" urllib3_mock = "0.3.3" responses = ">=0.8.1" +ddtrace = "^2.14.4" [tool.poetry.extras] grpc = ["grpcio", "googleapis-common-protos", "lz4", "protobuf", "protoc-gen-openapiv2"] From 971a623c89ada13f8cac0b331c768cbeb4c5a770 Mon Sep 17 00:00:00 2001 From: Jen Hamon Date: Thu, 24 Oct 2024 02:12:28 -0400 Subject: [PATCH 2/3] Wire up ddtrace in more spots --- .../actions/test-dependency-grpc/action.yaml | 12 ++++++------ .../actions/test-dependency-rest/action.yaml | 4 ++-- .github/workflows/testing-dependency.yaml | 11 +++++++++-- .github/workflows/testing-integration.yaml | 17 ++++++++++++----- .github/workflows/testing-unit.yaml | 11 +++++++++-- 5 files changed, 38 insertions(+), 17 deletions(-) diff --git a/.github/actions/test-dependency-grpc/action.yaml b/.github/actions/test-dependency-grpc/action.yaml index 66dab01b..b1b337ce 100644 --- a/.github/actions/test-dependency-grpc/action.yaml +++ b/.github/actions/test-dependency-grpc/action.yaml @@ -42,25 +42,25 @@ runs: - name: Install grpcio ${{ inputs.grpcio_version }} run: poetry add grpcio==${{ inputs.grpcio_version }} shell: bash - + - name: Install lz4 ${{ inputs.lz4_version }} run: poetry add lz4==${{ inputs.lz4_version }} shell: bash - + - name: Install protobuf ${{ inputs.protobuf_version }} run: poetry add protobuf==${{ inputs.protobuf_version }} shell: bash - + - name: Install googleapis-common-protos ${{ inputs.googleapis_common_protos_version }} run: poetry add googleapis-common-protos==${{ inputs.googleapis_common_protos_version }} shell: bash - + - uses: nick-fields/retry@v3 with: timeout_minutes: 5 max_attempts: 3 retry_on: error - command: poetry run pytest tests/dependency/grpc -s -v + command: poetry run pytest tests/dependency/grpc -s -v --ddtrace env: PINECONE_API_KEY: ${{ inputs.PINECONE_API_KEY }} - INDEX_NAME: ${{ inputs.index_name }} \ No newline at end of file + INDEX_NAME: ${{ inputs.index_name }} diff --git a/.github/actions/test-dependency-rest/action.yaml b/.github/actions/test-dependency-rest/action.yaml index 5321b2db..e2c92729 100644 --- a/.github/actions/test-dependency-rest/action.yaml +++ b/.github/actions/test-dependency-rest/action.yaml @@ -39,7 +39,7 @@ runs: timeout_minutes: 5 max_attempts: 3 retry_on: error - command: poetry run pytest tests/dependency/rest -s -v + command: poetry run pytest tests/dependency/rest -s -v --ddtrace env: PINECONE_API_KEY: '${{ inputs.PINECONE_API_KEY }}' - INDEX_NAME: '${{ inputs.index_name }}' \ No newline at end of file + INDEX_NAME: '${{ inputs.index_name }}' diff --git a/.github/workflows/testing-dependency.yaml b/.github/workflows/testing-dependency.yaml index 68676919..86b773d4 100644 --- a/.github/workflows/testing-dependency.yaml +++ b/.github/workflows/testing-dependency.yaml @@ -3,6 +3,13 @@ name: Dependency Testing on: workflow_call: {} +env: + DD_CIVISIBILITY_AGENTLESS_ENABLED: true + DD_API_KEY: ${{ secrets.DATADOG_API_KEY }} + DD_SITE: datadoghq.com + DD_ENV: ci + DD_SERVICE: pinecone-python-client + jobs: dependency-matrix-setup: name: Deps setup @@ -132,7 +139,7 @@ jobs: index_name: '${{ needs.dependency-matrix-setup.outputs.index_name }}' PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}' urllib3_version: '${{ matrix.urllib3_version }}' - + dependency-matrix-rest-312: name: Deps (REST) runs-on: ubuntu-latest @@ -171,4 +178,4 @@ jobs: - uses: ./.github/actions/delete-index with: index_name: '${{ needs.dependency-matrix-setup.outputs.index_name }}' - PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}' \ No newline at end of file + PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}' diff --git a/.github/workflows/testing-integration.yaml b/.github/workflows/testing-integration.yaml index 53b00429..ab468b08 100644 --- a/.github/workflows/testing-integration.yaml +++ b/.github/workflows/testing-integration.yaml @@ -2,6 +2,13 @@ name: "Integration Tests" 'on': workflow_call: {} +env: + DD_CIVISIBILITY_AGENTLESS_ENABLED: true + DD_API_KEY: ${{ secrets.DATADOG_API_KEY }} + DD_SITE: datadoghq.com + DD_ENV: ci + DD_SERVICE: pinecone-python-client + jobs: plugin-inference: name: Test inference plugin @@ -20,7 +27,7 @@ jobs: with: include_grpc: 'true' - name: 'Run integration tests' - run: poetry run pytest tests/integration/inference -s -vv + run: poetry run pytest tests/integration/inference -s -vv --ddtrace env: PINECONE_DEBUG_CURL: 'true' PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}' @@ -92,7 +99,7 @@ jobs: uses: ./.github/actions/setup-poetry - name: 'Run integration tests (REST, prod)' if: matrix.pineconeEnv == 'prod' - run: poetry run pytest tests/integration/control/pod -s -v + run: poetry run pytest tests/integration/control/pod -s -v --ddtrace env: PINECONE_DEBUG_CURL: 'true' PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}' @@ -102,7 +109,7 @@ jobs: METRIC: 'cosine' - name: 'Run integration tests (REST, staging)' if: matrix.pineconeEnv == 'staging' - run: poetry run pytest tests/integration/control/pod -s -v + run: poetry run pytest tests/integration/control/pod -s -v --ddtrace env: PINECONE_DEBUG_CURL: 'true' PINECONE_CONTROLLER_HOST: 'https://api-staging.pinecone.io' @@ -137,7 +144,7 @@ jobs: uses: ./.github/actions/setup-poetry - name: 'Run integration tests (REST, prod)' if: matrix.pineconeEnv == 'prod' - run: poetry run pytest tests/integration/control/serverless -s -vv + run: poetry run pytest tests/integration/control/serverless -s -vv --ddtrace env: PINECONE_DEBUG_CURL: 'true' PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}' @@ -146,7 +153,7 @@ jobs: SERVERLESS_REGION: '${{ matrix.testConfig.serverless.region }}' - name: 'Run integration tests (REST, staging)' if: matrix.pineconeEnv == 'staging' - run: poetry run pytest tests/integration/control/serverless -s -vv + run: poetry run pytest tests/integration/control/serverless -s -vv --ddtrace env: PINECONE_DEBUG_CURL: 'true' PINECONE_CONTROLLER_HOST: 'https://api-staging.pinecone.io' diff --git a/.github/workflows/testing-unit.yaml b/.github/workflows/testing-unit.yaml index 19842b24..7f896cc2 100644 --- a/.github/workflows/testing-unit.yaml +++ b/.github/workflows/testing-unit.yaml @@ -2,6 +2,13 @@ name: "Unit Tests" 'on': workflow_call: {} +env: + DD_CIVISIBILITY_AGENTLESS_ENABLED: true + DD_API_KEY: ${{ secrets.DATADOG_API_KEY }} + DD_SITE: datadoghq.com + DD_ENV: ci + DD_SERVICE: pinecone-python-client + jobs: unit-tests: name: Unit tests @@ -30,10 +37,10 @@ jobs: include_grpc: '${{ matrix.use_grpc }}' include_types: true - name: Run unit tests (REST) - run: poetry run pytest --cov=pinecone --timeout=120 tests/unit + run: poetry run pytest --cov=pinecone --timeout=120 tests/unit --ddtrace - name: Run unit tests (GRPC) if: ${{ matrix.use_grpc == true }} - run: poetry run pytest --cov=pinecone/grpc --timeout=120 tests/unit_grpc + run: poetry run pytest --cov=pinecone/grpc --timeout=120 tests/unit_grpc --ddtrace - name: mypy check env: INCLUDE_GRPC: '${{ matrix.use_grpc }}' From 5c3c329ba52db55b374f665db8b8a8e711dfa92b Mon Sep 17 00:00:00 2001 From: Jen Hamon Date: Thu, 24 Oct 2024 04:28:15 -0400 Subject: [PATCH 3/3] Add some custom datadog tags --- .github/workflows/testing-dependency.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/testing-dependency.yaml b/.github/workflows/testing-dependency.yaml index 86b773d4..42396ccc 100644 --- a/.github/workflows/testing-dependency.yaml +++ b/.github/workflows/testing-dependency.yaml @@ -79,6 +79,7 @@ jobs: lz4_version: '${{ matrix.lz4_version }}' protobuf_version: '${{ matrix.protobuf_version }}' googleapis_common_protos_version: '${{ matrix.googleapis_common_protos_version }}' + DD_TAGS: 'test.configuration.python:${{ matrix.python_version}},test.configuration.grpcio:${{ matrix.grpcio_version }},test.configuration.lz4:${{ matrix.lz4_version }},test.configuration.protobuf:${{ matrix.protobuf_version }},test.configuration.googleapis_common_protos:${{ matrix.googleapis_common_protos_version }}' dependency-matrix-grpc-312: name: Deps (GRPC) @@ -114,6 +115,7 @@ jobs: lz4_version: '${{ matrix.lz4_version }}' protobuf_version: '${{ matrix.protobuf_version }}' googleapis_common_protos_version: '${{ matrix.googleapis_common_protos_version }}' + DD_TAGS: 'test.configuration.python:${{ matrix.python_version}},test.configuration.grpcio:${{ matrix.grpcio_version }},test.configuration.lz4:${{ matrix.lz4_version }},test.configuration.protobuf:${{ matrix.protobuf_version }},test.configuration.googleapis_common_protos:${{ matrix.googleapis_common_protos_version }}' dependency-matrix-rest: name: Deps (REST) @@ -139,6 +141,7 @@ jobs: index_name: '${{ needs.dependency-matrix-setup.outputs.index_name }}' PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}' urllib3_version: '${{ matrix.urllib3_version }}' + DD_TAGS: 'test.configuration.python:${{ matrix.python_version}},test.configuration.urllib3:${{ matrix.urllib3_version }}' dependency-matrix-rest-312: name: Deps (REST) @@ -163,6 +166,7 @@ jobs: index_name: '${{ needs.dependency-matrix-setup.outputs.index_name }}' PINECONE_API_KEY: '${{ secrets.PINECONE_API_KEY }}' urllib3_version: '${{ matrix.urllib3_version }}' + DD_TAGS: 'test.configuration.python:${{ matrix.python_version}},test.configuration.urllib3:${{ matrix.urllib3_version }}' deps-cleanup: name: Deps cleanup