Merge branch 'main' into Fix-bug-when-labels-are-ordered-differently

open-telemetry · Apr 15, 2024 · f676245 · f676245
2 parents 3f97bac + 9398f26
commit f676245
Show file tree

Hide file tree

Showing 78 changed files with 965 additions and 258 deletions.
diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml
@@ -0,0 +1,19 @@
+name: Shellcheck
+
+on:
+  push:
+    branches-ignore:
+    - 'release/*'
+  pull_request:
+
+jobs:
+  shellcheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install shellcheck
+        run: sudo apt update && sudo apt install --assume-yes shellcheck
+
+      - name: Run shellcheck
+        run: find . -name \*.sh | xargs shellcheck --severity=warning
diff --git a/.github/workflows/test.yml b/.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: 9a7c2f7ba16669d00be273aa9e988af0df7aba4c
+  CONTRIB_REPO_SHA: 3c2788469834aa4f5976e1644d757f43d60bc219
   # 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
@@ -176,7 +176,7 @@ jobs:
           - "tornado"
           - "tortoiseorm"
           - "urllib"
-          - "urllib3v"
+          - "urllib3"
           - "wsgi"
           - "prometheus-remote-write"
           - "richconsole"

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -6,9 +6,10 @@ sphinx:
   configuration: docs/conf.py
 
 build:
-  image: latest
+  os: "ubuntu-22.04"
+  tools:
+    python: "3.8"
 
 python:
-  version: 3.8
   install:
     - requirements: docs-requirements.txt
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Update proto version to v1.2.0
+  ([#3844](https://github.com/open-telemetry/opentelemetry-python/pull/3844))
+- Add to_json method to ExponentialHistogram
+  ([#3780](https://github.com/open-telemetry/opentelemetry-python/pull/3780))
+- Bump mypy to 1.9.0
+  ([#3795](https://github.com/open-telemetry/opentelemetry-python/pull/3795))
+- Fix exponential histograms
+  ([#3798](https://github.com/open-telemetry/opentelemetry-python/pull/3798))
+- Fix otlp exporter to export log_record.observed_timestamp
+  ([#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))
+
+## Version 1.24.0/0.45b0 (2024-03-28)
+
+- Make create_gauge non-abstract method
+  ([#3817](https://github.com/open-telemetry/opentelemetry-python/pull/3817))
 - Make `tracer.start_as_current_span()` decorator work with async functions
   ([#3633](https://github.com/open-telemetry/opentelemetry-python/pull/3633))
 - Fix python 3.12 deprecation warning
@@ -19,6 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#3648](https://github.com/open-telemetry/opentelemetry-python/pull/3648))
 - Fix ValueError message for PeriodicExportingMetricsReader
   ([#3769](https://github.com/open-telemetry/opentelemetry-python/pull/3769))
+- Use `BaseException` instead of `Exception` in `record_exception`
+  ([#3354](https://github.com/open-telemetry/opentelemetry-python/pull/3354))
 - Make span.record_exception more robust
   ([#3778](https://github.com/open-telemetry/opentelemetry-python/pull/3778))
 - Fix license field in pyproject.toml files
@@ -1498,3 +1517,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Remove dependency on 'backoff' library
   ([#3679](https://github.com/open-telemetry/opentelemetry-python/pull/3679))
 
+
+- Make create_gauge non-abstract method
+  ([#3817](https://github.com/open-telemetry/opentelemetry-python/pull/3817))
+- Make `tracer.start_as_current_span()` decorator work with async functions
+  ([#3633](https://github.com/open-telemetry/opentelemetry-python/pull/3633))
+- Fix python 3.12 deprecation warning
+  ([#3751](https://github.com/open-telemetry/opentelemetry-python/pull/3751))
+- bump mypy to 0.982
+  ([#3776](https://github.com/open-telemetry/opentelemetry-python/pull/3776))
+- Add support for OTEL_SDK_DISABLED environment variable
+  ([#3648](https://github.com/open-telemetry/opentelemetry-python/pull/3648))
+- Fix ValueError message for PeriodicExportingMetricsReader
+  ([#3769](https://github.com/open-telemetry/opentelemetry-python/pull/3769))
+- Use `BaseException` instead of `Exception` in `record_exception`
+  ([#3354](https://github.com/open-telemetry/opentelemetry-python/pull/3354))
+- Make span.record_exception more robust
+  ([#3778](https://github.com/open-telemetry/opentelemetry-python/pull/3778))
+- Fix license field in pyproject.toml files
+  ([#3803](https://github.com/open-telemetry/opentelemetry-python/pull/3803))
+
diff --git a/README.md b/README.md
@@ -100,8 +100,12 @@ Approvers ([@open-telemetry/python-approvers](https://github.com/orgs/open-telem
 
 - [Aaron Abbott](https://github.com/aabmass), Google
 - [Jeremy Voss](https://github.com/jeremydvoss), Microsoft
-- [Sanket Mehta](https://github.com/sanketmehta28), Cisco
+- [Owais Lone](https://github.com/owais), Splunk
+- [Pablo Collins](https://github.com/pmcollins), Splunk
+- [Riccardo Magliocchetti](https://github.com/xrmx), Elastic
 - [Shalev Roda](https://github.com/shalevr), Cisco
+- [Srikanth Chekuri](https://github.com/srikanthccv), signoz.io
+- [Tammy Baylis](https://github.com/tammy-baylis-swi), SolarWinds
 
 Emeritus Approvers
 
@@ -111,6 +115,8 @@ 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
+- [Nikolay Sokolik](https://github.com/oxeye-nikolay), Oxeye
+- [Sanket Mehta](https://github.com/sanketmehta28), Cisco
 - [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).*

diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -3,7 +3,7 @@ flake8==6.1.0
 isort==5.12.0
 black==22.3.0
 httpretty==1.1.4
-mypy==0.982
+mypy==1.9.0
 sphinx==7.1.2
 sphinx-rtd-theme==2.0.0rc4
 sphinx-autodoc-typehints==1.25.2

diff --git a/docs/examples/fork-process-model/flask-gunicorn/requirements.txt b/docs/examples/fork-process-model/flask-gunicorn/requirements.txt
@@ -12,7 +12,7 @@ opentelemetry-instrumentation==0.41b0
 opentelemetry-instrumentation-flask==0.41b0
 opentelemetry-instrumentation-wsgi==0.41b0
 opentelemetry-sdk==1.20.0
-protobuf==3.19.5
+protobuf==3.20.3
 six==1.15.0
 thrift==0.13.0
 uWSGI==2.0.22

diff --git a/docs/examples/fork-process-model/flask-uwsgi/requirements.txt b/docs/examples/fork-process-model/flask-uwsgi/requirements.txt
@@ -12,7 +12,7 @@ opentelemetry-instrumentation==0.41b0
 opentelemetry-instrumentation-flask==0.41b0
 opentelemetry-instrumentation-wsgi==0.41b0
 opentelemetry-sdk==1.20.0
-protobuf==3.19.5
+protobuf==3.20.3
 six==1.15.0
 thrift==0.13.0
 uWSGI==2.0.22

diff --git a/eachdist.ini b/eachdist.ini
@@ -11,7 +11,7 @@ sortfirst=
     exporter/*
 
 [stable]
-version=1.24.0.dev
+version=1.25.0.dev
 
 packages=
     opentelemetry-sdk
@@ -27,7 +27,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.45b0.dev
+version=0.46b0.dev
 
 packages=
     opentelemetry-opentracing-shim

diff --git a/exporter/opentelemetry-exporter-opencensus/pyproject.toml b/exporter/opentelemetry-exporter-opencensus/pyproject.toml
@@ -27,7 +27,7 @@ classifiers = [
 dependencies = [
   "grpcio >= 1.0.0, < 2.0.0",
   "opencensus-proto >= 0.1.0, < 1.0.0",
-  "opentelemetry-api >= 1.24.0.dev",
+  "opentelemetry-api >= 1.25.0.dev",
   "opentelemetry-sdk >= 1.15",
   "protobuf ~= 3.13",
   "setuptools >= 16.0",

diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/util.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/util.py
@@ -17,7 +17,9 @@
 from time import time
 
 # pylint: disable=wrong-import-position
-from google.protobuf.timestamp_pb2 import Timestamp
+from google.protobuf.timestamp_pb2 import (  # pylint: disable=no-name-in-module
+    Timestamp,
+)
 from opencensus.proto.agent.common.v1 import common_pb2
 from opencensus.proto.trace.v1 import trace_pb2
 

diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.45b0.dev"
+__version__ = "0.46b0.dev"
diff --git a/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_trace_exporter.py b/exporter/opentelemetry-exporter-opencensus/tests/test_otcollector_trace_exporter.py
@@ -16,7 +16,9 @@
 from unittest import mock
 
 import grpc
-from google.protobuf.timestamp_pb2 import Timestamp
+from google.protobuf.timestamp_pb2 import (  # pylint: disable=no-name-in-module
+    Timestamp,
+)
 from opencensus.proto.trace.v1 import trace_pb2
 
 import opentelemetry.exporter.opencensus.util as utils

diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml
@@ -24,7 +24,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
-  "opentelemetry-proto == 1.24.0.dev",
+  "opentelemetry-proto == 1.25.0.dev",
 ]
 
 [project.urls]

diff --git a/...to-common/src/opentelemetry/exporter/otlp/proto/common/_internal/_log_encoder/__init__.py b/...to-common/src/opentelemetry/exporter/otlp/proto/common/_internal/_log_encoder/__init__.py
@@ -41,6 +41,7 @@ def encode_logs(batch: Sequence[LogData]) -> ExportLogsServiceRequest:
 def _encode_log(log_data: LogData) -> PB2LogRecord:
     return PB2LogRecord(
         time_unix_nano=log_data.log_record.timestamp,
+        observed_time_unix_nano=log_data.log_record.observed_timestamp,
         span_id=_encode_span_id(log_data.log_record.span_id),
         trace_id=_encode_trace_id(log_data.log_record.trace_id),
         flags=int(log_data.log_record.trace_flags),

diff --git a/...emetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version.py b/...emetry-exporter-otlp-proto-common/src/opentelemetry/exporter/otlp/proto/common/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.24.0.dev"
+__version__ = "1.25.0.dev"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-common/test-requirements-0.txt
@@ -0,0 +1,19 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+flaky==3.7.0
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+protobuf==3.20.3
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-proto
+-e exporter/opentelemetry-exporter-otlp-proto-common
diff --git a/...r-otlp-proto-common/test-requirements.txt → ...otlp-proto-common/test-requirements-1.txt b/...r-otlp-proto-common/test-requirements.txt → ...otlp-proto-common/test-requirements-1.txt
diff --git a/exporter/opentelemetry-exporter-otlp-proto-common/tests/test_log_encoder.py b/exporter/opentelemetry-exporter-otlp-proto-common/tests/test_log_encoder.py
@@ -69,6 +69,7 @@ def _get_sdk_log_data() -> List[LogData]:
         log1 = LogData(
             log_record=SDKLogRecord(
                 timestamp=1644650195189786880,
+                observed_timestamp=1644650195189786881,
                 trace_id=89564621134313219400156819398935297684,
                 span_id=1312458408527513268,
                 trace_flags=TraceFlags(0x01),
@@ -89,6 +90,7 @@ def _get_sdk_log_data() -> List[LogData]:
         log2 = LogData(
             log_record=SDKLogRecord(
                 timestamp=1644650249738562048,
+                observed_timestamp=1644650249738562049,
                 trace_id=0,
                 span_id=0,
                 trace_flags=TraceFlags.DEFAULT,
@@ -106,6 +108,7 @@ def _get_sdk_log_data() -> List[LogData]:
         log3 = LogData(
             log_record=SDKLogRecord(
                 timestamp=1644650427658989056,
+                observed_timestamp=1644650427658989057,
                 trace_id=271615924622795969659406376515024083555,
                 span_id=4242561578944770265,
                 trace_flags=TraceFlags(0x01),
@@ -121,6 +124,7 @@ def _get_sdk_log_data() -> List[LogData]:
         log4 = LogData(
             log_record=SDKLogRecord(
                 timestamp=1644650584292683008,
+                observed_timestamp=1644650584292683009,
                 trace_id=212592107417388365804938480559624925555,
                 span_id=6077757853989569223,
                 trace_flags=TraceFlags(0x01),
@@ -164,6 +168,7 @@ def get_test_logs(
                             log_records=[
                                 PB2LogRecord(
                                     time_unix_nano=1644650195189786880,
+                                    observed_time_unix_nano=1644650195189786881,
                                     trace_id=_encode_trace_id(
                                         89564621134313219400156819398935297684
                                     ),
@@ -190,6 +195,7 @@ def get_test_logs(
                             log_records=[
                                 PB2LogRecord(
                                     time_unix_nano=1644650584292683008,
+                                    observed_time_unix_nano=1644650584292683009,
                                     trace_id=_encode_trace_id(
                                         212592107417388365804938480559624925555
                                     ),
@@ -232,6 +238,7 @@ def get_test_logs(
                             log_records=[
                                 PB2LogRecord(
                                     time_unix_nano=1644650249738562048,
+                                    observed_time_unix_nano=1644650249738562049,
                                     trace_id=_encode_trace_id(0),
                                     span_id=_encode_span_id(0),
                                     flags=int(TraceFlags.DEFAULT),
@@ -249,6 +256,7 @@ def get_test_logs(
                             log_records=[
                                 PB2LogRecord(
                                     time_unix_nano=1644650427658989056,
+                                    observed_time_unix_nano=1644650427658989057,
                                     trace_id=_encode_trace_id(
                                         271615924622795969659406376515024083555
                                     ),

diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml b/exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml
@@ -28,14 +28,9 @@ dependencies = [
   "googleapis-common-protos ~= 1.52",
   "grpcio >= 1.0.0, < 2.0.0",
   "opentelemetry-api ~= 1.15",
-  "opentelemetry-proto == 1.24.0.dev",
-  "opentelemetry-sdk ~= 1.24.0.dev",
-  "opentelemetry-exporter-otlp-proto-common == 1.24.0.dev",
-]
-
-[project.optional-dependencies]
-test = [
-  "pytest-grpc",
+  "opentelemetry-proto == 1.25.0.dev",
+  "opentelemetry-sdk ~= 1.25.0.dev",
+  "opentelemetry-exporter-otlp-proto-common == 1.25.0.dev",
 ]
 
 [project.entry-points.opentelemetry_logs_exporter]

diff --git a/...ntelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version.py b/...ntelemetry-exporter-otlp-proto-grpc/src/opentelemetry/exporter/otlp/proto/grpc/version.py
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.24.0.dev"
+__version__ = "1.25.0.dev"
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-0.txt
@@ -0,0 +1,25 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+flaky==3.7.0
+googleapis-common-protos==1.62.0
+grpcio==1.62.0
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+protobuf==3.20.3
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-api
+-e exporter/opentelemetry-exporter-otlp-proto-common
+-e opentelemetry-proto
+-e opentelemetry-sdk
+-e opentelemetry-semantic-conventions
+-e exporter/opentelemetry-exporter-otlp-proto-grpc
diff --git a/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt b/exporter/opentelemetry-exporter-otlp-proto-grpc/test-requirements-1.txt
@@ -0,0 +1,25 @@
+asgiref==3.7.2
+attrs==23.2.0
+Deprecated==1.2.14
+flaky==3.7.0
+googleapis-common-protos==1.62.0
+grpcio==1.62.0
+importlib-metadata==6.11.0
+iniconfig==2.0.0
+packaging==23.2
+pluggy==1.4.0
+protobuf==4.25.3
+py==1.11.0
+py-cpuinfo==9.0.0
+pytest==7.1.3
+pytest-benchmark==4.0.0
+tomli==2.0.1
+typing_extensions==4.10.0
+wrapt==1.16.0
+zipp==3.17.0
+-e opentelemetry-api
+-e exporter/opentelemetry-exporter-otlp-proto-common
+-e opentelemetry-proto
+-e opentelemetry-sdk
+-e opentelemetry-semantic-conventions
+-e exporter/opentelemetry-exporter-otlp-proto-grpc