Merge branch 'main' of github.com:open-telemetry/opentelemetry-python…

…-contrib into fix/rich-console
open-telemetry · Oct 7, 2022 · 3a4084a · 3a4084a
2 parents a518e10 + a47c45e
commit 3a4084a
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 1,818 deletions.
diff --git a/.pylintrc b/.pylintrc
@@ -12,7 +12,7 @@ ignore=CVS,gen,Dockerfile,docker-compose.yml,README.md,requirements.txt,docs
 # Add files or directories matching the regex patterns to be excluded. The
 # regex matches against base names, not paths.
 ignore-patterns=
-ignore-paths=exporter/opentelemetry-exporter-datadog/.*$
+ignore-paths=
 
 # Python code to execute, usually for sys.path manipulation such as
 # pygtk.require().

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- `opentelemetry-instrumentation-django` Fixed bug where auto-instrumentation fails when django is installed and settings are not configured.
+  ([#1369](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1369))
 - `opentelemetry-instrumentation-system-metrics` add supports to collect system thread count. ([#1339](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1339))
 
 ## [1.13.0-0.34b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.13.0-0.34b0) - 2022-09-26

diff --git a/docs/exporter/datadog/datadog.rst b/docs/exporter/datadog/datadog.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -53,14 +53,6 @@ install <https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs>
     pip install -e ./sdk-extension/opentelemetry-sdk-extension-aws
 
 
-.. toctree::
-    :maxdepth: 2
-    :caption: OpenTelemetry Exporters
-    :name: exporters
-    :glob:
-
-    exporter/**
-
 .. toctree::
     :maxdepth: 2
     :caption: OpenTelemetry Instrumentations

diff --git a/docs/nitpick-exceptions.ini b/docs/nitpick-exceptions.ini
@@ -9,7 +9,6 @@ class_references=
     opentelemetry.propagators.textmap.DefaultGetter
     ; API
     opentelemetry.propagators.textmap.Getter
-    ; - DatadogFormat
     ; - AWSXRayPropagator
     opentelemetry.sdk.trace.id_generator.IdGenerator
     ; - AwsXRayIdGenerator
@@ -38,7 +37,6 @@ anys=
     ; - AwsXRayIdGenerator
     ; SDK
     SpanProcessor
-    ; - DatadogExportSpanProcessor
     TracerProvider
     ; - AwsXRayIdGenerator
     ; Instrumentation

diff --git a/eachdist.ini b/eachdist.ini
@@ -46,7 +46,6 @@ packages=
 
 [exclude_release]
 packages=
-    opentelemetry-exporter-datadog
     opentelemetry-sdk-extension-aws
     opentelemetry-propagator-aws-xray
 

diff --git a/exporter/opentelemetry-exporter-datadog/README.rst b/exporter/opentelemetry-exporter-datadog/README.rst
diff --git a/exporter/opentelemetry-exporter-datadog/pyproject.toml b/exporter/opentelemetry-exporter-datadog/pyproject.toml
diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/__init__.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/__init__.py
diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/constants.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/constants.py