Skip to content
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.

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

Add readTheDocs #252

Merged
merged 7 commits into from
Jan 26, 2021
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
strategy:
fail-fast: false
matrix:
tox-environment: [ "docker-tests", "lint" ]
tox-environment: [ "docker-tests", "lint", "docs" ]
name: ${{ matrix.tox-environment }}
runs-on: ubuntu-latest
steps:
Expand Down
14 changes: 14 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
version: 2

sphinx:
configuration: docs/conf.py

build:
image: latest

python:
version: 3.9
install:
- requirements: docs-requirements.txt
35 changes: 35 additions & 0 deletions docs-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
sphinx~=2.4
sphinx-rtd-theme~=0.4
sphinx-autodoc-typehints~=1.10.2

# Need to install the api/sdk in the venv for autodoc. Modifying sys.path
# doesn't work for pkg_resources.
-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-api&subdirectory=opentelemetry-api"
-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-sdk&subdirectory=opentelemetry-sdk"

# Required by opentelemetry-instrumentation
fastapi~=0.58.1
psutil~=5.7.0
pymemcache~=1.3

-e "git+https://github.com/open-telemetry/opentelemetry-python.git#egg=opentelemetry-instrumentation&subdirectory=opentelemetry-instrumentation"

# Required by conf
django>=2.2

# Required by instrumentation packages
aiohttp~=3.0
aiopg>=0.13.0
asyncpg>=0.12.0
boto~=2.0
botocore~=1.0
celery>=4.0
flask~=1.0
grpcio~=1.27
mysql-connector-python~=8.0
pymongo~=3.1
PyMySQL~=0.9.3
pyramid>=1.7
redis>=2.6
sqlalchemy>=1.0
ddtrace>=0.34.0
19 changes: 19 additions & 0 deletions docs/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
SOURCEDIR = .
BUILDDIR = _build

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

.PHONY: help Makefile

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
179 changes: 179 additions & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
# Configuration file for the Sphinx documentation builder.
#
# This file only contains a selection of the most common options. For a full
# list see the documentation:
# http://www.sphinx-doc.org/en/master/config

# -- Path setup --------------------------------------------------------------

# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.

import os
import sys
from configparser import ConfigParser
from os import listdir
from os.path import isdir, join

# configure django to avoid the following exception:
# django.core.exceptions.ImproperlyConfigured: Requested settings, but settings
# are not configured. You must either define the environment variable
# DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings.
from django.conf import settings

settings.configure()

exp = "../exporter"
exp_dirs = [
os.path.abspath("/".join(["../exporter", f, "src"]))
NathanielRN marked this conversation as resolved.
Show resolved Hide resolved
for f in listdir(exp)
if isdir(join(exp, f))
]

instr = "../instrumentation"
instr_dirs = [
os.path.abspath("/".join(["../instrumentation", f, "src"]))
for f in listdir(instr)
if isdir(join(instr, f))
]

sdk_ext = "../sdk-extension"
sdk_ext_dirs = [
os.path.abspath("/".join(["../sdk-extension", f, "src"]))
for f in listdir(sdk_ext)
if isdir(join(sdk_ext, f))
]

sys.path[:0] = exp_dirs + instr_dirs + sdk_ext_dirs

# -- Project information -----------------------------------------------------

project = "OpenTelemetry Python Contrib"
copyright = "OpenTelemetry Authors" # pylint: disable=redefined-builtin
author = "OpenTelemetry Authors"


# -- General configuration ---------------------------------------------------

# Easy automatic cross-references for `code in backticks`
default_role = "any"

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
# API doc generation
"sphinx.ext.autodoc",
# Support for google-style docstrings
"sphinx.ext.napoleon",
# Infer types from hints instead of docstrings
"sphinx_autodoc_typehints",
# Add links to source from generated docs
"sphinx.ext.viewcode",
# Link to other sphinx docs
"sphinx.ext.intersphinx",
# Add a .nojekyll file to the generated HTML docs
# https://help.github.com/en/articles/files-that-start-with-an-underscore-are-missing
"sphinx.ext.githubpages",
# Support external links to different versions in the Github repo
"sphinx.ext.extlinks",
]

intersphinx_mapping = {
"python": ("https://docs.python.org/3/", None),
"opentracing": (
"https://opentracing-python.readthedocs.io/en/latest/",
None,
),
"aiohttp": ("https://aiohttp.readthedocs.io/en/stable/", None),
"wrapt": ("https://wrapt.readthedocs.io/en/latest/", None),
"pymongo": ("https://pymongo.readthedocs.io/en/stable/", None),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have an OTel exporter in this repo that the doc build works correctly https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/blob/c3772de4cf50950f1d51685ff3bbf0e46ee026df/docs/conf.py#L50-L56

Suggested change
"pymongo": ("https://pymongo.readthedocs.io/en/stable/", None),
"pymongo": ("https://pymongo.readthedocs.io/en/stable/", None),
"opentelemetry": (
"https://opentelemetry-python.readthedocs.io/en/latest/",
None,
),

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So adding this intersphinx-mapping almost completely solved the problem! However there's still a few items that need to be ignore by the nitpick...

In nitpick-exceptions.ini I still have to silence the errors from these:

[default]
class_references=
    ; TODO: Understand why sphinx is not able to find this local class
    opentelemetry.trace.propagation.textmap.TextMapPropagator
    ; - AwsXRayFormat
    opentelemetry.trace.propagation.textmap.DictGetter
    ; - instrumentation.asgi.CarrierGetter
    ; API
    opentelemetry.trace.propagation.textmap.Getter
    ; - DatadogFormat
    ; - AWSXRayFormat
    TextMapPropagatorT
    ; - AwsXRayFormat.extract

anys=
    ; API
    opentelemetry.trace.propagation.textmap.TextMapPropagator.fields
    ; - AWSXRayFormat
    TraceId
    ; - AwsXRayIdsGenerator
    TraceIdRatioBased
    ; - AwsXRayIdsGenerator
    ; SDK
    SpanProcessor
    ; - DatadogExportSpanProcessor
    TracerProvider
    ; - AwsXRayIdsGenerator
    ; Instrumentation
    BaseInstrumentor
    ; - instrumentation.*

I added comments showing where the errors come from. This makes me wonder if I did the doc string for AWS components here wrong? Is there a certain way that I need to follow for the backticks `` when writing doc strings?

Something that would make the following doc string break such that I needed the nitpick-exceptions above?

AWS X-Ray IDs Generator
-----------------------
The **AWS X-Ray IDs Generator** provides a custom IDs Generator to make
traces generated using the OpenTelemetry SDKs `TracerProvider` compatible
with the AWS X-Ray backend service `trace ID format`_.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont think the docstring should matter. Automodule should generate entries regardless of docstring, as long as you have the .. automodule:: opentelemetry....

Do you see the AWS docs built locally?

"opentelemetry": (
"https://opentelemetry-python.readthedocs.io/en/latest/",
None,
),
}

# http://www.sphinx-doc.org/en/master/config.html#confval-nitpicky
# Sphinx will warn about all references where the target cannot be found.
nitpicky = True
# Sphinx does not recognize generic type TypeVars
# Container supposedly were fixed, but does not work
# https://github.com/sphinx-doc/sphinx/pull/3744
nitpick_ignore = []

cfg = ConfigParser()
cfg.read("./nitpick-exceptions.ini")
mcfg = cfg["default"]


def getlistcfg(strval):
return [
val.strip()
for line in strval.split("\n")
for val in line.split(",")
if val.strip()
]


if "class_references" in mcfg:
class_references = getlistcfg(mcfg["class_references"])
for class_reference in class_references:
nitpick_ignore.append(("py:class", class_reference,))

if "anys" in mcfg:
anys = getlistcfg(mcfg["anys"])
for any in anys:
nitpick_ignore.append(("any", any,))
Comment on lines +120 to +128
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just want to highlight this as my implementation of the solution described in the Stack Overflow post as mentioned in the PR description.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this break the ref links? For example in the current stable django documentation https://opentelemetry-python.readthedocs.io/en/stable/instrumentation/django/django.html If you click on Bases: [opentelemetry.instrumentation.instrumentor.BaseInstrumentor] or See [BaseInstrumentor] They both take you BaseInstrumentor documentation. If I understand it correctly as these instrumentation libraries are moved out of main repo it can't find such references anymore and giving error. They are now cross-referencing targets from main repo docs.

will intersphinx_mapping along with updating `BaseInstrumentor` occurrences with `opentelemetry.instrumentation.instrumentor.BaseInstrumentor` be helpful?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I believe you are correct that all the references in this nitpick-exceptions.ini file will produce links that are broken. It's because these components are Core code components and Contrib doesn't know where to link the reference to.

The intersphinx_mapping solution sounds interesting! However it's not something I've explored 😓 although we can create a follow up to fix these links? If we want to keep this PR small we can merge it like this, and then we can create an issue to investigate that mapping solution to link to the Core docs?

The main benefit this PR does is that at least we can have auto documentation on the packages even though the links to the Core components are broken.

Also, the docs will break if the SDK components break/change. But as I mentioned in the PR description, maybe that shouldn't be the job of the Docs, maybe that should be the job of the unit tests?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can create an issue to investigate that mapping solution to link to the Core docs?

This would be ideal. I just checked, all the references in this nitpick-exceptions.ini will not produce the broken links rather it is just a plain text instead of linked documentation. The intersphinx_mapping should really help us here for example pymongo instrumentation documentation has an link to official pymongo driver documentation here

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Think you should be able to remove all of this with the intersphinx mapping?


# Add any paths that contain templates here, relative to this directory.
templates_path = ["_templates"]

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
# This pattern also affects html_static_path and html_extra_path.
exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]

autodoc_default_options = {
"members": True,
"undoc-members": True,
"show-inheritance": True,
"member-order": "bysource",
}

# -- Options for HTML output -------------------------------------------------

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = "sphinx_rtd_theme"

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = []

# Support external links to specific versions of the files in the Github repo
branch = os.environ.get("READTHEDOCS_VERSION")
if branch is None or branch == "latest":
branch = "master"

REPO = "open-telemetry/opentelemetry-python-contrib/"
scm_raw_web = "https://raw.githubusercontent.com/" + REPO + branch
scm_web = "https://github.com/" + REPO + "blob/" + branch

# Store variables in the epilogue so they are globally available.
rst_epilog = """
.. |SCM_WEB| replace:: {s}
.. |SCM_RAW_WEB| replace:: {sr}
.. |SCM_BRANCH| replace:: {b}
""".format(
s=scm_web, sr=scm_raw_web, b=branch
)

# used to have links to repo files
extlinks = {
"scm_raw_web": (scm_raw_web + "/%s", "scm_raw_web"),
"scm_web": (scm_web + "/%s", "scm_web"),
}
7 changes: 7 additions & 0 deletions docs/exporter/datadog/datadog.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OpenTelemetry Datadog Exporter
==============================

.. automodule:: opentelemetry.exporter.datadog
:members:
:undoc-members:
:show-inheritance:
93 changes: 93 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
OpenTelemetry-Python-Contrib
============================

Complimentary instrumentation and vendor-specific packages for use with the
Python `OpenTelemetry <https://opentelemetry.io/>`_ client.

.. image:: https://img.shields.io/gitter/room/opentelemetry/opentelemetry-python
:target: https://gitter.im/open-telemetry/opentelemetry-python
:alt: Gitter Chat


**Please note** that this library is currently in _beta_, and shouldn't
generally be used in production environments.

Installation
------------

There are several complimentary packages available on PyPI which can be
installed separately via pip:

.. code-block:: sh

pip install opentelemetry-exporter-{exporter}
pip install opentelemetry-instrumentation-{instrumentation}
pip install opentelemetry-sdk-extension-{sdkextension}

A complete list of packages can be found at the
`Contrib repo instrumentation <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/instrumentation>`_
and `Contrib repo exporter <https://github.com/open-telemetry/opentelemetry-python-contrib/tree/master/exporter>`_ directories.

Extensions
----------

Visit `OpenTelemetry Registry <https://opentelemetry.io/registry/?s=python>`_ to
find a lit of related projects like exporters, instrumentation libraries, tracer
implementations, etc.

Installing Cutting Edge Packages
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

While the project is pre-1.0, there may be significant functionality that
has not yet been released to PyPI. In that situation, you may want to
install the packages directly from the repo. This can be done by cloning the
repository and doing an `editable
install <https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs>`_:

.. code-block:: sh

git clone https://github.com/open-telemetry/opentelemetry-python-contrib.git
cd opentelemetry-python-contrib
pip install -e ./instrumentation/opentelemetry-instrumentation-flask
pip install -e ./instrumentation/opentelemetry-instrumentation-botocore
pip install -e ./sdk-extension/opentelemetry-sdk-extension-aws


.. toctree::
:maxdepth: 2
:caption: OpenTelemetry Exporters
:name: exporters
:glob:

exporter/**

.. toctree::
:maxdepth: 2
:caption: OpenTelemetry Instrumentations
:name: Instrumentations
:glob:

instrumentation/**

.. toctree::
:maxdepth: 2
:caption: OpenTelemetry Performance
:name: Performance
:glob:

performance/**

.. toctree::
:maxdepth: 2
:caption: OpenTelemetry SDK Extensions
:name: SDK Extensions
:glob:

sdk-extension/**

Indices and tables
------------------

* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`
7 changes: 7 additions & 0 deletions docs/instrumentation/aiohttp_client/aiohttp_client.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OpenTelemetry aiohttp client Instrumentation
============================================

.. automodule:: opentelemetry.instrumentation.aiohttp_client
:members:
:undoc-members:
:show-inheritance:
7 changes: 7 additions & 0 deletions docs/instrumentation/aiopg/aiopg.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
OpenTelemetry aiopg Instrumentation
===================================

.. automodule:: opentelemetry.instrumentation.aiopg
:members:
:undoc-members:
:show-inheritance:
9 changes: 9 additions & 0 deletions docs/instrumentation/asgi/asgi.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.. include:: ../../../instrumentation/opentelemetry-instrumentation-asgi/README.rst

API
---

.. automodule:: opentelemetry.instrumentation.asgi
:members:
:undoc-members:
:show-inheritance:
10 changes: 10 additions & 0 deletions docs/instrumentation/asyncpg/asyncpg.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Opentelemetry asyncpg Instrumentation
codeboten marked this conversation as resolved.
Show resolved Hide resolved
=====================================

Module contents
---------------

.. automodule:: opentelemetry.instrumentation.asyncpg
:members:
:undoc-members:
:show-inheritance:
Loading