Merge branch 'master' into mergetypeanddata

open-telemetry · Aug 20, 2020 · 7c6cb32 · 7c6cb32
2 parents 4439b45 + dc4324a
commit 7c6cb32
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -8,15 +8,18 @@ See [contribution guidelines](CONTRIBUTING.md) if you would like to make any cha
 
 ## Maturity Level
 
-Component                | Maturity |
--------------------------|----------|
-collector/metrics/*      | Alpha    |
-collector/trace/*        | Stable   |
-common/*                 | Stable   |
-metrics/*                | Alpha    |
-resource/*               | Stable   |
-trace/trace.proto        | Stable   |
-trace/trace_config.proto | Alpha    |
+Component                            | Maturity |
+-------------------------------------|----------|
+**Binary Protobuf Encoding**         |          |
+collector/metrics/*                  | Alpha    |
+collector/trace/*                    | Stable   |
+common/*                             | Stable   |
+metrics/*                            | Alpha    |
+resource/*                           | Stable   |
+trace/trace.proto                    | Stable   |
+trace/trace_config.proto             | Alpha    |
+**JSON encoding**                    |          |
+All messages                         | Alpha    |
 
 (See [maturity-matrix.yaml](https://github.com/open-telemetry/community/blob/47813530864b9fe5a5146f466a58bd2bb94edc72/maturity-matrix.yaml#L57)
 for definition of maturity levels).