Merge pull request #1 from open-telemetry/main

.codespellrc

@@ -1,4 +1,9 @@
 [codespell]
 # skipping auto generated folders
+<<<<<<< HEAD
 skip = ./.tox,./.mypy_cache,./docs/_build,./target,*/LICENSE,./venv
 ignore-words-list = ot
+=======
+skip = ./.tox,./.mypy_cache,./docs/_build,./target,*/LICENSE,./venv,.git,./opentelemetry-semantic-conventions
+ignore-words-list = ans,ue,ot,hist,ro
+>>>>>>> upstream/main

.flake8

@@ -23,11 +23,19 @@ exclude =
   venv*/
   target
   __pycache__
+<<<<<<< HEAD
   exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/gen/
   exporter/opentelemetry-exporter-prometheus-remote-write/src/opentelemetry/exporter/prometheus_remote_write/gen/
   exporter/opentelemetry-exporter-jaeger/build/*
+=======
+  exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/v2/gen/
+>>>>>>> upstream/main
   docs/examples/opentelemetry-example-app/src/opentelemetry_example_app/grpc/gen/
   docs/examples/opentelemetry-example-app/build/*
   opentelemetry-proto/build/*
   opentelemetry-proto/src/opentelemetry/proto/
+<<<<<<< HEAD
   scripts/*
+=======
+  */build/lib/*
+>>>>>>> upstream/main

.gitattributes

@@ -0,0 +1,2 @@
+# tells github that proto code is generated
+opentelemetry-proto/src/**/*_pb2*.py* linguist-generated=true

.github/CODEOWNERS

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # This file is only used as a way to assign any change to the approvers team
 # except for a change in any of the instrumentations. The actual codeowners
 # of the instrumentations are in .github/component_owners.yml.
@@ -10,3 +11,10 @@
 
 # Learn about CODEOWNERS file format:
 # https://help.github.com/en/articles/about-code-owners
+=======
+# Code owners file.
+# This file controls who is tagged for review for any given pull request.
+
+# For anything not explicitly taken by someone else:
+*               @open-telemetry/python-approvers
+>>>>>>> upstream/main

.github/pull_request_template.md

@@ -19,15 +19,35 @@ Please describe the tests that you ran to verify your changes. Provide instructi
 
 - [ ] Test A
 
+<<<<<<< HEAD
 # Does This PR Require a Core Repo Change?
+=======
+# Does This PR Require a Contrib Repo Change?
+
+Answer the following question based on these examples of changes that would require a Contrib Repo Change:
+- [The OTel specification](https://github.com/open-telemetry/opentelemetry-specification) has changed which prompted this PR to update the method interfaces of `opentelemetry-api/` or `opentelemetry-sdk/`
+- The method interfaces of `test/util` have changed
+- Scripts in `scripts/` that were copied over to the Contrib repo have changed
+- Configuration files that were copied over to the Contrib repo have changed (when consistency between repositories is applicable) such as in
+    - `pyproject.toml`
+    - `isort.cfg`
+    - `.flake8`
+- When a new `.github/CODEOWNER` is added
+- Major changes to project information, such as in:
+    - `README.md`
+    - `CONTRIBUTING.md`
+>>>>>>> upstream/main
 
 - [ ] Yes. - Link to PR: 
 - [ ] No.
 
 # Checklist:
 
+<<<<<<< HEAD
 See [contributing.md](https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/CONTRIBUTING.md) for styleguide, changelog guidelines, and more.
 
+=======
+>>>>>>> upstream/main
 - [ ] Followed the style guidelines of this project
 - [ ] Changelogs have been updated
 - [ ] Unit tests have been added

.github/scripts/update-version.sh

@@ -3,4 +3,8 @@
 sed -i "/\[stable\]/{n;s/version=.*/version=$1/}" eachdist.ini
 sed -i "/\[prerelease\]/{n;s/version=.*/version=$2/}" eachdist.ini
 
-./scripts/eachdist.py update_versions --versions stable,prerelease
+<<<<<<< HEAD
+./scripts/eachdist.py update_versions --versions stable,prerelease
+=======
+./scripts/eachdist.py update_versions --versions stable,prerelease
+>>>>>>> upstream/main

.github/scripts/use-cla-approved-github-bot.sh

@@ -1,4 +1,8 @@
 #!/bin/bash -e
 
 git config user.name opentelemetrybot
-git config user.email [email protected]
+<<<<<<< HEAD
+git config user.email [email protected]
+=======
+git config user.email [email protected]
+>>>>>>> upstream/main

.github/workflows/backport.yml

@@ -40,4 +40,8 @@ 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
+<<<<<<< HEAD
+                       --base $GITHUB_REF_NAME
+=======
+                       --base $GITHUB_REF_NAME
+>>>>>>> upstream/main

.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: gh-pages
+        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/check-links.yml

@@ -0,0 +1,42 @@
+name: check-links
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+
+jobs:
+  changedfiles:
+    name: changed files
+    runs-on: ubuntu-latest
+    if: ${{ github.actor != 'dependabot[bot]' }}
+    outputs:
+      md: ${{ steps.changes.outputs.md }}
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Get changed files
+        id: changes
+        run: |
+          echo "md=$(git diff --name-only --diff-filter=ACMRTUXB $(git merge-base origin/main ${{ github.event.pull_request.head.sha }}) ${{ github.event.pull_request.head.sha }} | grep .md$ | xargs)" >> $GITHUB_OUTPUT
+  check-links:
+    runs-on: ubuntu-latest
+    needs: changedfiles
+    if: ${{needs.changedfiles.outputs.md}}
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install markdown-link-check
+        run: npm install -g markdown-link-check
+
+      - name: Run markdown-link-check
+        run: |
+          markdown-link-check \
+            --verbose \
+            --config .github/workflows/check_links_config.json \
+            ${{needs.changedfiles.outputs.md}} \
+            || { echo "Check that anchor links are lowercase"; exit 1; }

.github/workflows/check_links_config.json

@@ -0,0 +1,14 @@
+{
+    "ignorePatterns": [
+        {
+            "pattern": "http(s)?://\\d+\\.\\d+\\.\\d+\\.\\d+"
+        },
+        {
+            "pattern": "http(s)?://localhost"
+        },
+        {
+            "pattern": "http(s)?://example.com"
+        }
+    ],
+    "aliveStatusCodes": [429, 200]
+}

.github/workflows/prepare-patch-release.yml

@@ -49,6 +49,7 @@ jobs:
       - name: Update version
         run: .github/scripts/update-version.sh $STABLE_VERSION $UNSTABLE_VERSION
 
+<<<<<<< HEAD
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
@@ -58,6 +59,8 @@ jobs:
       - name: run tox
         run: tox -e generate
 
+=======
+>>>>>>> upstream/main
       - name: Update the change log with the approximate release date
         run: |
           date=$(date "+%Y-%m-%d")
@@ -79,4 +82,8 @@ jobs:
           gh pr create --title "[$GITHUB_REF_NAME] $message" \
                        --body "$message." \
                        --head $branch \
-                       --base $GITHUB_REF_NAME
+<<<<<<< HEAD
+                       --base $GITHUB_REF_NAME
+=======
+                       --base $GITHUB_REF_NAME
+>>>>>>> upstream/main

.github/workflows/prepare-release-branch.yml

@@ -76,6 +76,7 @@ jobs:
       - name: Update version
         run: .github/scripts/update-version.sh $STABLE_VERSION $UNSTABLE_VERSION
 
+<<<<<<< HEAD
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
@@ -85,6 +86,8 @@ jobs:
       - name: run tox
         run: tox -e generate
 
+=======
+>>>>>>> upstream/main
       - name: Update the change log with the approximate release date
         run: |
           date=$(date "+%Y-%m-%d")
@@ -160,6 +163,7 @@ jobs:
       - name: Update version
         run: .github/scripts/update-version.sh $STABLE_NEXT_VERSION $UNSTABLE_NEXT_VERSION
 
+<<<<<<< HEAD
       - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
@@ -169,6 +173,8 @@ jobs:
       - name: run tox
         run: tox -e generate
 
+=======
+>>>>>>> upstream/main
       - name: Update the change log on main
         run: |
           # the actual release date on main will be updated at the end of the release workflow
@@ -192,4 +198,8 @@ jobs:
           gh pr create --title "$message" \
                        --body "$body" \
                        --head $branch \
-                       --base main
+<<<<<<< HEAD
+                       --base main
+=======
+                       --base main
+>>>>>>> upstream/main

.github/workflows/public-api-check.yml

@@ -0,0 +1,40 @@
+name: Public API check
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened, labeled, unlabeled]
+    branches:
+      - main
+
+jobs:
+  publicAPICheck:
+
+    runs-on: ubuntu-latest
+
+    if: "!contains(github.event.pull_request.labels.*.name, 'Approve Public API check')"
+
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Checkout main
+        run: git checkout main
+
+      - name: Pull origin
+        run: git pull --rebase=false origin main
+
+      - name: Checkout pull request
+        run: git checkout ${{ github.event.pull_request.head.sha }}
+
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: '3.10'
+
+      - name: Install tox
+        run: pip install tox==3.27.1 -U tox-factor
+
+      - name: Public API Check
+        run: tox -e public-symbols-check

.github/workflows/release.yml

@@ -125,7 +125,11 @@ jobs:
                             --title "Version ${STABLE_VERSION}/${UNSTABLE_VERSION}" \
                             --notes-file /tmp/release-notes.txt \
                             --discussion-category announcements \
+<<<<<<< HEAD
                             v$UNSTABLE_VERSION
+=======
+                            v$STABLE_VERSION
+>>>>>>> upstream/main
 
       - uses: actions/checkout@v3
         with:
@@ -202,4 +206,8 @@ jobs:
           gh pr create --title "$message" \
                        --body "$body" \
                        --head $branch \
-                       --base main
+<<<<<<< HEAD
+                       --base main
+=======
+                       --base main
+>>>>>>> upstream/main