Merge branch 'main' into ostream-doc-cleanup

open-telemetry · Oct 14, 2022 · ed5462c · ed5462c
2 parents 33e67e9 + 3ff2ed8
commit ed5462c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/docs/public/Doxyfile b/docs/public/Doxyfile
@@ -799,11 +799,13 @@ INPUT                  =  \
                          ../../api//include/opentelemetry/nostd/string_view.h \
                          ../../api/include/opentelemetry/nostd/unique_ptr.h \
                          ../../api/include/opentelemetry/nostd/variant.h \
+                         ../../api/include/opentelemetry/metrics \
                          ../../api/include/opentelemetry/trace \
                           ../../sdk/include/opentelemetry/sdk/instrumentationscope \
                           ../../sdk/include/opentelemetry/sdk/instrumentationlibrary \
                           ../../sdk/include/opentelemetry/sdk/resource \
-                          ../../sdk/include/opentelemetry/sdk/trace
+                          ../../sdk/include/opentelemetry/sdk/metrics \
+                          ../../sdk/include/opentelemetry/sdk/trace \
 
 
 # This tag can be used to specify the character encoding of the source files

diff --git a/docs/public/index.rst b/docs/public/index.rst
@@ -27,6 +27,7 @@ OpenTelemetry C++
    otel_docs/namespace_opentelemetry__baggage
    otel_docs/namespace_opentelemetry__common
    otel_docs/namespace_opentelemetry__context
+   otel_docs/namespace_opentelemetry__metrics
 
 .. toctree::
    :maxdepth: 1
@@ -35,6 +36,8 @@ OpenTelemetry C++
    otel_docs/namespace_opentelemetry__sdk__trace
    otel_docs/namespace_opentelemetry__sdk__instrumentationlibrary
    otel_docs/namespace_opentelemetry__sdk__resource
+   otel_docs/namespace_opentelemetry__sdk__metrics
+
 
 .. toctree::
     :maxdepth: 1