Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…

…y-configuration into generate-descriptions
open-telemetry · Sep 19, 2024 · fc10dae · fc10dae
2 parents 0bede24 + e21ffdb
commit fc10dae
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/examples/kitchen-sink.yaml b/examples/kitchen-sink.yaml
@@ -97,7 +97,7 @@ meter_provider:
               # Configure resource attributes to be included.
               included:
                 - "service*"
-              # Configure resource attributes to be excluded.
+              # Configure resource attributes to be excluded, in this example attribute service.attr1. Applies after .with_resource_constant_labels.included (i.e. excluded has higher priority than included).
               excluded:
                 - "service.attr1"
       # Configure metric producers.
@@ -205,6 +205,9 @@ meter_provider:
           included:
             - key1
             - key2
+          # Configure list of attribute keys that are excluded in the resulting stream(s), in this example attribute key3. Applies after .attribute_keys.included (i.e. excluded has higher priority than included).
+          excluded:
+            - key3
 
 # Configure text map context propagators.
 propagator:

diff --git a/schema/common.json b/schema/common.json
@@ -22,18 +22,6 @@
                 }
             }
         },
-        "Include": {
-            "type": "object",
-            "additionalProperties": false,
-            "properties": {
-                "included": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                }
-            }
-        },
         "NameStringValuePair": {
             "type": "object",
             "additionalProperties": false,

diff --git a/schema/meter_provider.json b/schema/meter_provider.json
@@ -308,7 +308,7 @@
                             }
                         },
                         "attribute_keys": {
-                            "$ref": "common.json#/$defs/Include"
+                            "$ref": "common.json#/$defs/IncludeExclude"
                         }
                     }
                 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -308,7 +308,7 @@ @@
                                 }
                             },
                             "attribute_keys": {
-                                "$ref": "common.json#/$defs/Include"
+                                "$ref": "common.json#/$defs/IncludeExclude"
                             }
                         }
                     }
@@ Expand Down @@