Merge branch 'main' into grpc

Author: srikanthccv

.flake8

@@ -1,9 +1,17 @@
 [flake8]
 ignore =
-  E501  # line too long, defer to black
-  W503  # allow line breaks before binary ops
-  W504  # allow line breaks after binary ops
-  E203  # allow whitespace before ':' (https://github.com/psf/black#slices) 
+  # line too long, defer to black
+  E501
+
+  # allow line breaks before binary ops
+  W503
+
+  # allow line breaks after binary ops
+  W504
+
+  # allow whitespace before ':' (https://github.com/psf/black#slices)
+  E203
+
 exclude =
   .bzr
   .git

CHANGELOG.md

@@ -7,10 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Add url decode values from OTEL_RESOURCE_ATTRIBUTES
+  ([#3046](https://github.com/open-telemetry/opentelemetry-python/pull/3046))
 - Fixed circular dependency issue with custom samplers
   ([#3026](https://github.com/open-telemetry/opentelemetry-python/pull/3026))
 - Add missing entry points for OTLP/HTTP exporter
   ([#3027](https://github.com/open-telemetry/opentelemetry-python/pull/3027))
+- Update logging to include logging api as per specification
+  ([#3038](https://github.com/open-telemetry/opentelemetry-python/pull/3038))
 - Fix: Avoid generator in metrics _ViewInstrumentMatch.collect()
   ([#3035](https://github.com/open-telemetry/opentelemetry-python/pull/3035)
 - [exporter-otlp-proto-grpc] add user agent string

docs/api/_logs.rst

@@ -0,0 +1,14 @@
+opentelemetry._logs package
+=============================
+
+Submodules
+----------
+
+.. toctree::
+
+   _logs.severity
+
+Module contents
+---------------
+
+.. automodule:: opentelemetry._logs

docs/api/_logs.severity.rst

@@ -0,0 +1,4 @@
+opentelemetry._logs.severity
+============================
+
+.. automodule:: opentelemetry._logs.severity

docs/api/index.rst

@@ -6,6 +6,7 @@ OpenTelemetry Python API
 .. toctree::
     :maxdepth: 1
 
+    _logs
     baggage
     context
     propagate

docs/sdk/_logs.rst

@@ -0,0 +1,7 @@
+opentelemetry.sdk._logs package
+===============================
+
+.. automodule:: opentelemetry.sdk._logs
+    :members:
+    :undoc-members:
+    :show-inheritance:

docs/sdk/index.rst

@@ -6,9 +6,9 @@ OpenTelemetry Python SDK
 .. toctree::
     :maxdepth: 1
 
+    _logs
     resources
     trace
     metrics
-    logs
     error_handler
     environment_variables