Merge branch 'main' into export-nonmonotonic-sums-as-gauges-in-prometheus

Author: brettimus

.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: dadcd01524449ddee07a8d8405890a60caeb8c8e
+  CONTRIB_REPO_SHA: d1fb91ae0c075751b580ff4892bae44749d5810d
   # 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

CHANGELOG.md

@@ -9,10 +9,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Modify Prometheus exporter to translate non-monotonic Sums into Gauges
   ([#3306](https://github.com/open-telemetry/opentelemetry-python/pull/3306))
+
+
+## Version 1.19.0/0.40b0 (2023-07-13)
+
+- Drop `setuptools` runtime requirement.
+  ([#3372](https://github.com/open-telemetry/opentelemetry-python/pull/3372))
+- Update the body type in the log
+  ([$3343](https://github.com/open-telemetry/opentelemetry-python/pull/3343))
 - Add max_scale option to Exponential Bucket Histogram Aggregation 
   ([#3323](https://github.com/open-telemetry/opentelemetry-python/pull/3323))
 - Use BoundedAttributes instead of raw dict to extract attributes from LogRecord
-  ([#3310](https://github.com/open-telemetry/opentelemetry-python/pull/3310)) 
+  ([#3310](https://github.com/open-telemetry/opentelemetry-python/pull/3310))
 - Support dropped_attributes_count in LogRecord and exporters
   ([#3351](https://github.com/open-telemetry/opentelemetry-python/pull/3351))
 - Add unit to view instrument selection criteria
@@ -21,8 +29,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   [#3355](https://github.com/open-telemetry/opentelemetry-python/pull/3355))
 - Include endpoint in Grpc transient error warning
   [#3362](https://github.com/open-telemetry/opentelemetry-python/pull/3362))
+- Fixed bug where logging export is tracked as trace
+  [#3375](https://github.com/open-telemetry/opentelemetry-python/pull/3375))
+
 
-## Version 1.18.0/0.39b0 (2023-05-04)
+## Version 1.18.0/0.39b0 (2023-05-19)
 
 - Select histogram aggregation with an environment variable
   ([#3265](https://github.com/open-telemetry/opentelemetry-python/pull/3265))

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

@@ -1,7 +1,7 @@
 click==7.1.2
 Flask==1.1.2
 googleapis-common-protos==1.52.0
-grpcio==1.35.0
+grpcio==1.53.0
 gunicorn==20.0.4
 itsdangerous==1.1.0
 Jinja2==2.11.3

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

@@ -1,7 +1,7 @@
 click==7.1.2
 Flask==1.1.2
 googleapis-common-protos==1.52.0
-grpcio==1.35.0
+grpcio==1.53.0
 gunicorn==20.0.4
 itsdangerous==1.1.0
 Jinja2==2.11.3

eachdist.ini

@@ -11,7 +11,7 @@ sortfirst=
     exporter/*
 
 [stable]
-version=1.19.0.dev
+version=1.20.0.dev
 
 packages=
     opentelemetry-sdk
@@ -30,7 +30,7 @@ packages=
     opentelemetry-api
 
 [prerelease]
-version=0.40b0.dev
+version=0.41b0.dev
 
 packages=
     opentelemetry-opentracing-shim

exporter/opentelemetry-exporter-jaeger-proto-grpc/src/opentelemetry/exporter/jaeger/proto/grpc/version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.19.0.dev"
+__version__ = "1.20.0.dev"

exporter/opentelemetry-exporter-jaeger-thrift/src/opentelemetry/exporter/jaeger/thrift/version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.19.0.dev"
+__version__ = "1.20.0.dev"

exporter/opentelemetry-exporter-jaeger/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-exporter-jaeger-proto-grpc == 1.19.0.dev",
-  "opentelemetry-exporter-jaeger-thrift == 1.19.0.dev",
+  "opentelemetry-exporter-jaeger-proto-grpc == 1.20.0.dev",
+  "opentelemetry-exporter-jaeger-thrift == 1.20.0.dev",
 ]
 
 [project.optional-dependencies]

exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.19.0.dev"
+__version__ = "1.20.0.dev"

exporter/opentelemetry-exporter-opencensus/pyproject.toml

@@ -28,7 +28,7 @@ classifiers = [
 dependencies = [
   "grpcio >= 1.0.0, < 2.0.0",
   "opencensus-proto >= 0.1.0, < 1.0.0",
-  "opentelemetry-api >= 1.19.0.dev",
+  "opentelemetry-api >= 1.20.0.dev",
   "opentelemetry-sdk >= 1.15",
   "protobuf ~= 3.13",
   "setuptools >= 16.0",

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.40b0.dev"
+__version__ = "0.41b0.dev"

exporter/opentelemetry-exporter-otlp-proto-common/pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
 ]
 dependencies = [
-  "opentelemetry-proto == 1.19.0.dev",
+  "opentelemetry-proto == 1.20.0.dev",
 ]
 
 [project.urls]

exporter/opentelemetry-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.19.0.dev"
+__version__ = "1.20.0.dev"

exporter/opentelemetry-exporter-otlp-proto-grpc/pyproject.toml

@@ -31,9 +31,9 @@ dependencies = [
   "googleapis-common-protos ~= 1.52",
   "grpcio >= 1.0.0, < 2.0.0",
   "opentelemetry-api ~= 1.15",
-  "opentelemetry-proto == 1.19.0.dev",
-  "opentelemetry-sdk ~= 1.19.0.dev",
-  "opentelemetry-exporter-otlp-proto-common == 1.19.0.dev",
+  "opentelemetry-proto == 1.20.0.dev",
+  "opentelemetry-sdk ~= 1.20.0.dev",
+  "opentelemetry-exporter-otlp-proto-common == 1.20.0.dev",
 ]
 
 [project.optional-dependencies]

exporter/opentelemetry-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.19.0.dev"
+__version__ = "1.20.0.dev"

exporter/opentelemetry-exporter-otlp-proto-http/pyproject.toml

@@ -30,9 +30,9 @@ dependencies = [
   "backoff >= 1.10.0, < 3.0.0; python_version>='3.7'",
   "googleapis-common-protos ~= 1.52",
   "opentelemetry-api ~= 1.15",
-  "opentelemetry-proto == 1.19.0.dev",
-  "opentelemetry-sdk ~= 1.19.0.dev",
-  "opentelemetry-exporter-otlp-proto-common == 1.19.0.dev",
+  "opentelemetry-proto == 1.20.0.dev",
+  "opentelemetry-sdk ~= 1.20.0.dev",
+  "opentelemetry-exporter-otlp-proto-common == 1.20.0.dev",
   "requests ~= 2.7",
 ]
 

exporter/opentelemetry-exporter-otlp-proto-http/src/opentelemetry/exporter/otlp/proto/http/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.19.0.dev"
+__version__ = "1.20.0.dev"

exporter/opentelemetry-exporter-otlp/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-exporter-otlp-proto-grpc == 1.19.0.dev",
-  "opentelemetry-exporter-otlp-proto-http == 1.19.0.dev",
+  "opentelemetry-exporter-otlp-proto-grpc == 1.20.0.dev",
+  "opentelemetry-exporter-otlp-proto-http == 1.20.0.dev",
 ]
 
 [project.entry-points.opentelemetry_logs_exporter]

exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.19.0.dev"
+__version__ = "1.20.0.dev"

exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "0.40b0.dev"
+__version__ = "0.41b0.dev"

exporter/opentelemetry-exporter-zipkin-json/src/opentelemetry/exporter/zipkin/json/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.19.0.dev"
+__version__ = "1.20.0.dev"

exporter/opentelemetry-exporter-zipkin-proto-http/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
 ]
 dependencies = [
   "opentelemetry-api ~= 1.3",
-  "opentelemetry-exporter-zipkin-json == 1.19.0.dev",
+  "opentelemetry-exporter-zipkin-json == 1.20.0.dev",
   "opentelemetry-sdk ~= 1.11",
   "protobuf ~= 3.12",
   "requests ~= 2.7",

exporter/opentelemetry-exporter-zipkin-proto-http/src/opentelemetry/exporter/zipkin/proto/http/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.19.0.dev"
+__version__ = "1.20.0.dev"

exporter/opentelemetry-exporter-zipkin/pyproject.toml

@@ -26,8 +26,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-exporter-zipkin-json == 1.19.0.dev",
-  "opentelemetry-exporter-zipkin-proto-http == 1.19.0.dev",
+  "opentelemetry-exporter-zipkin-json == 1.20.0.dev",
+  "opentelemetry-exporter-zipkin-proto-http == 1.20.0.dev",
 ]
 
 [project.optional-dependencies]

exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.19.0.dev"
+__version__ = "1.20.0.dev"

opentelemetry-api/pyproject.toml

@@ -26,7 +26,6 @@ classifiers = [
 ]
 dependencies = [
     "Deprecated >= 1.2.6",
-    "setuptools >= 16.0",
     # FIXME This should be able to be removed after 3.12 is released if there is a reliable API
     # in importlib.metadata.
     "importlib-metadata ~= 6.0",

opentelemetry-api/src/opentelemetry/_logs/_internal/__init__.py

@@ -143,7 +143,7 @@ def get_logger(
 
             version: Optional. The version string of the
                 instrumenting library.  Usually this should be the same as
-                ``pkg_resources.get_distribution(instrumenting_library_name).version``.
+                ``importlib.metadata.version(instrumenting_library_name)``.
 
             schema_url: Optional. Specifies the Schema URL of the emitted telemetry.
         """

opentelemetry-api/src/opentelemetry/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.19.0.dev"
+__version__ = "1.20.0.dev"

opentelemetry-proto/src/opentelemetry/proto/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.19.0.dev"
+__version__ = "1.20.0.dev"

opentelemetry-sdk/pyproject.toml

@@ -26,9 +26,8 @@ classifiers = [
   "Typing :: Typed",
 ]
 dependencies = [
-  "opentelemetry-api == 1.19.0.dev",
-  "opentelemetry-semantic-conventions == 0.40b0.dev",
-  "setuptools >= 16.0",
+  "opentelemetry-api == 1.20.0.dev",
+  "opentelemetry-semantic-conventions == 0.41b0.dev",
   "typing-extensions >= 3.7.4",
 ]
 

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/__init__.py

@@ -21,7 +21,7 @@
 import traceback
 from os import environ
 from time import time_ns
-from typing import Any, Callable, Optional, Tuple, Union
+from typing import Any, Callable, Optional, Tuple, Union  # noqa
 
 from opentelemetry._logs import Logger as APILogger
 from opentelemetry._logs import LoggerProvider as APILoggerProvider
@@ -476,15 +476,56 @@ def _translate(self, record: logging.LogRecord) -> LogRecord:
         timestamp = int(record.created * 1e9)
         span_context = get_current_span().get_span_context()
         attributes = self._get_attributes(record)
+        # This comment is taken from GanyedeNil's PR #3343, I have redacted it
+        # slightly for clarity:
+        # According to the definition of the Body field type in the
+        # OTel 1.22.0 Logs Data Model article, the Body field should be of
+        # type 'any' and should not use the str method to directly translate
+        # the msg. This is because str only converts non-text types into a
+        # human-readable form, rather than a standard format, which leads to
+        # the need for additional operations when collected through a log
+        # collector.
+        # Considering that he Body field should be of type 'any' and should not
+        # use the str method but record.msg is also a string type, then the
+        # difference is just the self.args formatting?
+        # The primary consideration depends on the ultimate purpose of the log.
+        # Converting the default log directly into a string is acceptable as it
+        # will be required to be presented in a more readable format. However,
+        # this approach might not be as "standard" when hoping to aggregate
+        # logs and perform subsequent data analysis. In the context of log
+        # extraction, it would be more appropriate for the msg to be
+        # converted into JSON format or remain unchanged, as it will eventually
+        # be transformed into JSON. If the final output JSON data contains a
+        # structure that appears similar to JSON but is not, it may confuse
+        # users. This is particularly true for operation and maintenance
+        # personnel who need to deal with log data in various languages.
+        # Where is the JSON converting occur? and what about when the msg
+        # represents something else but JSON, the expected behavior change?
+        # For the ConsoleLogExporter, it performs the to_json operation in
+        # opentelemetry.sdk._logs._internal.export.ConsoleLogExporter.__init__,
+        # so it can handle any type of input without problems. As for the
+        # OTLPLogExporter, it also handles any type of input encoding in
+        # _encode_log located in
+        # opentelemetry.exporter.otlp.proto.common._internal._log_encoder.
+        # Therefore, no extra operation is needed to support this change.
+        # The only thing to consider is the users who have already been using
+        # this SDK. If they upgrade the SDK after this change, they will need
+        # to readjust their logging collection rules to adapt to the latest
+        # output format. Therefore, this change is considered a breaking
+        # change and needs to be upgraded at an appropriate time.
         severity_number = std_to_otel(record.levelno)
+        if isinstance(record.msg, str) and record.args:
+            body = record.msg % record.args
+        else:
+            body = record.msg
         return LogRecord(
             timestamp=timestamp,
             trace_id=span_context.trace_id,
             span_id=span_context.span_id,
             trace_flags=span_context.trace_flags,
             severity_text=record.levelname,
             severity_number=severity_number,
-            body=record.getMessage(),
+            body=body,
             resource=self._logger.resource,
             attributes=attributes,
         )

opentelemetry-sdk/src/opentelemetry/sdk/_logs/_internal/export/__init__.py

@@ -307,7 +307,7 @@ def _export_batch(self) -> int:
             record = self._queue.pop()
             self._log_records[idx] = record
             idx += 1
-        token = attach(set_value("suppress_instrumentation", True))
+        token = attach(set_value(_SUPPRESS_INSTRUMENTATION_KEY, True))
         try:
             self._exporter.export(self._log_records[:idx])  # type: ignore
         except Exception:  # pylint: disable=broad-except

opentelemetry-sdk/src/opentelemetry/sdk/trace/export/in_memory_span_exporter.py

@@ -27,17 +27,17 @@ class InMemorySpanExporter(SpanExporter):
     :func:`.get_finished_spans` method.
     """
 
-    def __init__(self):
-        self._finished_spans = []
+    def __init__(self) -> None:
+        self._finished_spans: typing.List[ReadableSpan] = []
         self._stopped = False
         self._lock = threading.Lock()
 
-    def clear(self):
+    def clear(self) -> None:
         """Clear list of collected spans."""
         with self._lock:
             self._finished_spans.clear()
 
-    def get_finished_spans(self):
+    def get_finished_spans(self) -> typing.Tuple[ReadableSpan, ...]:
         """Get list of collected spans."""
         with self._lock:
             return tuple(self._finished_spans)
@@ -50,7 +50,7 @@ def export(self, spans: typing.Sequence[ReadableSpan]) -> SpanExportResult:
             self._finished_spans.extend(spans)
         return SpanExportResult.SUCCESS
 
-    def shutdown(self):
+    def shutdown(self) -> None:
         """Shut downs the exporter.
 
         Calls to export after the exporter has been shut down will fail.

opentelemetry-sdk/src/opentelemetry/sdk/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = "1.19.0.dev"
+__version__ = "1.20.0.dev"