Merge branch 'master' into prop

open-telemetry · Dec 8, 2020 · 3eae921 · 3eae921
2 parents 8b5aa36 + 9ff4321
commit 3eae921
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
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: b37945bdeaf49822b240281d493d053995cc2b7b
+  CONTRIB_REPO_SHA: master
 
 jobs:
   build:

diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/__init__.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/__init__.py
@@ -50,7 +50,7 @@
         "service.name": "service"
     })
 
-    trace.set_tracer_provider(TracerProvider(resource=resource)))
+    trace.set_tracer_provider(TracerProvider(resource=resource))
     tracer = trace.get_tracer(__name__)
 
     otlp_exporter = OTLPSpanExporter(endpoint="localhost:55680", insecure=True)

diff --git a/tox.ini b/tox.ini
@@ -139,7 +139,17 @@ deps =
   httpretty
 
 commands_pre =
-  python scripts/eachdist.py install --editable --with-test-deps
+  python -m pip install -e {toxinidir}/opentelemetry-api[test]
+  python -m pip install -e {toxinidir}/opentelemetry-sdk[test]
+  python -m pip install -e {toxinidir}/opentelemetry-instrumentation[test]
+  python -m pip install -e {toxinidir}/opentelemetry-proto[test]
+  python -m pip install -e {toxinidir}/tests/util[test]
+  python -m pip install -e {toxinidir}/instrumentation/opentelemetry-instrumentation-opentracing-shim[test]
+  python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-jaeger[test]
+  python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-opencensus[test]
+  python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-otlp[test]
+  python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-prometheus[test]
+  python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-zipkin[test]
 
 commands =
   python scripts/eachdist.py lint --check-only