From 8383744f71afe4476480ea0aa6d58c4645ce0745 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Thu, 2 Nov 2023 20:29:12 -0600 Subject: [PATCH 1/4] Separate contrib jobs per instrumentation Fixes #3499 --- .github/workflows/test.yml | 50 +++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b929cd05a67..bf63573e4f3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -106,7 +106,55 @@ jobs: fail-fast: false # ensures the entire test matrix is run, even if one permutation fails matrix: python-version: [py37] - package: ["instrumentation", "exporter"] + package: [ + "aiohttp-client", + "aiohttp-server", + "aiopg", + "aio-pika", + "asgi", + "asyncpg", + "aws-lambda", + "boto", + "boto3sqs", + "botocore", + "cassandra", + "celery", + "confluent-kafka", + "dbapi", + "django", + "elasticsearch", + "falcon", + "fastapi", + "flask", + "grpc", + "httpx", + "jinja2", + "kafka-python", + "logging", + "mysql", + "mysqlclient", + "pika", + "psycopg2", + "pymemcache", + "pymongo", + "pymysql", + "pyramid", + "redis", + "remoulade", + "requests", + "sklearn", + "sqlalchemy", + "sqlite3", + "starlette", + "system-metrics", + "tornado", + "tortoiseorm", + "urllib", + "urllib3", + "wsgi", + "prometheus-remote-write", + "richconsole" + ] os: [ubuntu-20.04] steps: - name: Checkout Contrib Repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} From ceef41cf8d92abe32589a1e0a6a854c1cb0e40f5 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Thu, 2 Nov 2023 21:06:07 -0600 Subject: [PATCH 2/4] Separate exporters --- .github/workflows/test.yml | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bf63573e4f3..90aa3ea7e68 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,8 +36,29 @@ jobs: fail-fast: false # ensures the entire test matrix is run, even if one permutation fails matrix: python-version: [py37, py38, py39, py310, py311, pypy3] - package: ["api", "sdk", "semantic", "getting", "shim", "exporter", "protobuf", - "propagator"] + package: [ + "api", + "sdk", + "semantic-conventions", + "getting-started", + "opentracing-shim", + "opencensus-shim", + "exporter-jaeger-combined", + "exporter-jaeger-proto-grpc", + "exporter-jaeger-thrift", + "exporter-opencensus", + "exporter-otlp-proto-common", + "exporter-otlp-combined", + "exporter-otlp-proto-grpc", + "exporter-otlp-proto-http", + "exporter-prometheus", + "exporter-zipkin-combined", + "exporter-zipkin-proto-http", + "exporter-zipkin-json", + "protobuf", + "propagator-b3" + "propagator-jaeger" + ] os: [ubuntu-20.04, windows-2019] steps: - name: Checkout Core Repo @ SHA - ${{ github.sha }} From 5300458793c85ea25d93a55a996b2de860161cbd Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 3 Nov 2023 13:36:35 -0600 Subject: [PATCH 3/4] Refactor listings --- .github/workflows/test.yml | 142 ++++++++++++++++++------------------- 1 file changed, 70 insertions(+), 72 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 90aa3ea7e68..fd677e89125 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,29 +36,28 @@ jobs: fail-fast: false # ensures the entire test matrix is run, even if one permutation fails matrix: python-version: [py37, py38, py39, py310, py311, pypy3] - package: [ - "api", - "sdk", - "semantic-conventions", - "getting-started", - "opentracing-shim", - "opencensus-shim", - "exporter-jaeger-combined", - "exporter-jaeger-proto-grpc", - "exporter-jaeger-thrift", - "exporter-opencensus", - "exporter-otlp-proto-common", - "exporter-otlp-combined", - "exporter-otlp-proto-grpc", - "exporter-otlp-proto-http", - "exporter-prometheus", - "exporter-zipkin-combined", - "exporter-zipkin-proto-http", - "exporter-zipkin-json", - "protobuf", - "propagator-b3" - "propagator-jaeger" - ] + package: + - "api", + - "sdk", + - "semantic-conventions", + - "getting-started", + - "opentracing-shim", + - "opencensus-shim", + - "exporter-jaeger-combined", + - "exporter-jaeger-proto-grpc", + - "exporter-jaeger-thrift", + - "exporter-opencensus", + - "exporter-otlp-proto-common", + - "exporter-otlp-combined", + - "exporter-otlp-proto-grpc", + - "exporter-otlp-proto-http", + - "exporter-prometheus", + - "exporter-zipkin-combined", + - "exporter-zipkin-proto-http", + - "exporter-zipkin-json", + - "protobuf", + - "propagator-b3" + - "propagator-jaeger" os: [ubuntu-20.04, windows-2019] steps: - name: Checkout Core Repo @ SHA - ${{ github.sha }} @@ -127,55 +126,54 @@ jobs: fail-fast: false # ensures the entire test matrix is run, even if one permutation fails matrix: python-version: [py37] - package: [ - "aiohttp-client", - "aiohttp-server", - "aiopg", - "aio-pika", - "asgi", - "asyncpg", - "aws-lambda", - "boto", - "boto3sqs", - "botocore", - "cassandra", - "celery", - "confluent-kafka", - "dbapi", - "django", - "elasticsearch", - "falcon", - "fastapi", - "flask", - "grpc", - "httpx", - "jinja2", - "kafka-python", - "logging", - "mysql", - "mysqlclient", - "pika", - "psycopg2", - "pymemcache", - "pymongo", - "pymysql", - "pyramid", - "redis", - "remoulade", - "requests", - "sklearn", - "sqlalchemy", - "sqlite3", - "starlette", - "system-metrics", - "tornado", - "tortoiseorm", - "urllib", - "urllib3", - "wsgi", - "prometheus-remote-write", - "richconsole" - ] + package: + - "aiohttp-client" + - "aiohttp-server" + - "aiopg" + - "aio-pika" + - "asgi" + - "asyncpg" + - "aws-lambda" + - "boto" + - "boto3sqs" + - "botocore" + - "cassandra" + - "celery" + - "confluent-kafka" + - "dbapi" + - "django" + - "elasticsearch" + - "falcon" + - "fastapi" + - "flask" + - "grpc" + - "httpx" + - "jinja2" + - "kafka-python" + - "logging" + - "mysql" + - "mysqlclient" + - "pika" + - "psycopg2" + - "pymemcache" + - "pymongo" + - "pymysql" + - "pyramid" + - "redis" + - "remoulade" + - "requests" + - "sklearn" + - "sqlalchemy" + - "sqlite3" + - "starlette" + - "system-metrics" + - "tornado" + - "tortoiseorm" + - "urllib" + - "urllib3" + - "wsgi" + - "prometheus-remote-write" + - "richconsole" os: [ubuntu-20.04] steps: - name: Checkout Contrib Repo @ SHA - ${{ env.CONTRIB_REPO_SHA }} From 82567850d77ddc069e36cd7c033dea026ff4f5f8 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 3 Nov 2023 17:01:44 -0600 Subject: [PATCH 4/4] Fix lists --- .github/workflows/test.yml | 136 ++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fd677e89125..8c1e96e1501 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,27 +37,27 @@ jobs: matrix: python-version: [py37, py38, py39, py310, py311, pypy3] package: - - "api", - - "sdk", - - "semantic-conventions", - - "getting-started", - - "opentracing-shim", - - "opencensus-shim", - - "exporter-jaeger-combined", - - "exporter-jaeger-proto-grpc", - - "exporter-jaeger-thrift", - - "exporter-opencensus", - - "exporter-otlp-proto-common", - - "exporter-otlp-combined", - - "exporter-otlp-proto-grpc", - - "exporter-otlp-proto-http", - - "exporter-prometheus", - - "exporter-zipkin-combined", - - "exporter-zipkin-proto-http", - - "exporter-zipkin-json", - - "protobuf", - - "propagator-b3" - - "propagator-jaeger" + - "api" + - "sdk" + - "semantic-conventions" + - "getting-started" + - "opentracing-shim" + - "opencensus-shim" + - "exporter-jaeger-combined" + - "exporter-jaeger-proto-grpc" + - "exporter-jaeger-thrift" + - "exporter-opencensus" + - "exporter-otlp-proto-common" + - "exporter-otlp-combined" + - "exporter-otlp-proto-grpc" + - "exporter-otlp-proto-http" + - "exporter-prometheus" + - "exporter-zipkin-combined" + - "exporter-zipkin-proto-http" + - "exporter-zipkin-json" + - "protobuf" + - "propagator-b3" + - "propagator-jaeger" os: [ubuntu-20.04, windows-2019] steps: - name: Checkout Core Repo @ SHA - ${{ github.sha }} @@ -127,53 +127,53 @@ jobs: matrix: python-version: [py37] package: - - "aiohttp-client" - - "aiohttp-server" - - "aiopg" - - "aio-pika" - - "asgi" - - "asyncpg" - - "aws-lambda" - - "boto" - - "boto3sqs" - - "botocore" - - "cassandra" - - "celery" - - "confluent-kafka" - - "dbapi" - - "django" - - "elasticsearch" - - "falcon" - - "fastapi" - - "flask" - - "grpc" - - "httpx" - - "jinja2" - - "kafka-python" - - "logging" - - "mysql" - - "mysqlclient" - - "pika" - - "psycopg2" - - "pymemcache" - - "pymongo" - - "pymysql" - - "pyramid" - - "redis" - - "remoulade" - - "requests" - - "sklearn" - - "sqlalchemy" - - "sqlite3" - - "starlette" - - "system-metrics" - - "tornado" - - "tortoiseorm" - - "urllib" - - "urllib3" - - "wsgi" - - "prometheus-remote-write" - - "richconsole" + - "aiohttp-client" + - "aiohttp-server" + - "aiopg" + - "aio-pika" + - "asgi" + - "asyncpg" + - "aws-lambda" + - "boto" + - "boto3sqs" + - "botocore" + - "cassandra" + - "celery" + - "confluent-kafka" + - "dbapi" + - "django" + - "elasticsearch" + - "falcon" + - "fastapi" + - "flask" + - "grpc" + - "httpx" + - "jinja2" + - "kafka-python" + - "logging" + - "mysql" + - "mysqlclient" + - "pika" + - "psycopg2" + - "pymemcache" + - "pymongo" + - "pymysql" + - "pyramid" + - "redis" + - "remoulade" + - "requests" + - "sklearn" + - "sqlalchemy" + - "sqlite3" + - "starlette" + - "system-metrics" + - "tornado" + - "tortoiseorm" + - "urllib" + - "urllib3" + - "wsgi" + - "prometheus-remote-write" + - "richconsole" os: [ubuntu-20.04] steps: - name: Checkout Contrib Repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}