Merge branch 'master' into grpc_metrics_tests

open-telemetry · Jul 20, 2020 · d8d2b10 · d8d2b10
2 parents b3ea500 + 23e577e
commit d8d2b10
Show file tree

Hide file tree

Showing 29 changed files with 25 additions and 2,763 deletions.
diff --git a/docs-requirements.txt b/docs-requirements.txt
@@ -25,8 +25,8 @@ wrapt>=1.0.0,<2.0.0
 celery>=4.0
 psutil~=5.7.0
 boto~=2.0
-google-cloud-trace >=0.23.0
-google-cloud-monitoring>=0.36.0
 botocore~=1.0
 starlette~=0.13
-fastapi~=0.58.1
+fastapi~=0.58.1
+opentelemetry-exporter-cloud-trace==0.10b0
+opentelemetry-exporter-cloud-monitoring==0.10b0
diff --git a/ext/opentelemetry-exporter-cloud-monitoring/CHANGELOG.md b/ext/opentelemetry-exporter-cloud-monitoring/CHANGELOG.md
diff --git a/ext/opentelemetry-exporter-cloud-monitoring/LICENSE b/ext/opentelemetry-exporter-cloud-monitoring/LICENSE
diff --git a/ext/opentelemetry-exporter-cloud-monitoring/MANIFEST.in b/ext/opentelemetry-exporter-cloud-monitoring/MANIFEST.in
diff --git a/ext/opentelemetry-exporter-cloud-monitoring/README.rst b/ext/opentelemetry-exporter-cloud-monitoring/README.rst
diff --git a/ext/opentelemetry-exporter-cloud-monitoring/setup.cfg b/ext/opentelemetry-exporter-cloud-monitoring/setup.cfg
diff --git a/ext/opentelemetry-exporter-cloud-monitoring/setup.py b/ext/opentelemetry-exporter-cloud-monitoring/setup.py