Fix missing wsgi dependency (open-telemetry#1578)

alrex · web-flow · commit 9c81fdf34fb4 · 2021-02-05T08:44:41.000-08:00
diff --git a/.github/workflows/test.yml b/.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: f005d90ed3bc75ee6eb7297f9e3a6b55a55b22aa
+  CONTRIB_REPO_SHA: b404de2f393aaaeca73694c37fe58fecf423a707
 
 jobs:
   build:
diff --git a/docs/examples/auto-instrumentation/server_instrumented.py b/docs/examples/auto-instrumentation/server_instrumented.py
@@ -15,13 +15,13 @@
 from flask import Flask, request
 
 from opentelemetry import propagators, trace
+from opentelemetry.instrumentation.wsgi import collect_request_attributes
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
     ConsoleSpanExporter,
     SimpleExportSpanProcessor,
 )
 from opentelemetry.trace.propagation.textmap import DictGetter
-from opentelemetry.util.http.wsgi import collect_request_attributes
 
 app = Flask(__name__)
 
diff --git a/tests/w3c_tracecontext_validation_server.py b/tests/w3c_tracecontext_validation_server.py
@@ -25,12 +25,12 @@
 
 from opentelemetry import trace
 from opentelemetry.instrumentation.requests import RequestsInstrumentor
+from opentelemetry.instrumentation.wsgi import OpenTelemetryMiddleware
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import (
     ConsoleSpanExporter,
     SimpleExportSpanProcessor,
 )
-from opentelemetry.util.http.wsgi import OpenTelemetryMiddleware
 
 # FIXME This could likely be avoided by integrating this script into the
 # standard test running mechanisms.
diff --git a/tox.ini b/tox.ini
@@ -105,7 +105,7 @@ commands_pre =
   distro: pip install {toxinidir}/opentelemetry-distro {toxinidir}/opentelemetry-distro
   instrumentation: pip install {toxinidir}/opentelemetry-instrumentation
 
-  getting-started: pip install -e {toxinidir}/opentelemetry-instrumentation -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-requests {toxinidir}/opentelemetry-python-contrib/util/opentelemetry-util-http -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-flask
+  getting-started: pip install -e {toxinidir}/opentelemetry-instrumentation -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-requests {toxinidir}/opentelemetry-python-contrib/util/opentelemetry-util-http -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-wsgi -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-flask
 
   opencensus: pip install {toxinidir}/exporter/opentelemetry-exporter-opencensus
 
@@ -202,6 +202,7 @@ commands_pre =
               -e {toxinidir}/opentelemetry-instrumentation \
               -e {toxinidir}/opentelemetry-sdk \
               -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-requests \
+              -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-wsgi \
               -e {toxinidir}/opentelemetry-python-contrib/util/opentelemetry-util-http
 
 commands =
