Skip to content

Commit 24edd3d

Browse files
authored
Remove metrics from main branch (open-telemetry#1568)
1 parent 59fc285 commit 24edd3d

File tree

95 files changed

+34
-7158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+34
-7158
lines changed

Diff for: .github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
# Otherwise, set variable to the commit of your branch on
1111
# opentelemetry-python-contrib which is compatible with these Core repo
1212
# changes.
13-
CONTRIB_REPO_SHA: b404de2f393aaaeca73694c37fe58fecf423a707
13+
CONTRIB_REPO_SHA: 43df76e5ed69f45d993c98ea68daea3c4622ea2d
1414

1515
jobs:
1616
build:

Diff for: CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2323
### Removed
2424
- Remove Configuration
2525
([#1523](https://github.com/open-telemetry/opentelemetry-python/pull/1523))
26+
- Remove Metrics as part of stable, marked as experimental
27+
([#1568](https://github.com/open-telemetry/opentelemetry-python/pull/1568))
2628

2729
## [0.17b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v0.17b0) - 2021-01-20
2830

Diff for: CONTRIBUTING.md

+4
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ Please take a look at this list first, your contributions may belong in one of t
2323
programmatic instrumentations that are now in the `ext` directory in the main OpenTelemetry repo. Please ask in the Gitter
2424
channel (see below) for guidance if you want to contribute with these instrumentations.
2525

26+
# Find the right branch
27+
28+
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.
29+
2630
## Find a Buddy and get Started Quickly!
2731

2832
If you are looking for someone to help you find a starting point and be a resource for your first contribution, join our

Diff for: docs/api/api.rst

-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,5 @@ OpenTelemetry Python API
88

99
baggage
1010
context
11-
metrics
1211
trace
1312
environment_variables

Diff for: docs/api/metrics.rst

-7
This file was deleted.

Diff for: docs/examples/auto-instrumentation/README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ and run the following command instead:
151151

152152
.. code:: sh
153153
154-
$ opentelemetry-instrument -e console_span,console_metrics python server_uninstrumented.py
154+
$ opentelemetry-instrument -e console_span python server_uninstrumented.py
155155
156156
In the console where you previously executed ``client.py``, run the following
157157
command again:

Diff for: docs/examples/basic_meter/README.rst

-42
This file was deleted.

Diff for: docs/examples/basic_meter/basic_metrics.py

-87
This file was deleted.

Diff for: docs/examples/basic_meter/calling_conventions.py

-66
This file was deleted.

Diff for: docs/examples/basic_meter/http_metrics.py

-42
This file was deleted.

Diff for: docs/examples/basic_meter/observer.py

-60
This file was deleted.

0 commit comments

Comments
 (0)