Merge branch 'main' into sync-gauge-prototype

.flake8

@@ -23,10 +23,6 @@ exclude =
   venv*/
   target
   __pycache__
-  exporter/opentelemetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/gen/
-  exporter/opentelemetry-exporter-jaeger-proto-grpc/build/*
-  exporter/opentelemetry-exporter-jaeger-thrift/src/opentelemetry/exporter/jaeger/thrift/gen/
-  exporter/opentelemetry-exporter-jaeger-thrift/build/*
   exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/v2/gen/
   docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/gen/
   docs/examples/opentelemetry-example-app/build/*

.github/workflows/benchmarks.yml

@@ -0,0 +1,54 @@
+name: SDK Benchmark Tests
+
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  sdk-benchmarks:
+    env:
+      py311: "3.11"
+      RUN_MATRIX_COMBINATION: ${{ matrix.python-version }}-sdk-${{ matrix.os }}
+    runs-on: self-hosted
+    strategy:
+      # Ensures the entire test matrix is run, even if one permutation fails
+      fail-fast: false
+      matrix:
+        python-version: [py311]
+        os: [ubuntu-20.04, windows-2019]
+    steps:
+    - name: Checkout Core Repo @ SHA - ${{ github.sha }}
+      uses: actions/checkout@v2
+    - name: Set up Python ${{ env[matrix.python-version] }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ env[matrix.python-version] }}
+        architecture: 'x64'
+    - name: Install tox
+      run: pip install tox==3.27.1 -U tox-factor
+    - name: Cache tox environment
+      # Preserves .tox directory between runs for faster installs
+      uses: actions/cache@v2
+      with:
+        path: |
+          .tox
+          ~/.cache/pip
+        key: v3-tox-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('tox.ini',
+          'dev-requirements.txt') }}-core
+    - name: Run tox
+      run: tox -f ${{ matrix.python-version }}-sdk -- -k opentelemetry-sdk/tests/performance/benchmarks --benchmark-json=output.json
+    - name: Report on SDK benchmark results
+      uses: benchmark-action/github-action-benchmark@v1
+      with:
+        name: OpenTelemetry Python SDK Benchmarks - Python ${{ env[matrix.python-version ]}} - SDK
+        tool: pytest
+        output-file-path: opentelemetry-sdk/tests/output.json
+        gh-pages-branch: benchmarks
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        # Make a commit on `gh-pages` with benchmarks from previous step
+        benchmark-data-dir-path: "benchmarks"
+        auto-push: true
+        max-items-in-chart: 100
+        # Alert with a commit comment on possible performance regression
+        alert-threshold: '200%'
+        comment-on-alert: true

.github/workflows/test.yml

@@ -10,7 +10,7 @@ env:
   # Otherwise, set variable to the commit of your branch on
   # opentelemetry-python-contrib which is compatible with these Core repo
   # changes.
-  CONTRIB_REPO_SHA: 481972cf87c1506e789f586843ba82d93633eac7
+  CONTRIB_REPO_SHA: 21b26b39c62b27b116978813d47b9b7d104b54be
   # 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@v2 which
   # does not set an environment variable (simply just runs tox), which is different when
@@ -62,31 +62,8 @@ jobs:
       if: ${{ matrix.os == 'windows-2019'}}
       run: git config --system core.longpaths true
     - name: run tox
-      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- --benchmark-json=${{
+      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra --benchmark-json=${{
         env.RUN_MATRIX_COMBINATION }}-benchmark.json
-#       - name: Find and merge benchmarks
-#         id: find_and_merge_benchmarks
-#         run: >-
-#           jq -s '.[0].benchmarks = ([.[].benchmarks] | add)
-#           | if .[0].benchmarks == null then null else .[0] end'
-#           $(find . -name '*${{ matrix.package }}*-benchmark.json') > output.json
-#           && echo "json_plaintext=$(cat output.json)" >> $GITHUB_OUTPUT
-#       - name: Report on benchmark results
-#         if: steps.find_and_merge_benchmarks.outputs.json_plaintext != 'null'
-#         uses: rhysd/github-action-benchmark@v1
-#         with:
-#           name: OpenTelemetry Python Benchmarks - Python ${{ env[matrix.python-version ]}} - ${{ matrix.package }}
-#           tool: pytest
-#           output-file-path: output.json
-#           github-token: ${{ secrets.GITHUB_TOKEN }}
-#           max-items-in-chart: 100
-#           # Alert with a commit comment on possible performance regression
-#           alert-threshold: 200%
-#           fail-on-alert: true
-#           # Make a commit on `gh-pages` with benchmarks from previous step
-#           auto-push: ${{ github.ref == 'refs/heads/main' }}
-#           gh-pages-branch: gh-pages
-#           benchmark-data-dir-path: benchmarks
   misc:
     strategy:
       fail-fast: false
@@ -159,4 +136,4 @@ jobs:
         key: v3-tox-cache-${{ matrix.python-version }}-${{ matrix.package }}-${{ matrix.os
           }}-${{ hashFiles('tox.ini', 'dev-requirements.txt') }}-contrib
     - name: run tox
-      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }}
+      run: tox -f ${{ matrix.python-version }}-${{ matrix.package }} -- -ra

.pylintrc

@@ -28,7 +28,7 @@ limit-inference-results=100
 
 # List of plugins (as comma separated values of python modules names) to load,
 # usually to register additional checkers.
-load-plugins=
+load-plugins=pylint.extensions.no_self_use
 
 # Pickle collected data for later comparisons.
 persistent=yes
@@ -68,14 +68,14 @@ disable=missing-docstring,
       duplicate-code,
       ungrouped-imports, # Leave this up to isort
       wrong-import-order, # Leave this up to isort
-      bad-continuation, # Leave this up to black
       line-too-long, # Leave this up to black
       exec-used,
       super-with-arguments, # temp-pylint-upgrade
       isinstance-second-argument-not-valid-type, # temp-pylint-upgrade
       raise-missing-from, # temp-pylint-upgrade
       unused-argument, # temp-pylint-upgrade
       redefined-builtin,
+      cyclic-import,
 
 # Enable the message, report, category or checker with the given id(s). You can
 # either give multiple identifier separated by comma (,) or put this option
@@ -263,13 +263,6 @@ max-line-length=79
 # Maximum number of lines in a module.
 max-module-lines=1000
 
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,
-               dict-separator
-
 # Allow the body of a class to be on the same line as the declaration if body
 # contains single statement.
 single-line-class-stmt=no

CHANGELOG.md

@@ -8,7 +8,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 - Add Synchronous Gauge instrument
-  ([#3462](https://github.com/open-telemetry/opentelemetry-python/pull/3462))
+- Remove Jaeger exporters
+  ([#3554](https://github.com/open-telemetry/opentelemetry-python/pull/3554))
+- Log stacktrace on `UNKNOWN` status OTLP export error 
+  ([#3536](https://github.com/open-telemetry/opentelemetry-python/pull/3536))
+- Fix OTLPExporterMixin shutdown timeout period
+  ([#3524](https://github.com/open-telemetry/opentelemetry-python/pull/3524))
+- Handle `taskName` `logrecord` attribute
+  ([#3557](https://github.com/open-telemetry/opentelemetry-python/pull/3557))
+
+## Version 1.21.0/0.42b0 (2023-11-01)
+
 - Fix `SumAggregation`
   ([#3390](https://github.com/open-telemetry/opentelemetry-python/pull/3390))
 - Fix handling of empty metric collection cycles
@@ -27,6 +37,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3251](https://github.com/open-telemetry/opentelemetry-python/pull/3251))
 - Prometheus exporter support for auto instrumentation 
   ([#3413](https://github.com/open-telemetry/opentelemetry-python/pull/3413))
+- Implement Process Resource detector
+  ([#3472](https://github.com/open-telemetry/opentelemetry-python/pull/3472))
+
 
 ## Version 1.20.0/0.41b0 (2023-09-04)
 

README.md

@@ -111,7 +111,7 @@ Emeritus Approvers
 - [Héctor Hernández](https://github.com/hectorhdzg), Microsoft
 - [Mauricio Vásquez](https://github.com/mauriciovasquezbernal), Kinvolk
 - [Nathaniel Ruiz Nowell](https://github.com/NathanielRN), AWS
-- [Tahir H. Butt](https://github.com/majorgreys) DataDog
+- [Tahir H. Butt](https://github.com/majorgreys), DataDog
 
 *For more information about the approver role, see the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md#approver).*
 

dev-requirements.txt

@@ -1,21 +1,15 @@
-pylint==2.11.0
-flake8~=3.7
-isort~=5.8
-black~=22.3.0
-httpretty~=1.0
+pylint==3.0.2
+flake8==6.1.0
+isort==5.12.0
+black==22.3.0
+httpretty==1.1.4
 mypy==0.931
-sphinx~=3.5.4
-sphinx-rtd-theme~=0.5
-sphinx-autodoc-typehints~=1.12.0
+sphinx==7.1.2
+sphinx-rtd-theme==2.0.0rc4
+sphinx-autodoc-typehints==1.25.2
 pytest==7.1.3
-pytest-cov>=2.8
-readme-renderer~=24.0
-# This version of grpcio-tools ships with protoc 3.19.4 which appears to be compatible with
-# both protobuf 3.19.x and 4.x (see https://github.com/protocolbuffers/protobuf/issues/11123).
-# Bump this version with caution to preserve compatibility with protobuf 3.
-# https://github.com/open-telemetry/opentelemetry-python/blob/main/opentelemetry-proto/pyproject.toml#L28
-grpcio-tools==1.48.1
-mypy-protobuf~=3.0.0
+pytest-cov==4.1.0
+readme-renderer==42.0
 # temporary fix. we should update the jinja, flask deps
 # See https://github.com/pallets/markupsafe/issues/282
 # breaking change introduced in markupsafe causes jinja, flask to break
@@ -24,3 +18,7 @@ bleach==4.1.0 # This dependency was updated to a breaking version.
 codespell==2.1.0
 requests==2.31.0
 ruamel.yaml==0.17.21
+asgiref==3.7.2
+psutil==5.9.6
+GitPython==3.1.40
+flaky==3.7.0

docs-requirements.txt

@@ -1,23 +1,24 @@
-sphinx~=3.5.4
-sphinx-rtd-theme~=0.5
-sphinx-autodoc-typehints
+sphinx==7.1.2
+sphinx-rtd-theme==2.0.0rc4
+sphinx-autodoc-typehints==1.25.2
 # used to generate docs for the website
-sphinx-jekyll-builder
+sphinx-jekyll-builder==0.3.0
 
 # Need to install the api/sdk in the venv for autodoc. Modifying sys.path
 # doesn't work for pkg_resources.
 ./opentelemetry-api
 ./opentelemetry-semantic-conventions
 ./opentelemetry-sdk
+./shim/opentelemetry-opencensus-shim
+./shim/opentelemetry-opentracing-shim
 
 # Required by instrumentation and exporter packages
-ddtrace>=0.34.0
 grpcio~=1.27
-Deprecated>=1.2.6
-django>=2.2
+Deprecated~=1.2
+django~=4.2
 flask~=1.0
 opentracing~=2.2.0
-thrift>=0.10.0
+thrift~=0.10
 wrapt>=1.0.0,<2.0.0
 # temporary fix. we should update the jinja, flask deps
 # See https://github.com/pallets/markupsafe/issues/282

docs/getting_started/tests/requirements.txt

@@ -0,0 +1,27 @@
+asgiref==3.7.2
+attrs==23.1.0
+certifi==2023.7.22
+charset-normalizer==2.0.12
+click==8.1.7
+Deprecated==1.2.14
+flaky==3.7.0
+Flask==2.0.1
+idna==3.4
+importlib-metadata==6.8.0
+iniconfig==2.0.0
+itsdangerous==2.1.2
+Jinja2==3.1.2
+MarkupSafe==2.1.3
+packaging==23.2
+pluggy==1.3.0
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+requests==2.26.0
+tomli==2.0.1
+typing_extensions==4.8.0
+urllib3==1.26.18
+Werkzeug==2.3.7
+wrapt==1.15.0
+zipp==3.17.0

eachdist.ini

@@ -11,7 +11,7 @@ sortfirst=
     exporter/*
 
 [stable]
-version=1.21.0.dev
+version=1.22.0.dev
 
 packages=
     opentelemetry-sdk
@@ -24,13 +24,10 @@ packages=
     opentelemetry-exporter-otlp-proto-grpc
     opentelemetry-exporter-otlp-proto-http
     opentelemetry-exporter-otlp
-    opentelemetry-exporter-jaeger-thrift
-    opentelemetry-exporter-jaeger-proto-grpc
-    opentelemetry-exporter-jaeger
     opentelemetry-api
 
 [prerelease]
-version=0.42b0.dev
+version=0.43b0.dev
 
 packages=
     opentelemetry-opentracing-shim