Merge branch 'main' into main

Author: aabmass

.github/workflows/test.yml

@@ -11,6 +11,7 @@ env:
   # opentelemetry-python-contrib which is compatible with these Core repo
   # changes.
   CONTRIB_REPO_SHA: 9ce1c26d2732dfbdadbb492fc38c562dcd08ed2e
+
   # This is needed because we do not clone the core repo in contrib builds anymore.
   # When running contrib builds as part of core builds, we use actions/checkout@v4 which
   # does not set an environment variable (simply just runs tox), which is different when
@@ -19,6 +20,9 @@ env:
   # from within the contrib build.
   CORE_REPO_SHA: ${{ github.sha }}
 
+  # See #3879 and https://pip.pypa.io/en/stable/cli/pip/#exists-action-option
+  PIP_EXISTS_ACTION: w
+
 jobs:
   build:
     env:

.pre-commit-config.yaml

@@ -0,0 +1,14 @@
+repos:
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 24.3.0
+    hooks:
+      - id: black
+        language_version: python3.11
+  - repo: https://github.com/pycqa/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+  - repo: https://github.com/pycqa/flake8
+    rev: '6.1.0'
+    hooks:
+    -   id: flake8

CONTRIBUTING.md

@@ -61,6 +61,18 @@ An easier way to do so is:
 1. Run `.tox/lint/bin/black .`
 2. Run `.tox/lint/bin/isort .`
 
+Or you can call formatting and linting in one command by [pre-commit](https://pre-commit.com/):
+
+```console
+$ pre-commit
+```
+
+You can also configure it to run lint tools automatically before committing with:
+
+```console
+$ pre-commit install
+```
+
 We try to keep the amount of _public symbols_ in our code minimal. A public symbol is any Python identifier that does not start with an underscore.
 Every public symbol is something that has to be kept in order to maintain backwards compatibility, so we try to have as few as possible.
 

dev-requirements.txt

@@ -19,3 +19,4 @@ asgiref==3.7.2
 psutil==5.9.6
 GitPython==3.1.41
 flaky==3.7.0
+pre-commit==3.7.0

scripts/build.sh

@@ -16,7 +16,7 @@ DISTDIR=dist
   mkdir -p $DISTDIR
   rm -rf ${DISTDIR:?}/*
 
- for d in opentelemetry-api/ opentelemetry-sdk/ opentelemetry-proto/ opentelemetry-semantic-conventions/ exporter/*/ shim/opentelemetry-opentracing-shim/ propagator/*/ tests/opentelemetry-test-utils/; do
+ for d in opentelemetry-api/ opentelemetry-sdk/ opentelemetry-proto/ opentelemetry-semantic-conventions/ exporter/*/ shim/*/ propagator/*/ tests/opentelemetry-test-utils/; do
    (
      echo "building $d"
      cd "$d"