Merge branch 'main' into fix-shim-docstring-example

Author: xrmx

eachdist.ini

@@ -35,6 +35,7 @@ packages=
     opentelemetry-exporter-opencensus
     opentelemetry-exporter-prometheus
     opentelemetry-distro
+    opentelemetry-proto-json
     opentelemetry-semantic-conventions
     opentelemetry-test-utils
     tests