Merge branch 'main' into issue_3172

Author: ocelotl

.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: 7fb0340445f5e0164bc59a3af1bf5836393013f4
+  CONTRIB_REPO_SHA: e4d8f10ecd7bcd29c119af0e3ea7c30d4a383f4b
   # 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

@@ -7,13 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+- Fix suppress instrumentation for log batch processor
+  ([#3223](https://github.com/open-telemetry/opentelemetry-python/pull/3223))
+
 ## Version 1.17.0/0.38b0 (2023-03-22)
 
 - Add experimental feature to detect resource detectors in auto instrumentation
   ([#3181](https://github.com/open-telemetry/opentelemetry-python/pull/3181))
 - Implement LowMemory temporality
   ([#3223](https://github.com/open-telemetry/opentelemetry-python/pull/3223))
-- PeriodicExportingMetricReader will continue if collection times out 
+- PeriodicExportingMetricReader will continue if collection times out
   ([#3100](https://github.com/open-telemetry/opentelemetry-python/pull/3100))
 - Fix formatting of ConsoleMetricExporter.
   ([#3197](https://github.com/open-telemetry/opentelemetry-python/pull/3197))

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

@@ -23,7 +23,12 @@
 from time import time_ns
 from typing import IO, Callable, Deque, List, Optional, Sequence
 
-from opentelemetry.context import attach, detach, set_value
+from opentelemetry.context import (
+    _SUPPRESS_INSTRUMENTATION_KEY,
+    attach,
+    detach,
+    set_value,
+)
 from opentelemetry.sdk._logs import LogData, LogRecord, LogRecordProcessor
 from opentelemetry.util._once import Once
 
@@ -105,7 +110,7 @@ def emit(self, log_data: LogData):
         if self._shutdown:
             _logger.warning("Processor is already shutdown, ignoring call")
             return
-        token = attach(set_value("suppress_instrumentation", True))
+        token = attach(set_value(_SUPPRESS_INSTRUMENTATION_KEY, True))
         try:
             self._exporter.export((log_data,))
         except Exception:  # pylint: disable=broad-except

tox.ini

@@ -8,7 +8,7 @@ envlist =
     py3{7,8,9,10,11}-opentelemetry-api
     pypy3-opentelemetry-api
 
-	  ; Test against both protobuf 3.x and 4.x
+    ; Test against both protobuf 3.x and 4.x
     py3{7,8,9,10,11}-proto{3,4}-opentelemetry-protobuf
     pypy3-proto{3,4}-opentelemetry-protobuf