Merge branch 'main' into issue-2446

Author: srikanthccv

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - `opentelemetry-exporter-otlp-proto-http` Add support for OTLP/HTTP log exporter
   ([#2462](https://github.com/open-telemetry/opentelemetry-python/pull/2462))
+- Add missing `to_json` methods
+  ([#2722](https://github.com/open-telemetry/opentelemetry-python/pull/2722)
 - Fix type hints for textmap `Getter` and `Setter`
   ([#2657](https://github.com/open-telemetry/opentelemetry-python/pull/2657))
 - Fix LogEmitterProvider.force_flush hanging randomly
@@ -21,8 +23,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#2726](https://github.com/open-telemetry/opentelemetry-python/pull/2726))
 - fix: frozenset object has no attribute items
   ([#2727](https://github.com/open-telemetry/opentelemetry-python/pull/2727))
+- Support logs SDK auto instrumentation enable/disable with env
+  ([#2728](https://github.com/open-telemetry/opentelemetry-python/pull/2728))
 - fix: update entry point object references for metrics
   ([#2731](https://github.com/open-telemetry/opentelemetry-python/pull/2731))
+- Configure auto instrumentation to support metrics
+  ([#2705](https://github.com/open-telemetry/opentelemetry-python/pull/2705))
 
 ## [1.12.0rc1-0.31b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0rc1-0.31b0) - 2022-05-17
 

opentelemetry-sdk/src/opentelemetry/sdk/_configuration/__init__.py

@@ -18,29 +18,40 @@
 """
 
 import logging
+import os
 from abc import ABC, abstractmethod
 from os import environ
 from typing import Dict, Optional, Sequence, Tuple, Type
 
 from pkg_resources import iter_entry_points
 
-from opentelemetry import trace
 from opentelemetry.environment_variables import (
     OTEL_LOGS_EXPORTER,
+    OTEL_METRICS_EXPORTER,
     OTEL_PYTHON_ID_GENERATOR,
     OTEL_TRACES_EXPORTER,
 )
+from opentelemetry.metrics import set_meter_provider
 from opentelemetry.sdk._logs import (
     LogEmitterProvider,
     LoggingHandler,
     set_log_emitter_provider,
 )
 from opentelemetry.sdk._logs.export import BatchLogProcessor, LogExporter
+from opentelemetry.sdk.environment_variables import (
+    _OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED,
+)
+from opentelemetry.sdk.metrics import MeterProvider
+from opentelemetry.sdk.metrics.export import (
+    MetricExporter,
+    PeriodicExportingMetricReader,
+)
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import BatchSpanProcessor, SpanExporter
 from opentelemetry.sdk.trace.id_generator import IdGenerator
 from opentelemetry.semconv.resource import ResourceAttributes
+from opentelemetry.trace import set_tracer_provider
 
 _EXPORTER_OTLP = "otlp"
 _EXPORTER_OTLP_PROTO_GRPC = "otlp_proto_grpc"
@@ -83,7 +94,7 @@ def _init_tracing(
         id_generator=id_generator(),
         resource=Resource.create(auto_resource),
     )
-    trace.set_tracer_provider(provider)
+    set_tracer_provider(provider)
 
     for _, exporter_class in exporters.items():
         exporter_args = {}
@@ -92,6 +103,33 @@ def _init_tracing(
         )
 
 
+def _init_metrics(
+    exporters: Dict[str, Type[MetricExporter]],
+    auto_instrumentation_version: Optional[str] = None,
+):
+    # if env var OTEL_RESOURCE_ATTRIBUTES is given, it will read the service_name
+    # from the env variable else defaults to "unknown_service"
+    auto_resource = {}
+    # populate version if using auto-instrumentation
+    if auto_instrumentation_version:
+        auto_resource[
+            ResourceAttributes.TELEMETRY_AUTO_VERSION
+        ] = auto_instrumentation_version
+
+    metric_readers = []
+
+    for _, exporter_class in exporters.items():
+        exporter_args = {}
+        metric_readers.append(
+            PeriodicExportingMetricReader(exporter_class(**exporter_args))
+        )
+
+    provider = MeterProvider(
+        resource=Resource.create(auto_resource), metric_readers=metric_readers
+    )
+    set_meter_provider(provider)
+
+
 def _init_logging(
     exporters: Dict[str, Type[LogExporter]],
     auto_instrumentation_version: Optional[str] = None,
@@ -141,9 +179,15 @@ def _import_config_components(
 
 def _import_exporters(
     trace_exporter_names: Sequence[str],
+    metric_exporter_names: Sequence[str],
     log_exporter_names: Sequence[str],
-) -> Tuple[Dict[str, Type[SpanExporter]], Dict[str, Type[LogExporter]]]:
+) -> Tuple[
+    Dict[str, Type[SpanExporter]],
+    Dict[str, Type[MetricExporter]],
+    Dict[str, Type[LogExporter]],
+]:
     trace_exporters = {}
+    metric_exporters = {}
     log_exporters = {}
 
     for (exporter_name, exporter_impl,) in _import_config_components(
@@ -154,6 +198,14 @@ def _import_exporters(
         else:
             raise RuntimeError(f"{exporter_name} is not a trace exporter")
 
+    for (exporter_name, exporter_impl,) in _import_config_components(
+        metric_exporter_names, "opentelemetry_metrics_exporter"
+    ):
+        if issubclass(exporter_impl, MetricExporter):
+            metric_exporters[exporter_name] = exporter_impl
+        else:
+            raise RuntimeError(f"{exporter_name} is not a metric exporter")
+
     for (exporter_name, exporter_impl,) in _import_config_components(
         log_exporter_names, "opentelemetry_logs_exporter"
     ):
@@ -162,7 +214,7 @@ def _import_exporters(
         else:
             raise RuntimeError(f"{exporter_name} is not a log exporter")
 
-    return trace_exporters, log_exporters
+    return trace_exporters, metric_exporters, log_exporters
 
 
 def _import_id_generator(id_generator_name: str) -> IdGenerator:
@@ -178,14 +230,20 @@ def _import_id_generator(id_generator_name: str) -> IdGenerator:
 
 
 def _initialize_components(auto_instrumentation_version):
-    trace_exporters, log_exporters = _import_exporters(
+    trace_exporters, metric_exporters, log_exporters = _import_exporters(
         _get_exporter_names(environ.get(OTEL_TRACES_EXPORTER)),
+        _get_exporter_names(environ.get(OTEL_METRICS_EXPORTER)),
         _get_exporter_names(environ.get(OTEL_LOGS_EXPORTER)),
     )
     id_generator_name = _get_id_generator()
     id_generator = _import_id_generator(id_generator_name)
     _init_tracing(trace_exporters, id_generator, auto_instrumentation_version)
-    _init_logging(log_exporters, auto_instrumentation_version)
+    _init_metrics(metric_exporters, auto_instrumentation_version)
+    logging_enabled = os.getenv(
+        _OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED, "false"
+    )
+    if logging_enabled.strip().lower() == "true":
+        _init_logging(log_exporters, auto_instrumentation_version)
 
 
 class _BaseConfigurator(ABC):

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

@@ -24,6 +24,7 @@
 
 from opentelemetry.context import attach, detach, set_value
 from opentelemetry.sdk._logs import LogData, LogProcessor, LogRecord
+from opentelemetry.util._once import Once
 from opentelemetry.util._time import _time_ns
 
 _logger = logging.getLogger(__name__)
@@ -129,6 +130,9 @@ def __init__(self):
         self.num_log_records = 0
 
 
+_BSP_RESET_ONCE = Once()
+
+
 class BatchLogProcessor(LogProcessor):
     """This is an implementation of LogProcessor which creates batches of
     received logs in the export-friendly LogData representation and
@@ -164,6 +168,7 @@ def __init__(
             os.register_at_fork(
                 after_in_child=self._at_fork_reinit
             )  # pylint: disable=protected-access
+        self._pid = os.getpid()
 
     def _at_fork_reinit(self):
         self._condition = threading.Condition(threading.Lock())
@@ -174,6 +179,7 @@ def _at_fork_reinit(self):
             daemon=True,
         )
         self._worker_thread.start()
+        self._pid = os.getpid()
 
     def worker(self):
         timeout = self._schedule_delay_millis / 1e3
@@ -293,6 +299,9 @@ def emit(self, log_data: LogData) -> None:
         """
         if self._shutdown:
             return
+        if self._pid != os.getpid():
+            _BSP_RESET_ONCE.do_once(self._at_fork_reinit)
+
         self._queue.appendleft(log_data)
         if len(self._queue) >= self._max_export_batch_size:
             with self._condition:

opentelemetry-sdk/src/opentelemetry/sdk/environment_variables.py

@@ -407,6 +407,20 @@
 LogEmitterProvider is used.
 """
 
+_OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED = (
+    "OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED"
+)
+"""
+.. envvar:: OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED
+
+The :envvar:`OTEL_PYTHON_LOGGING_AUTO_INSTRUMENTATION_ENABLED` environment variable allows users to
+enable/disabe the logging SDK auto instrumentation.
+Default: False
+
+Note: Logs SDK and its related settings are experimental.
+"""
+
+
 OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE = (
     "OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE"
 )

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

@@ -105,8 +105,8 @@ def __init__(
         self,
         out: IO = stdout,
         formatter: Callable[
-            ["opentelemetry.sdk.metrics.export.Metric"], str
-        ] = lambda metric: metric.to_json()
+            ["opentelemetry.sdk.metrics.export.MetricsData"], str
+        ] = lambda metrics_data: metrics_data.to_json()
         + linesep,
     ):
         self.out = out