Remove metrics from main branch (#1568)

open-telemetry · Feb 8, 2021 · 24edd3d · 24edd3d
1 parent 59fc285
commit 24edd3d
Show file tree

Hide file tree

Showing 95 changed files with 34 additions and 7,158 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: b404de2f393aaaeca73694c37fe58fecf423a707
+  CONTRIB_REPO_SHA: 43df76e5ed69f45d993c98ea68daea3c4622ea2d
 
 jobs:
   build:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 - Remove Configuration
   ([#1523](https://github.com/open-telemetry/opentelemetry-python/pull/1523))
+- Remove Metrics as part of stable, marked as experimental
+  ([#1568](https://github.com/open-telemetry/opentelemetry-python/pull/1568))
 
 ## [0.17b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v0.17b0) - 2021-01-20
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -23,6 +23,10 @@ Please take a look at this list first, your contributions may belong in one of t
    programmatic instrumentations that are now in the `ext` directory in the main OpenTelemetry repo. Please ask in the Gitter
    channel (see below) for guidance if you want to contribute with these instrumentations.
 
+# Find the right branch
+
+The default branch for this repo is `main`. Changes that pertain to components marked as `stable` in the [specifications](https://github.com/open-telemetry/opentelemetry-specification) go into this branch, which currently does not include `metrics`. Changes that pertain to `metrics` go into the `metrics` branch.
+
 ## Find a Buddy and get Started Quickly!
 
 If you are looking for someone to help you find a starting point and be a resource for your first contribution, join our

diff --git a/docs/api/api.rst b/docs/api/api.rst
@@ -8,6 +8,5 @@ OpenTelemetry Python API
 
     baggage
     context
-    metrics
     trace
     environment_variables
diff --git a/docs/api/metrics.rst b/docs/api/metrics.rst
diff --git a/docs/examples/auto-instrumentation/README.rst b/docs/examples/auto-instrumentation/README.rst
@@ -151,7 +151,7 @@ and run the following command instead:
 
 .. code:: sh
 
-    $ opentelemetry-instrument -e console_span,console_metrics python server_uninstrumented.py
+    $ opentelemetry-instrument -e console_span python server_uninstrumented.py
 
 In the console where you previously executed ``client.py``, run the following
 command again:

diff --git a/docs/examples/basic_meter/README.rst b/docs/examples/basic_meter/README.rst
diff --git a/docs/examples/basic_meter/basic_metrics.py b/docs/examples/basic_meter/basic_metrics.py
diff --git a/docs/examples/basic_meter/calling_conventions.py b/docs/examples/basic_meter/calling_conventions.py
diff --git a/docs/examples/basic_meter/http_metrics.py b/docs/examples/basic_meter/http_metrics.py
diff --git a/docs/examples/basic_meter/observer.py b/docs/examples/basic_meter/observer.py