From c82829283d3e99aa2e089d1774ee509619650617 Mon Sep 17 00:00:00 2001 From: Carol Abadeer Date: Wed, 1 Jun 2022 23:09:47 -0700 Subject: [PATCH 1/4] Create Suppress HTTP Instrumentation key in opentelemetry context --- opentelemetry-api/src/opentelemetry/context/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/opentelemetry-api/src/opentelemetry/context/__init__.py b/opentelemetry-api/src/opentelemetry/context/__init__.py index 7f56cdb216b..8f456b61888 100644 --- a/opentelemetry-api/src/opentelemetry/context/__init__.py +++ b/opentelemetry-api/src/opentelemetry/context/__init__.py @@ -163,3 +163,4 @@ def detach(token: object) -> None: # Once the decision around how to suppress instrumentation is made in the # spec, this key should be moved accordingly. _SUPPRESS_INSTRUMENTATION_KEY = create_key("suppress_instrumentation") +_SUPPRESS_HTTP_INSTRUMENTATION_KEY = create_key("suppress_http_instrumentation") \ No newline at end of file From e8c8820effb97aae430ed8c0c74a6193242df73b Mon Sep 17 00:00:00 2001 From: Carol Abadeer Date: Tue, 7 Jun 2022 16:37:26 -0700 Subject: [PATCH 2/4] Updated changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbedb9a39f9..a1e55acb7fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ 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)) +- fix: create suppress HTTP instrumentation key in opentelemetry context + ([#2729](https://github.com/open-telemetry/opentelemetry-python/pull/2729)) ## [1.12.0rc1-0.31b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0rc1-0.31b0) - 2022-05-17 From f58d71c34c314e260d368d5025b2d2652d68824e Mon Sep 17 00:00:00 2001 From: Carol Abadeer Date: Tue, 14 Jun 2022 12:16:08 -0700 Subject: [PATCH 3/4] add newline --- opentelemetry-api/src/opentelemetry/context/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opentelemetry-api/src/opentelemetry/context/__init__.py b/opentelemetry-api/src/opentelemetry/context/__init__.py index 8f456b61888..a1e282f3901 100644 --- a/opentelemetry-api/src/opentelemetry/context/__init__.py +++ b/opentelemetry-api/src/opentelemetry/context/__init__.py @@ -163,4 +163,4 @@ def detach(token: object) -> None: # Once the decision around how to suppress instrumentation is made in the # spec, this key should be moved accordingly. _SUPPRESS_INSTRUMENTATION_KEY = create_key("suppress_instrumentation") -_SUPPRESS_HTTP_INSTRUMENTATION_KEY = create_key("suppress_http_instrumentation") \ No newline at end of file +_SUPPRESS_HTTP_INSTRUMENTATION_KEY = create_key("suppress_http_instrumentation") From 2cefaecf11c303c4614255c5b7ee6c02b0761ec5 Mon Sep 17 00:00:00 2001 From: Carol Abadeer Date: Thu, 16 Jun 2022 12:23:09 -0700 Subject: [PATCH 4/4] fix formatting with black --- opentelemetry-api/src/opentelemetry/context/__init__.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/opentelemetry-api/src/opentelemetry/context/__init__.py b/opentelemetry-api/src/opentelemetry/context/__init__.py index a1e282f3901..388dc0fba9b 100644 --- a/opentelemetry-api/src/opentelemetry/context/__init__.py +++ b/opentelemetry-api/src/opentelemetry/context/__init__.py @@ -163,4 +163,6 @@ def detach(token: object) -> None: # Once the decision around how to suppress instrumentation is made in the # spec, this key should be moved accordingly. _SUPPRESS_INSTRUMENTATION_KEY = create_key("suppress_instrumentation") -_SUPPRESS_HTTP_INSTRUMENTATION_KEY = create_key("suppress_http_instrumentation") +_SUPPRESS_HTTP_INSTRUMENTATION_KEY = create_key( + "suppress_http_instrumentation" +)