Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ae7d46a

Browse files
author
Alex Boten
authored
Merge branch 'main' into codeboten/restore-prometheus
2 parents 0273486 + 6f8e9d3 commit ae7d46a

File tree

12 files changed

+61
-489
lines changed

12 files changed

+61
-489
lines changed

‎CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.9.1-0.28b1...HEAD)
99

10+
- Docs rework: [non-API docs are
11+
moving](https://github.com/open-telemetry/opentelemetry-python/issues/2172) to
12+
[opentelemetry.io](https://opentelemetry.io). For details, including a list of
13+
pages that have moved, see
14+
[#2453](https://github.com/open-telemetry/opentelemetry-python/pull/2453).
1015
- `opentelemetry-exporter-otlp-grpc` update SDK dependency to ~1.9.
1116
([#2442](https://github.com/open-telemetry/opentelemetry-python/pull/2442))
1217
- bugfix(auto-instrumentation): attach OTLPHandler to root logger

‎docs/api/api.rst renamed to ‎docs/api/index.rst

File renamed without changes.

‎docs/examples/fork-process-model/flask-uwsgi/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ opentelemetry-instrumentation==0.18b0
1212
opentelemetry-instrumentation-flask==0.18b1
1313
opentelemetry-instrumentation-wsgi==0.18b1
1414
opentelemetry-sdk==0.18b0
15-
protobuf==3.14.0
15+
protobuf==3.15.0
1616
six==1.15.0
1717
thrift==0.13.0
1818
uWSGI==2.0.19.1

‎docs/examples/index.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
:orphan:
2+
3+
Examples
4+
========
5+
6+
.. toctree::
7+
:maxdepth: 1
8+
:glob:
9+
10+
**

‎docs/exporter/index.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
:orphan:
2+
3+
Exporters
4+
=========
5+
6+
.. toctree::
7+
:maxdepth: 1
8+
:glob:
9+
10+
**

‎docs/faq-and-cookbook.rst

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)