Skip to content

Commit

Permalink
Merge branch 'main' into Issue-2398
Browse files Browse the repository at this point in the history
  • Loading branch information
rama280290 committed May 29, 2024
2 parents c44b8b6 + 25e429a commit ed7c07b
Show file tree
Hide file tree
Showing 217 changed files with 5,255 additions and 1,142 deletions.
4 changes: 4 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ ignore =
# allow whitespace before ':' (https://github.com/psf/black#slices)
E203

# conflicts with black
E701
E704

exclude =
.bzr
.git
Expand Down
3 changes: 3 additions & 0 deletions .github/component_owners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,6 @@ components:

instrumentation/opentelemetry-instrumentation-psycopg:
- federicobond

processor/opentelemetry-processor-baggage:
- codeboten
4 changes: 2 additions & 2 deletions .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
exit 1
fi
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# history is needed to run git cherry-pick below
fetch-depth: 0
Expand All @@ -40,4 +40,4 @@ jobs:
gh pr create --title "[$GITHUB_REF_NAME] $title" \
--body "Clean cherry-pick of #$NUMBER to the \`$GITHUB_REF_NAME\` branch." \
--head $branch \
--base $GITHUB_REF_NAME
--base $GITHUB_REF_NAME
4 changes: 2 additions & 2 deletions .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
&& github.actor != 'opentelemetrybot'
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Check for CHANGELOG changes
run: |
Expand All @@ -33,4 +33,4 @@ jobs:
echo "No CHANGELOG was modified."
echo "Please add a CHANGELOG entry, or add the \"Skip Changelog\" label if not required."
false
fi
fi
8 changes: 4 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v3
with:
languages: python

- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
6 changes: 3 additions & 3 deletions .github/workflows/instrumentations_0.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,16 +104,16 @@ jobs:
package: "grpc"
steps:
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up Python ${{ env[matrix.python-version] }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ env[matrix.python-version] }}
- name: Install tox
run: pip install tox
- name: Cache tox environment
# Preserves .tox directory between runs for faster installs
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: |
.tox
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/instrumentations_1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ jobs:
package: "prometheus-remote-write"
steps:
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Set up Python ${{ env[matrix.python-version] }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ env[matrix.python-version] }}
- name: Install tox
run: pip install tox
- name: Cache tox environment
# Preserves .tox directory between runs for faster installs
uses: actions/cache@v1
uses: actions/cache@v4
with:
path: |
.tox
Expand Down
121 changes: 121 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
name: Lint tests

on:
push:
branches-ignore:
- 'release/*'
pull_request:
env:
CORE_REPO_SHA: 955c92e91b5cd4bcfb43c39efcef086b040471d2

jobs:
lint-3_11:
strategy:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
package:
- "distro"
- "exporter-prometheus-remote-write"
- "exporter-richconsole"
- "instrumentation-aio-pika"
- "instrumentation-aiohttp-client"
- "instrumentation-aiohttp-server"
- "instrumentation-aiopg"
- "instrumentation-asgi"
- "instrumentation-asyncio"
- "instrumentation-asyncpg"
- "instrumentation-aws-lambda"
- "instrumentation-boto"
- "instrumentation-boto3sqs"
- "instrumentation-botocore"
- "instrumentation-cassandra"
- "instrumentation-celery"
- "instrumentation-confluent-kafka"
- "instrumentation-dbapi"
- "instrumentation-django"
- "instrumentation-elasticsearch"
- "instrumentation-falcon"
- "instrumentation-fastapi"
- "instrumentation-flask"
- "instrumentation-grpc"
- "instrumentation-httpx"
- "instrumentation-jinja2"
- "instrumentation-kafka-python"
- "instrumentation-logging"
- "instrumentation-mysql"
- "instrumentation-mysqlclient"
- "instrumentation-psycopg"
- "instrumentation-psycopg2"
- "instrumentation-pymemcache"
- "instrumentation-pymongo"
- "instrumentation-pymysql"
- "instrumentation-pyramid"
- "instrumentation-redis"
- "instrumentation-remoulade"
- "instrumentation-requests"
- "instrumentation-sio-pika"
- "instrumentation-sqlalchemy"
- "instrumentation-sqlite3"
- "instrumentation-starlette"
- "instrumentation-system-metrics"
- "instrumentation-threading"
- "instrumentation-tornado"
- "instrumentation-tortoiseorm"
- "instrumentation-urllib"
- "instrumentation-urllib3"
- "instrumentation-wsgi"
- "opentelemetry-instrumentation"
- "processor-baggage"
- "propagator-aws-xray"
- "propagator-ot-trace"
- "resource-detector-container"
- "sdk-extension-aws"
os: [ubuntu-20.04]
runs-on: ubuntu-20.04
steps:
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: 3.11
- name: Install tox
run: pip install tox
- name: Cache tox environment
# Preserves .tox directory between runs for faster installs
uses: actions/cache@v4
with:
path: |
.tox
~/.cache/pip
key: v7-build-tox-cache-${{ matrix.package }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
- name: run tox
run: tox -e lint-${{ matrix.package }}

lint-3_8:
strategy:
fail-fast: false # ensures the entire test matrix is run, even if one permutation fails
matrix:
package:
- "instrumentation-sklearn"
os: [ubuntu-20.04]
runs-on: ubuntu-20.04
steps:
- name: Checkout Contrib Repo @ SHA - ${{ github.sha }}
uses: actions/checkout@v4
- name: Set up Python 3.8
uses: actions/setup-python@v5
with:
python-version: 3.8
- name: Install tox
run: pip install tox
- name: Cache tox environment
# Preserves .tox directory between runs for faster installs
uses: actions/cache@v4
with:
path: |
.tox
~/.cache/pip
key: v7-build-tox-cache-${{ matrix.package }}-${{ hashFiles('tox.ini', 'gen-requirements.txt', 'dev-requirements.txt') }}
- name: run tox
run: tox -e lint-${{ matrix.package }}
6 changes: 3 additions & 3 deletions .github/workflows/prepare-patch-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
prepare-patch-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- run: |
if [[ ! $GITHUB_REF_NAME =~ ^release/v[0-9]+\.[0-9]+\.x-0\.[0-9]+bx$ ]]; then
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
run: .github/scripts/update-version.sh $STABLE_VERSION $UNSTABLE_VERSION

- name: Set up Python 3.9
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Install tox
Expand Down Expand Up @@ -79,4 +79,4 @@ jobs:
gh pr create --title "[$GITHUB_REF_NAME] $message" \
--body "$message." \
--head $branch \
--base $GITHUB_REF_NAME
--base $GITHUB_REF_NAME
12 changes: 6 additions & 6 deletions .github/workflows/prepare-release-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
prereqs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Verify prerequisites
env:
Expand Down Expand Up @@ -39,7 +39,7 @@ jobs:
runs-on: ubuntu-latest
needs: prereqs
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Create release branch
env:
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
run: .github/scripts/update-version.sh $STABLE_VERSION $UNSTABLE_VERSION

- name: Set up Python 3.9
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Install tox
Expand Down Expand Up @@ -112,7 +112,7 @@ jobs:
runs-on: ubuntu-latest
needs: prereqs
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set environment variables
env:
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:
run: .github/scripts/update-version.sh $STABLE_NEXT_VERSION $UNSTABLE_NEXT_VERSION

- name: Set up Python 3.9
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.9
- name: Install tox
Expand Down Expand Up @@ -192,4 +192,4 @@ jobs:
gh pr create --title "$message" \
--body "$body" \
--head $branch \
--base main
--base main
4 changes: 2 additions & 2 deletions .github/workflows/publish-a-package-from-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
name: Publish package from tag
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/setup-python@v1
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.9'
- name: Log tag that triggered publish workflow
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
exit 1
fi
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set environment variables
run: |
Expand Down Expand Up @@ -56,15 +56,15 @@ jobs:
# check out main branch to verify there won't be problems with merging the change log
# at the end of this workflow
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: main

# back to the release branch
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# next few steps publish to pypi
- uses: actions/setup-python@v1
- uses: actions/setup-python@v5
with:
python-version: '3.8'

Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
--discussion-category announcements \
v$UNSTABLE_VERSION
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# the step below is creating a pull request against main
ref: main
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Shellcheck

on:
push:
branches-ignore:
- 'release/*'
pull_request:

jobs:
shellcheck:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Install shellcheck
run: sudo apt update && sudo apt install --assume-yes shellcheck

- name: Run shellcheck
run: find . -name \*.sh | xargs shellcheck --severity=warning
Loading

0 comments on commit ed7c07b

Please sign in to comment.