Merge branch 'main' into fix

.flake8

@@ -12,6 +12,10 @@ ignore =
   # allow whitespace before ':' (https://github.com/psf/black#slices)
   E203
 
+  # conflicts with black
+  E701
+  E704
+
 exclude =
   .bzr
   .git

.github/dependabot.yml

@@ -0,0 +1,13 @@
+# Keep GitHub Actions up to date with GitHub's Dependabot...
+# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
+# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    groups:
+      github-actions:
+        patterns:
+          - "*"  # Group all Actions updates into a single larger pull request
+    schedule:
+      interval: weekly

.github/workflows/backport.yml

@@ -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

.github/workflows/benchmarks.yml

@@ -18,17 +18,17 @@ jobs:
         os: [ubuntu-20.04, windows-2019]
     steps:
     - name: Checkout Core Repo @ SHA - ${{ github.sha }}
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Set up Python ${{ env[matrix.python-version] }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ env[matrix.python-version] }}
         architecture: 'x64'
     - name: Install tox
       run: pip install tox
     - name: Cache tox environment
       # Preserves .tox directory between runs for faster installs
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           .tox

.github/workflows/changelog.yml

@@ -18,7 +18,7 @@ jobs:
       && github.actor != 'opentelemetrybot'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Check for CHANGELOG changes
         run: |
@@ -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

.github/workflows/check-links.yml

@@ -13,7 +13,7 @@ jobs:
       md: ${{ steps.changes.outputs.md }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Get changed files
@@ -26,7 +26,7 @@ jobs:
     if: ${{needs.changedfiles.outputs.md}}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -39,4 +39,4 @@ jobs:
             --verbose \
             --config .github/workflows/check_links_config.json \
             ${{needs.changedfiles.outputs.md}} \
-            || { echo "Check that anchor links are lowercase"; exit 1; }
+            || { echo "Check that anchor links are lowercase"; exit 1; }

.github/workflows/codeql-analysis.yml

@@ -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

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

@@ -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

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

@@ -10,7 +10,7 @@ jobs:
   prereqs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Verify prerequisites
         env:
@@ -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:
@@ -103,7 +103,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: prereqs
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment variables
         env:

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

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout the repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -29,7 +29,7 @@ jobs:
         run: git checkout ${{ github.event.pull_request.head.sha }}
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
             exit 1
           fi
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set environment variables
         run: |
@@ -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'
 
@@ -127,7 +127,7 @@ jobs:
                             --discussion-category announcements \
                             v$STABLE_VERSION
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # the step below is creating a pull request against main
           ref: main

.github/workflows/test.yml

@@ -10,9 +10,9 @@ 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: 3c2788469834aa4f5976e1644d757f43d60bc219
+  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@v2 which
+  # 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
   # contrib builds are run directly from contrib (since test.yml is executed, which sets CORE_REPO_SHA)
   # The solution is to include CORE_REPO_SHA as part of THIS environment so it can be accessed
@@ -67,17 +67,17 @@ jobs:
 
     steps:
     - name: Checkout Core Repo @ SHA - ${{ github.sha }}
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Set up Python ${{ env[matrix.python-version] }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ env[matrix.python-version] }}
         architecture: 'x64'
     - name: Install tox
       run: pip install tox
     - name: Cache tox environment
         # Preserves .tox directory between runs for faster installs
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           .tox
@@ -100,17 +100,17 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
     - name: Checkout Core Repo @ SHA - ${{ github.sha }}
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: '3.10'
         architecture: 'x64'
     - name: Install tox
       run: pip install tox
     - name: Cache tox environment
         # Preserves .tox directory between runs for faster installs
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           .tox
@@ -183,25 +183,25 @@ jobs:
         os: [ubuntu-20.04]
     steps:
     - name: Checkout Contrib Repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: open-telemetry/opentelemetry-python-contrib
         ref: ${{ env.CONTRIB_REPO_SHA }}
     - name: Checkout Core Repo @ SHA ${{ github.sha }}
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: open-telemetry/opentelemetry-python
         path: opentelemetry-python-core
     - name: Set up Python ${{ env[matrix.python-version] }}
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ env[matrix.python-version] }}
         architecture: 'x64'
     - name: Install tox
       run: pip install tox
     - name: Cache tox environment
         # Preserves .tox directory between runs for faster installs
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: |
           .tox

CHANGELOG.md

@@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3785](https://github.com/open-telemetry/opentelemetry-python/pull/3785))
 - Add capture the fully qualified type name for raised exceptions in spans
   ([#3837](https://github.com/open-telemetry/opentelemetry-python/pull/3837))
+- Prometheus exporter sort label keys to prevent duplicate metrics when user input changes order 
+  ([#3698](https://github.com/open-telemetry/opentelemetry-python/pull/3698))
 
 ## Version 1.24.0/0.45b0 (2024-03-28)
 

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright The OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

dev-requirements.txt

@@ -1,7 +1,7 @@
 pylint==3.0.2
 flake8==6.1.0
 isort==5.12.0
-black==22.3.0
+black==24.3.0
 httpretty==1.1.4
 mypy==1.9.0
 sphinx==7.1.2

docs/examples/fork-process-model/flask-gunicorn/requirements.txt

@@ -2,7 +2,7 @@ click==8.1.7
 Flask==2.3.3
 googleapis-common-protos==1.52.0
 grpcio==1.56.0
-gunicorn==20.0.4
+gunicorn==22.0.0
 itsdangerous==2.1.2
 Jinja2==3.1.3
 MarkupSafe==2.1.3

docs/examples/fork-process-model/flask-uwsgi/requirements.txt

@@ -2,7 +2,7 @@ click==8.1.7
 Flask==2.3.3
 googleapis-common-protos==1.52.0
 grpcio==1.56.0
-gunicorn==20.0.4
+gunicorn==22.0.0
 itsdangerous==2.1.2
 Jinja2==3.1.3
 MarkupSafe==2.1.3

exporter/opentelemetry-exporter-opencensus/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright The OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/trace_exporter/__init__.py

@@ -133,11 +133,11 @@ def translate_to_collector(spans: Sequence[ReadableSpan]):
         collector_span.parent_span_id = parent_id.to_bytes(8, "big")
 
         if span.context.trace_state is not None:
-            for (key, value) in span.context.trace_state.items():
+            for key, value in span.context.trace_state.items():
                 collector_span.tracestate.entries.add(key=key, value=value)
 
         if span.attributes:
-            for (key, value) in span.attributes.items():
+            for key, value in span.attributes.items():
                 utils.add_proto_attribute_value(
                     collector_span.attributes, key, value
                 )
@@ -150,7 +150,7 @@ def translate_to_collector(spans: Sequence[ReadableSpan]):
                 )
 
                 if event.attributes:
-                    for (key, value) in event.attributes.items():
+                    for key, value in event.attributes.items():
                         utils.add_proto_attribute_value(
                             collector_annotation.attributes, key, value
                         )
@@ -183,7 +183,7 @@ def translate_to_collector(spans: Sequence[ReadableSpan]):
                         )
 
                 if link.attributes:
-                    for (key, value) in link.attributes.items():
+                    for key, value in link.attributes.items():
                         utils.add_proto_attribute_value(
                             collector_span_link.attributes, key, value
                         )

exporter/opentelemetry-exporter-otlp-proto-common/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright The OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

exporter/opentelemetry-exporter-otlp-proto-grpc/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright The OpenTelemetry Authors
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.