Skip to content

Move example app to the examples folder #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 25, 2019
Merged

Move example app to the examples folder #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
691a4b8
move example app to the examples folder
reyang Sep 25, 2019
19e817b
update the example link in README
reyang Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ with tracer.start_span('foo'):
See the [API
documentation](https://open-telemetry.github.io/opentelemetry-python/) for more
detail, and the
[opentelemetry-example-app](./opentelemetry-example-app/README.rst) for a
complete example.
[opentelemetry-example-app](./examples/opentelemetry-example-app/README.rst)
for a complete example.

## Contributing

Expand Down
0 opentelemetry-example-app/README.rst → ...ples/opentelemetry-example-app/README.rst
View file
Open in desktop
File renamed without changes.
0 opentelemetry-example-app/setup.py → examples/opentelemetry-example-app/setup.py
View file
Open in desktop
File renamed without changes.
0 ...src/opentelemetry_example_app/__init__.py → ...src/opentelemetry_example_app/__init__.py
View file
Open in desktop
File renamed without changes.
0 ...pentelemetry_example_app/flask_example.py → ...pentelemetry_example_app/flask_example.py
View file
Open in desktop
File renamed without changes.
0 opentelemetry-example-app/tests/__init__.py → ...entelemetry-example-app/tests/__init__.py
View file
Open in desktop
File renamed without changes.
0 ...y-example-app/tests/test_flask_example.py → ...y-example-app/tests/test_flask_example.py
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ setenv =
changedir =
test-api: opentelemetry-api/tests
test-sdk: opentelemetry-sdk/tests
test-example-app: opentelemetry-example-app/tests
test-ext-wsgi: ext/opentelemetry-ext-wsgi/tests
test-ext-http-requests: ext/opentelemetry-ext-http-requests/tests
test-ext-wsgi: ext/opentelemetry-ext-wsgi/tests
test-example-app: examples/opentelemetry-example-app/tests

commands_pre =
; Install without -e to test the actual installation
python -m pip install -U pip setuptools wheel
test: pip install {toxinidir}/opentelemetry-api
test-sdk: pip install {toxinidir}/opentelemetry-sdk
example-app: pip install {toxinidir}/opentelemetry-sdk
example-app: pip install {toxinidir}/ext/opentelemetry-ext-wsgi
example-app: pip install {toxinidir}/ext/opentelemetry-ext-http-requests
example-app: pip install {toxinidir}/opentelemetry-example-app
example-app: pip install {toxinidir}/ext/opentelemetry-ext-wsgi
example-app: pip install {toxinidir}/examples/opentelemetry-example-app
ext: pip install {toxinidir}/opentelemetry-api
wsgi: pip install {toxinidir}/ext/opentelemetry-ext-wsgi
http-requests: pip install {toxinidir}/ext/opentelemetry-ext-http-requests
Expand Down Expand Up @@ -67,9 +67,9 @@ commands_pre =
pip install -e {toxinidir}/opentelemetry-api
pip install -e {toxinidir}/opentelemetry-sdk
pip install -e {toxinidir}/ext/opentelemetry-ext-azure-monitor
pip install -e {toxinidir}/ext/opentelemetry-ext-wsgi
pip install -e {toxinidir}/ext/opentelemetry-ext-http-requests
pip install -e {toxinidir}/opentelemetry-example-app
pip install -e {toxinidir}/ext/opentelemetry-ext-wsgi
pip install -e {toxinidir}/examples/opentelemetry-example-app

commands =
; Prefer putting everything in one pylint command to profit from duplication
Expand All @@ -85,8 +85,8 @@ commands =
ext/opentelemetry-ext-http-requests/src/ \
ext/opentelemetry-ext-http-requests/tests/ \
ext/opentelemetry-ext-wsgi/tests/ \
opentelemetry-example-app/src/opentelemetry_example_app/ \
opentelemetry-example-app/tests/
examples/opentelemetry-example-app/src/opentelemetry_example_app/ \
examples/opentelemetry-example-app/tests/
flake8 .
isort --check-only --diff --recursive .

Expand Down