Merge branch 'main' into prometheus_exporter

fcollonval · web-flow · commit 4d2c902797a2 · 2024-11-06T11:04:55.000+01:00
diff --git a/.github/workflows/check-links.yml b/.github/workflows/check-links.yml
@@ -23,7 +23,10 @@ jobs:
   check-links:
     runs-on: ubuntu-latest
     needs: changedfiles
-    if: ${{needs.changedfiles.outputs.md}}
+    if:
+    if: |
+      github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
+      && ${{needs.changedfiles.outputs.md}}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v4
diff --git a/.github/workflows/contrib_0.yml b/.github/workflows/contrib_0.yml
@@ -16,6 +16,34 @@ env:
 
 jobs:
 
+  py38-test-instrumentation-openai-v2:
+    name: instrumentation-openai-v2 
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout contrib repo @ SHA - ${{ env.CONTRIB_REPO_SHA }}
+        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@v4
+        with:
+          repository: open-telemetry/opentelemetry-python
+          path: opentelemetry-python-core
+
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.8"
+          architecture: "x64"
+
+      - name: Install tox
+        run: pip install tox
+
+      - name: Run tests
+        run: tox -e py38-test-instrumentation-openai-v2 -- -ra
+
   py38-test-resource-detector-container:
     name: resource-detector-container 
     runs-on: ubuntu-latest
diff --git a/.github/workflows/lint_0.yml b/.github/workflows/lint_0.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: main
+  CONTRIB_REPO_SHA: be0c78c8c11d05787edb53104c92a3a959f6a70c
   PIP_EXISTS_ACTION: w
 
 jobs:
diff --git a/.github/workflows/misc_0.yml b/.github/workflows/misc_0.yml
@@ -11,7 +11,7 @@ on:
 
 env:
   CORE_REPO_SHA: main
-  CONTRIB_REPO_SHA: main
+  CONTRIB_REPO_SHA: be0c78c8c11d05787edb53104c92a3a959f6a70c
   PIP_EXISTS_ACTION: w
 
 jobs:
@@ -215,7 +215,7 @@ jobs:
     runs-on: ubuntu-latest
     if: |
       !contains(github.event.pull_request.labels.*.name, 'Skip generate-workflows')
-      && github.actor != 'opentelemetrybot' && github.event_name == 'pull_request'
+      && github.event.pull_request.user.login != 'opentelemetrybot' && github.event_name == 'pull_request'
     steps:
       - name: Checkout repo @ SHA - ${{ github.sha }}
         uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## Version 1.28.0/0.49b0 (2024-11-05)
+
 - Removed superfluous py.typed markers and added them where they were missing
   ([#4172](https://github.com/open-telemetry/opentelemetry-python/pull/4172))
 - Include metric info in encoding exceptions
diff --git a/docs/examples/fork-process-model/flask-gunicorn/requirements.txt b/docs/examples/fork-process-model/flask-gunicorn/requirements.txt
@@ -16,5 +16,5 @@ protobuf==3.20.3
 six==1.15.0
 thrift==0.13.0
 uWSGI==2.0.22
-Werkzeug==3.0.3
+Werkzeug==3.0.6
 wrapt==1.16.0
diff --git a/docs/examples/fork-process-model/flask-uwsgi/requirements.txt b/docs/examples/fork-process-model/flask-uwsgi/requirements.txt
@@ -16,5 +16,5 @@ protobuf==3.20.3
 six==1.15.0
 thrift==0.13.0
 uWSGI==2.0.22
-Werkzeug==3.0.3
+Werkzeug==3.0.6
 wrapt==1.16.0
diff --git a/docs/getting_started/tests/requirements.txt b/docs/getting_started/tests/requirements.txt
@@ -19,7 +19,7 @@ requests==2.32.3
 tomli==2.0.1
 typing_extensions==4.8.0
 urllib3==1.26.19
-Werkzeug==3.0.3
+Werkzeug==3.0.6
 wrapt==1.15.0
 zipp==3.19.2
 -e opentelemetry-semantic-conventions
diff --git a/eachdist.ini b/eachdist.ini
@@ -11,7 +11,7 @@ sortfirst=
     exporter/*
 
 [stable]
-version=1.28.0.dev
+version=1.29.0.dev
 
 packages=
     opentelemetry-sdk
@@ -27,7 +27,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.49b0.dev
+version=0.50b0.dev
 
 packages=
     opentelemetry-opentracing-shim
diff --git a/exporter/opentelemetry-exporter-opencensus/pyproject.toml b/exporter/opentelemetry-exporter-opencensus/pyproject.toml
@@ -30,7 +30,7 @@ classifiers = [
 dependencies = [
   "grpcio >= 1.0.0, < 2.0.0",
   "opencensus-proto >= 0.1.0, < 1.0.0",
-  "opentelemetry-api >= 1.28.0.dev",
+  "opentelemetry-api >= 1.29.0.dev",
   "opentelemetry-sdk >= 1.15",
   "protobuf ~= 3.13",
   "setuptools >= 16.0",
diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.49b0.dev"
+__version__ = "0.50b0.dev"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml
@@ -27,7 +27,7 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-  "opentelemetry-proto == 1.28.0.dev",
+  "opentelemetry-proto == 1.29.0.dev",
 ]
 
 [project.urls]
diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.28.0.dev"
+__version__ = "1.29.0.dev"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml
@@ -31,9 +31,9 @@ dependencies = [
   "googleapis-common-protos ~= 1.52",
   "grpcio >= 1.63.2, < 2.0.0",
   "opentelemetry-api ~= 1.15",
-  "opentelemetry-proto == 1.28.0.dev",
-  "opentelemetry-sdk ~= 1.28.0.dev",
-  "opentelemetry-exporter-otlp-proto-common == 1.28.0.dev",
+  "opentelemetry-proto == 1.29.0.dev",
+  "opentelemetry-sdk ~= 1.29.0.dev",
+  "opentelemetry-exporter-otlp-proto-common == 1.29.0.dev",
 ]
 
 [project.entry-points.opentelemetry_logs_exporter]
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.28.0.dev"
+__version__ = "1.29.0.dev"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml
@@ -30,9 +30,9 @@ dependencies = [
   "Deprecated >= 1.2.6",
   "googleapis-common-protos ~= 1.52",
   "opentelemetry-api ~= 1.15",
-  "opentelemetry-proto == 1.28.0.dev",
-  "opentelemetry-sdk ~= 1.28.0.dev",
-  "opentelemetry-exporter-otlp-proto-common == 1.28.0.dev",
+  "opentelemetry-proto == 1.29.0.dev",
+  "opentelemetry-sdk ~= 1.29.0.dev",
+  "opentelemetry-exporter-otlp-proto-common == 1.29.0.dev",
   "requests ~= 2.7",
 ]
 
diff --git a/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version/__init__.py b/exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.28.0.dev"
+__version__ = "1.29.0.dev"
diff --git a/exporter/opentelemetry-exporter-otlp/pyproject.toml b/exporter/opentelemetry-exporter-otlp/pyproject.toml
@@ -28,8 +28,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-exporter-otlp-proto-grpc == 1.28.0.dev",
-  "opentelemetry-exporter-otlp-proto-http == 1.28.0.dev",
+  "opentelemetry-exporter-otlp-proto-grpc == 1.29.0.dev",
+  "opentelemetry-exporter-otlp-proto-http == 1.29.0.dev",
 ]
 
 [project.entry-points.opentelemetry_logs_exporter]
diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version/__init__.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.28.0.dev"
+__version__ = "1.29.0.dev"
diff --git a/exporter/opentelemetry-exporter-prometheus/pyproject.toml b/exporter/opentelemetry-exporter-prometheus/pyproject.toml
@@ -29,7 +29,7 @@ classifiers = [
 dependencies = [
   "opentelemetry-api ~= 1.12",
   # DONOTMERGE: confirm that this will becomes ~= 1.21 in the next release
-  "opentelemetry-sdk ~= 1.28.0.dev",
+  "opentelemetry-sdk ~= 1.29.0.dev",
   "prometheus_client >= 0.5.0, < 1.0.0",
 ]
 
diff --git a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version/__init__.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.49b0.dev"
+__version__ = "0.50b0.dev"
diff --git a/exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version/__init__.py b/exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.28.0.dev"
+__version__ = "1.29.0.dev"
diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml b/exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml
@@ -29,7 +29,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.3",
-  "opentelemetry-exporter-zipkin-json == 1.28.0.dev",
+  "opentelemetry-exporter-zipkin-json == 1.29.0.dev",
   "opentelemetry-sdk ~= 1.11",
   "protobuf ~= 3.12",
   "requests ~= 2.7",
diff --git a/exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py b/exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.28.0.dev"
+__version__ = "1.29.0.dev"
diff --git a/exporter/opentelemetry-exporter-zipkin/pyproject.toml b/exporter/opentelemetry-exporter-zipkin/pyproject.toml
@@ -28,8 +28,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-exporter-zipkin-json == 1.28.0.dev",
-  "opentelemetry-exporter-zipkin-proto-http == 1.28.0.dev",
+  "opentelemetry-exporter-zipkin-json == 1.29.0.dev",
+  "opentelemetry-exporter-zipkin-proto-http == 1.29.0.dev",
 ]
 
 [project.entry-points.opentelemetry_traces_exporter]
diff --git a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version/__init__.py b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.28.0.dev"
+__version__ = "1.29.0.dev"
diff --git a/opentelemetry-api/src/opentelemetry/version/__init__.py b/opentelemetry-api/src/opentelemetry/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.28.0.dev"
+__version__ = "1.29.0.dev"
diff --git a/opentelemetry-proto/src/opentelemetry/proto/version/__init__.py b/opentelemetry-proto/src/opentelemetry/proto/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.28.0.dev"
+__version__ = "1.29.0.dev"
diff --git a/opentelemetry-sdk/pyproject.toml b/opentelemetry-sdk/pyproject.toml
@@ -27,8 +27,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-api == 1.28.0.dev",
-  "opentelemetry-semantic-conventions == 0.49b0.dev",
+  "opentelemetry-api == 1.29.0.dev",
+  "opentelemetry-semantic-conventions == 0.50b0.dev",
   "typing-extensions >= 3.7.4",
 ]
 
diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.28.0.dev"
+__version__ = "1.29.0.dev"
diff --git a/opentelemetry-semantic-conventions/pyproject.toml b/opentelemetry-semantic-conventions/pyproject.toml
@@ -27,7 +27,7 @@ classifiers = [
 ]
 
 dependencies = [
-  "opentelemetry-api == 1.28.0.dev",
+  "opentelemetry-api == 1.29.0.dev",
   "Deprecated >= 1.2.6",
 ]
 
diff --git a/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version/__init__.py b/opentelemetry-semantic-conventions/src/opentelemetry/semconv/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.49b0.dev"
+__version__ = "0.50b0.dev"
diff --git a/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version/__init__.py b/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.28.0.dev"
+__version__ = "1.29.0.dev"
diff --git a/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version/__init__.py b/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.28.0.dev"
+__version__ = "1.29.0.dev"
diff --git a/shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version/__init__.py b/shim/opentelemetry-opencensus-shim/src/opentelemetry/shim/opencensus/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.49b0.dev"
+__version__ = "0.50b0.dev"
diff --git a/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version/__init__.py b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version/__init__.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.49b0.dev"
+__version__ = "0.50b0.dev"
diff --git a/tests/opentelemetry-test-utils/pyproject.toml b/tests/opentelemetry-test-utils/pyproject.toml
@@ -27,8 +27,8 @@ classifiers = [
 ]
 dependencies = [
   "asgiref ~= 3.0",
-  "opentelemetry-api == 1.28.0.dev",
-  "opentelemetry-sdk == 1.28.0.dev",
+  "opentelemetry-api == 1.29.0.dev",
+  "opentelemetry-sdk == 1.29.0.dev",
 ]
 
 [project.urls]
diff --git a/tests/opentelemetry-test-utils/src/opentelemetry/test/version/__init__.py b/tests/opentelemetry-test-utils/src/opentelemetry/test/version/__init__.py
@@ -1 +1 @@
-__version__ = "0.49b0.dev"
+__version__ = "0.50b0.dev"
diff --git a/tox.ini b/tox.ini
