Patch logging earlier for ddtrace-run (#832)

majorgreys · brettlangdon · commit 70b40456ea6d · 2019-02-21T08:30:52.000-05:00
* Patch logging earlier for ddtrace-run

* Use patch rather than patch_all

* Update ddtrace/bootstrap/sitecustomize.py

Co-Authored-By: majorgreys &lt;tahir@tahirbutt.com&gt;
diff --git a/ddtrace/bootstrap/sitecustomize.py b/ddtrace/bootstrap/sitecustomize.py
@@ -15,6 +15,10 @@
     '[dd.trace_id=%(dd.trace_id)s dd.span_id=%(dd.span_id)s] ' if logs_injection else ''
 )
 
+if logs_injection:
+    # immediately patch logging if trace id injected
+    from ddtrace import patch; patch(logging=True)  # noqa
+
 debug = os.environ.get("DATADOG_TRACE_DEBUG")
 
 # Set here a default logging format for basicConfig

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,10 @@`
`15`	`15`	`'[dd.trace_id=%(dd.trace_id)s dd.span_id=%(dd.span_id)s] ' if logs_injection else ''`
`16`	`16`	`)`
`17`	`17`
	`18`	`+if logs_injection:`
	`19`	`+ # immediately patch logging if trace id injected`
	`20`	`+ from ddtrace import patch; patch(logging=True) # noqa`
	`21`	`+`
`18`	`22`	`debug = os.environ.get("DATADOG_TRACE_DEBUG")`
`19`	`23`
`20`	`24`	`# Set here a default logging format for basicConfig`