From 76129f41a418f63c96c698d5d46909752a0aad5d Mon Sep 17 00:00:00 2001
From: Alex Boten <223565+codeboten@users.noreply.github.com>
Date: Tue, 17 Sep 2024 12:27:58 -0700
Subject: [PATCH 1/4] add codeql workflow (#123)

This will validate changes to the code in this repo. Part of #52

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 41 +++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 .github/workflows/codeql-analysis.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000..18086e8
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,41 @@
+name: "CodeQL Analysis"
+on:
+  push:
+    branches: [main]
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  CodeQL-Build:
+    permissions:
+      actions: read # for github/codeql-action/init to get workflow details
+      contents: read # for actions/checkout to fetch code
+      security-events: write # for github/codeql-action/autobuild to send a status report
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+
+      - name: Setup Go
+        uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
+        with:
+          go-version: ~1.22
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        with:
+          languages: go
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6

From 2a690924fe9899dc211f84051331ef61f4791701 Mon Sep 17 00:00:00 2001
From: jack-berg <34418638+jack-berg@users.noreply.github.com>
Date: Tue, 17 Sep 2024 17:18:25 -0500
Subject: [PATCH 2/4] Update CODEOWNERS to include configuration-approvers
 (#124)

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index a303883..5371343 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,4 +8,4 @@
 #  https://help.github.com/en/articles/about-code-owners
 #
 
-* @open-telemetry/configuration-maintainers
+* @open-telemetry/configuration-approvers

From a377d995370817fe24ff5c0ebd3abbb615e09b23 Mon Sep 17 00:00:00 2001
From: Alex Boten <223565+codeboten@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:23:50 -0700
Subject: [PATCH 3/4] add headers_list support, similar to attributes_list
 (#122)

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
---
 examples/kitchen-sink.yaml         | 12 ++++++++++++
 examples/sdk-migration-config.yaml | 13 ++++++++++++-
 schema/common.json                 |  3 +++
 schema/meter_provider.json         |  3 +++
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/examples/kitchen-sink.yaml b/examples/kitchen-sink.yaml
index fd56325..d47779a 100644
--- a/examples/kitchen-sink.yaml
+++ b/examples/kitchen-sink.yaml
@@ -79,6 +79,10 @@ logger_provider:
             # Environment variable: OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_LOGS_HEADERS
             headers:
               api-key: "1234"
+            # Configure headers. Entries have lower priority than entries from .headers.
+            #
+            # The value is a list of comma separated key-value pairs,  matching the format of OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_LOGS_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
+            headers_list: "api-key=1234"
             # Configure compression.
             #
             # Environment variable: OTEL_EXPORTER_OTLP_COMPRESSION, OTEL_EXPORTER_OTLP_LOGS_COMPRESSION
@@ -187,6 +191,10 @@ meter_provider:
             # Environment variable: OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_METRICS_HEADERS
             headers:
               api-key: !!str 1234
+            # Configure headers. Entries have lower priority than entries from .headers.
+            #
+            # The value is a list of comma separated key-value pairs,  matching the format of OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_METRICS_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
+            headers_list: "api-key=1234"
             # Configure compression.
             #
             # Environment variable: OTEL_EXPORTER_OTLP_COMPRESSION, OTEL_EXPORTER_OTLP_METRICS_COMPRESSION
@@ -314,6 +322,10 @@ tracer_provider:
             # Environment variable: OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_TRACES_HEADERS
             headers:
               api-key: !!str 1234
+            # Configure headers. Entries have lower priority than entries from .headers.
+            #
+            # The value is a list of comma separated key-value pairs,  matching the format of OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_TRACES_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
+            headers_list: "api-key=1234"
             # Configure compression.
             #
             # Environment variable: OTEL_EXPORTER_OTLP_COMPRESSION, OTEL_EXPORTER_OTLP_TRACES_COMPRESSION
diff --git a/examples/sdk-migration-config.yaml b/examples/sdk-migration-config.yaml
index 26bdaac..a1afd27 100644
--- a/examples/sdk-migration-config.yaml
+++ b/examples/sdk-migration-config.yaml
@@ -32,7 +32,6 @@
 # - OTEL_EXPORTER_OTLP_CERTIFICATE
 # - OTEL_EXPORTER_OTLP_CLIENT_KEY
 # - OTEL_EXPORTER_OTLP_CLIENT_CERTIFICATE
-# - OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_{SIGNAL}_HEADERS
 # - OTEL_EXPORTER_OTLP_COMPRESSION
 # - OTEL_EXPORTER_OTLP_TIMEOUT
 
@@ -98,6 +97,10 @@ tracer_provider:
             timeout: ${OTEL_EXPORTER_OTLP_TRACES_TIMEOUT:-10000}
             # Configure headers:
             headers: {}
+            # Configure headers. Entries have lower priority than entries from .headers.
+            #
+            # The value is a list of comma separated key-value pairs,  matching the format of OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_TRACES_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
+            headers_list: ${OTEL_EXPORTER_OTLP_TRACES_HEADERS}
   # Configure span limits. See also attribute_limits.
   limits:
     # Configure max span attribute value size. Overrides attribute_limits.attribute_value_length_limit.
@@ -167,6 +170,10 @@ meter_provider:
             timeout: ${OTEL_EXPORTER_OTLP_METRICS_TIMEOUT:-10000}
             # Configure headers:
             headers: {}
+            # Configure headers. Entries have lower priority than entries from .headers.
+            #
+            # The value is a list of comma separated key-value pairs,  matching the format of OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_METRICS_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
+            headers_list: "{OTEL_EXPORTER_OTLP_METRICS_HEADERS}"
             # Configure temporality preference.
             temporality_preference: ${OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE:-cumulative}
             # Configure default histogram aggregation.
@@ -206,6 +213,10 @@ logger_provider:
             timeout: ${OTEL_EXPORTER_OTLP_LOGS_TIMEOUT:-10000}
             # Configure headers:
             headers: {}
+            # Configure headers. Entries have lower priority than entries from .headers.
+            #
+            # The value is a list of comma separated key-value pairs,  matching the format of OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_LOGS_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
+            headers_list: "{OTEL_EXPORTER_OTLP_LOGS_HEADERS}"
   # Configure log record limits. See also attribute_limits.
   limits:
     # Configure max log record attribute value size. Overrides attribute_limits.attribute_value_length_limit.
diff --git a/schema/common.json b/schema/common.json
index 0332633..9dbc50a 100644
--- a/schema/common.json
+++ b/schema/common.json
@@ -66,6 +66,9 @@
                 "headers": {
                     "$ref": "#/$defs/Headers"
                 },
+                "headers_list": {
+                    "type": ["string", "null"]
+                },
                 "compression": {
                     "type": ["string", "null"]
                 },
diff --git a/schema/meter_provider.json b/schema/meter_provider.json
index fdaad6f..fa0d732 100644
--- a/schema/meter_provider.json
+++ b/schema/meter_provider.json
@@ -172,6 +172,9 @@
                 "headers": {
                     "$ref": "common.json#/$defs/Headers"
                 },
+                "headers_list": {
+                    "type": ["string", "null"]
+                },
                 "compression": {
                     "type": ["string", "null"]
                 },

From f89f35ac5553b6cce0db30bb8c8d32f2d3cbfe01 Mon Sep 17 00:00:00 2001
From: jack-berg <34418638+jack-berg@users.noreply.github.com>
Date: Thu, 19 Sep 2024 08:52:52 -0500
Subject: [PATCH 4/4] Prefer arrays of name value pairs over objects (#115)

* Prefer arrays of name value pairs over objects

* .resource.attributes are name, value, type

* Fix validator shell tests

* Apply suggestions from code review

Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>

---------

Co-authored-by: Alex Boten <223565+codeboten@users.noreply.github.com>
---
 README.md                                | 23 ++++++++++--
 examples/anchors.yaml                    |  3 +-
 examples/kitchen-sink.yaml               | 39 +++++++++++++++++---
 examples/sdk-config.yaml                 |  9 ++---
 examples/sdk-migration-config.yaml       | 17 ++++-----
 schema/common.json                       | 29 +++++++++------
 schema/meter_provider.json               |  5 ++-
 schema/resource.json                     | 45 +++++++++++++++++++++---
 validator/shelltests/hex_integer.yaml    |  3 +-
 validator/shelltests/string_for_int.yaml |  3 +-
 10 files changed, 139 insertions(+), 37 deletions(-)

diff --git a/README.md b/README.md
index 1324b21..8922968 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,6 @@ The [examples](./examples) repository contains a variety of sample configuration
 - [sdk-migration-config.yaml](./examples/sdk-migration-config.yaml): Includes env var substitution references to all [standard env vars](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md) which map cleanly to file configuration (see notes in the example for the set of env vars which are not referenced). Note, SDKs parsing configuration files ignore all env vars besides those referenced via [env var substitution][]. This is a great starting point for transitioning from env var based configuration to file based configuration.
 - [sdk-config.yaml](./examples/sdk-config.yaml): Represents the typical default configuration. This is a good starting point if you are not using env var based configuration or wish to transition fully to file based configuration. Note, SDKs parsing configuration files ignore all env vars besides those referenced via [env var substitution][].
 
-[env var substitution]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/file-configuration.md#environment-variable-substitution
-
 ## Code generation
 
 There are [several tools](https://json-schema.org/implementations.html) available to generate code from a JSON schema. The following shows an example for generating code from the JSON schema in Go:
@@ -70,6 +68,24 @@ Properties should be modeled using the most appropriate data structures and type
 
 In instances where there is a type mismatch between the JSON schema and equivalent standard env var, an alternative version of the property may be provided to resolve the mismatch. For example, resource attributes are configured at `.resource.attributes`, but `.resource.attributes_list` is available with a format matching that of `OTEL_RESOURCE_ATTRIBUTES`. Alternative properties are reserved for cases where there is a demonstrated need for platforms to be able to participate in configuration and there is no reasonable alternative.
 
+### Name-value pairs
+
+When a type requires a configurable list of name-value pairs (i.e. resource attributes, HTTP headers), model using an array of objects, each with `name` and `value` properties. While an array of name-value objects is slightly more verbose than an object where each key-value is an entry, the latter is preferred because:
+
+* Avoids user input as keys, which ensures conformity with the [snake_case properties](#property-name-case) rule.
+* Allows both the names and the values to be targets for [env var substitution]. For example:
+
+    ```yaml
+   tracer_provider:
+     processors:
+       - batch:
+           exporter:
+             otlp:
+               headers:
+                - name: ${AUTHORIZATION_HEADER_NAME:-api-key}
+                  value: ${AUTHORIZATION_HEADER_VALUE}
+    ```
+
 ## Contributing
 
 See [CONTRIBUTING.md](CONTRIBUTING.md)
@@ -89,3 +105,6 @@ Maintainers ([@open-telemetry/configuration-maintainers](https://github.com/orgs
 - [Tyler Yahn](https://github.com/tsloughter), Splunk
 
 *Find more about the maintainer role in [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md#maintainer).*
+
+[env var substitution]: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/file-configuration.md#environment-variable-substitution
+
diff --git a/examples/anchors.yaml b/examples/anchors.yaml
index 5aed3bd..d956f41 100644
--- a/examples/anchors.yaml
+++ b/examples/anchors.yaml
@@ -8,7 +8,8 @@ exporters:
     client_key: /app/cert.pem
     client_certificate: /app/cert.pem
     headers:
-      api-key: !!str 1234
+      - name: api-key
+        value: "1234"
     compression: gzip
     timeout: 10000
 
diff --git a/examples/kitchen-sink.yaml b/examples/kitchen-sink.yaml
index d47779a..c179645 100644
--- a/examples/kitchen-sink.yaml
+++ b/examples/kitchen-sink.yaml
@@ -78,7 +78,8 @@ logger_provider:
             #
             # Environment variable: OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_LOGS_HEADERS
             headers:
-              api-key: "1234"
+              - name: api-key
+                value: "1234"
             # Configure headers. Entries have lower priority than entries from .headers.
             #
             # The value is a list of comma separated key-value pairs,  matching the format of OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_LOGS_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
@@ -190,7 +191,8 @@ meter_provider:
             #
             # Environment variable: OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_METRICS_HEADERS
             headers:
-              api-key: !!str 1234
+              - name: api-key
+                value: "1234"
             # Configure headers. Entries have lower priority than entries from .headers.
             #
             # The value is a list of comma separated key-value pairs,  matching the format of OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_METRICS_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
@@ -321,7 +323,8 @@ tracer_provider:
             #
             # Environment variable: OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_TRACES_HEADERS
             headers:
-              api-key: !!str 1234
+              - name: api-key
+                value: "1234"
             # Configure headers. Entries have lower priority than entries from .headers.
             #
             # The value is a list of comma separated key-value pairs,  matching the format of OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_TRACES_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
@@ -423,12 +426,40 @@ tracer_provider:
 resource:
   # Configure resource attributes. Entries have higher priority than entries from .resource.attributes_list.
   #
+  # Each entry must contain .name and .value, and may optionally include .type, which defaults to "string" if not set. The value must match the type. Known types include: string, bool, int, double, string_array, bool_array, int_array, double_array.
+  #
   # Environment variable: OTEL_RESOURCE_ATTRIBUTES
   attributes:
     # Configure `service.name` resource attribute
     #
     # Environment variable: OTEL_SERVICE_NAME
-    service.name: !!str "unknown_service"
+    - name: service.name
+      value: unknown_service
+    # Configure other resource attributes with explicit types.
+    - name: string_key
+      value: value
+      type: string
+    - name: bool_key
+      value: true
+      type: bool
+    - name: int_key
+      value: 1
+      type: int
+    - name: double_key
+      value: 1.1
+      type: double
+    - name: string_array_key
+      value: ["value1", "value2"]
+      type: string_array
+    - name: bool_array_key
+      value: [ true, false ]
+      type: bool_array
+    - name: int_array_key
+      value: [ 1, 2 ]
+      type: int_array
+    - name: double_array_key
+      value: [ 1.1, 2.2 ]
+      type: double_array
   # Configure resource attributes. Entries have lower priority than entries from .resource.attributes.
   #
   # The value is a list of comma separated key-value pairs,  matching the format of OTEL_RESOURCE_ATTRIBUTES. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
diff --git a/examples/sdk-config.yaml b/examples/sdk-config.yaml
index 9675500..8a61ec9 100644
--- a/examples/sdk-config.yaml
+++ b/examples/sdk-config.yaml
@@ -16,7 +16,8 @@ resource:
   # Configure resource attributes.
   attributes:
     # Configure `service.name` resource attribute
-    service.name: unknown_service
+    - name: service.name
+      value: unknown_service
 
 # Configure general attribute limits. See also tracer_provider.limits, logger_provider.limits.
 attribute_limits:
@@ -62,7 +63,7 @@ tracer_provider:
             # Configure max time (in milliseconds) to wait for each export.
             timeout: 10000
             # Configure headers:
-            headers: {}
+            headers: []
   # Configure span limits. See also attribute_limits.
   limits:
     # Configure max span attribute value size. Overrides attribute_limits.attribute_value_length_limit.
@@ -131,7 +132,7 @@ meter_provider:
             # Configure max time (in milliseconds) to wait for each export.
             timeout: 10000
             # Configure headers:
-            headers: {}
+            headers: []
             # Configure temporality preference.
             temporality_preference: cumulative
             # Configure default histogram aggregation.
@@ -170,7 +171,7 @@ logger_provider:
             # Configure max time (in milliseconds) to wait for each export.
             timeout: 10000
             # Configure headers:
-            headers: {}
+            headers: []
   # Configure log record limits. See also attribute_limits.
   limits:
     # Configure max log record attribute value size. Overrides attribute_limits.attribute_value_length_limit.
diff --git a/examples/sdk-migration-config.yaml b/examples/sdk-migration-config.yaml
index a1afd27..abacca8 100644
--- a/examples/sdk-migration-config.yaml
+++ b/examples/sdk-migration-config.yaml
@@ -46,7 +46,8 @@ resource:
   # Configure resource attributes. Entries have higher priority than entries from .resource.attributes_list.
   attributes:
     # Configure `service.name` resource attribute
-    service.name: ${OTEL_SERVICE_NAME:-unknown_service}
+    - name: service.name
+      value: ${OTEL_SERVICE_NAME:-unknown_service}
   # Configure resource attributes. Entries have lower priority than entries from .resource.attributes.
   #
   # The value is a list of comma separated key-value pairs, matching the format of OTEL_RESOURCE_ATTRIBUTES. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
@@ -96,7 +97,7 @@ tracer_provider:
             # Configure max time (in milliseconds) to wait for each export.
             timeout: ${OTEL_EXPORTER_OTLP_TRACES_TIMEOUT:-10000}
             # Configure headers:
-            headers: {}
+            headers: []
             # Configure headers. Entries have lower priority than entries from .headers.
             #
             # The value is a list of comma separated key-value pairs,  matching the format of OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_TRACES_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
@@ -168,12 +169,12 @@ meter_provider:
             compression: ${OTEL_EXPORTER_OTLP_METRICS_COMPRESSION:-gzip}
             # Configure max time (in milliseconds) to wait for each export.
             timeout: ${OTEL_EXPORTER_OTLP_METRICS_TIMEOUT:-10000}
-            # Configure headers:
-            headers: {}
+            # Configure headers.
+            headers: []
             # Configure headers. Entries have lower priority than entries from .headers.
             #
             # The value is a list of comma separated key-value pairs,  matching the format of OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_METRICS_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
-            headers_list: "{OTEL_EXPORTER_OTLP_METRICS_HEADERS}"
+            headers_list: ${OTEL_EXPORTER_OTLP_METRICS_HEADERS}
             # Configure temporality preference.
             temporality_preference: ${OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE:-cumulative}
             # Configure default histogram aggregation.
@@ -211,12 +212,12 @@ logger_provider:
             compression: ${OTEL_EXPORTER_OTLP_LOGS_COMPRESSION:-gzip}
             # Configure max time (in milliseconds) to wait for each export.
             timeout: ${OTEL_EXPORTER_OTLP_LOGS_TIMEOUT:-10000}
-            # Configure headers:
-            headers: {}
+            # Configure headers.
+            headers: []
             # Configure headers. Entries have lower priority than entries from .headers.
             #
             # The value is a list of comma separated key-value pairs,  matching the format of OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_LOGS_HEADERS. See https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/configuration/sdk-environment-variables.md#general-sdk-configuration for details.
-            headers_list: "{OTEL_EXPORTER_OTLP_LOGS_HEADERS}"
+            headers_list: ${OTEL_EXPORTER_OTLP_LOGS_HEADERS}
   # Configure log record limits. See also attribute_limits.
   limits:
     # Configure max log record attribute value size. Overrides attribute_limits.attribute_value_length_limit.
diff --git a/schema/common.json b/schema/common.json
index 9dbc50a..37f8a3f 100644
--- a/schema/common.json
+++ b/schema/common.json
@@ -4,15 +4,6 @@
     "title": "Common",
     "type": ["object", "null"],
     "$defs": {
-        "Headers": {
-            "type": ["object", "null"],
-            "title": "Headers",
-            "patternProperties": {
-                ".*": {
-                    "type": ["string", "null"]
-                }
-            }
-        },
         "IncludeExclude": {
             "type": "object",
             "additionalProperties": false,
@@ -43,6 +34,21 @@
                 }
             }
         },
+        "NameStringValuePair": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "value": {
+                    "type": ["string", "null"]
+                }
+            },
+            "required": [
+                "name", "value"
+            ]
+        },
         "Otlp": {
             "type": ["object", "null"],
             "additionalProperties": false,
@@ -64,7 +70,10 @@
                     "type": ["string", "null"]
                 },
                 "headers": {
-                    "$ref": "#/$defs/Headers"
+                    "type": "array",
+                    "items": {
+                        "$ref": "common.json#/$defs/NameStringValuePair"
+                    }
                 },
                 "headers_list": {
                     "type": ["string", "null"]
diff --git a/schema/meter_provider.json b/schema/meter_provider.json
index fa0d732..dc08eef 100644
--- a/schema/meter_provider.json
+++ b/schema/meter_provider.json
@@ -170,7 +170,10 @@
                     "type": ["string", "null"]
                 },
                 "headers": {
-                    "$ref": "common.json#/$defs/Headers"
+                    "type": "array",
+                    "items": {
+                        "$ref": "common.json#/$defs/NameStringValuePair"
+                    }
                 },
                 "headers_list": {
                     "type": ["string", "null"]
diff --git a/schema/resource.json b/schema/resource.json
index 1f0b9df..f059603 100644
--- a/schema/resource.json
+++ b/schema/resource.json
@@ -6,7 +6,10 @@
     "additionalProperties": false,
     "properties": {
         "attributes": {
-            "$ref": "#/$defs/Attributes"
+            "type": "array",
+            "items": {
+                "$ref": "#/$defs/AttributeNameValue"
+            }
         },
         "detectors": {
             "$ref": "#/$defs/Detectors"
@@ -19,10 +22,42 @@
         }
     },
     "$defs": {
-        "Attributes": {
-            "title": "Attributes",
-            "type": ["object", "null"],
-            "additionalProperties": true
+        "AttributeNameValue": {
+            "title": "AttributeNameValue",
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "value": {
+                    "oneOf": [
+                        {"type": "string"},
+                        {"type": "number"},
+                        {"type": "boolean"},
+                        {"type": "null"},
+                        {"type": "array", "items": {"type": "string"}},
+                        {"type": "array", "items": {"type": "boolean"}},
+                        {"type": "array", "items": {"type": "number"}}
+                    ]
+                },
+                "type": {
+                    "enum": [
+                        null,
+                        "string",
+                        "bool",
+                        "int",
+                        "double",
+                        "string_array",
+                        "bool_array",
+                        "int_array",
+                        "double_array"
+                    ]
+                }
+            },
+            "required": [
+                "name", "value"
+            ]
         },
         "Detectors": {
             "title": "Detectors",
diff --git a/validator/shelltests/hex_integer.yaml b/validator/shelltests/hex_integer.yaml
index b742f2c..b6504f9 100644
--- a/validator/shelltests/hex_integer.yaml
+++ b/validator/shelltests/hex_integer.yaml
@@ -9,7 +9,8 @@ resource:
   # Configure resource attributes.
   attributes:
     # Configure `service.name` resource attribute
-    service.name: "${OTEL_SERVICE_NAME:-unknown_service}"
+    - name: service.name
+      value: "${OTEL_SERVICE_NAME:-unknown_service}"
 
 attribute_limits:
   # Configure max attribute value size.
diff --git a/validator/shelltests/string_for_int.yaml b/validator/shelltests/string_for_int.yaml
index 8aec2c1..00818bb 100644
--- a/validator/shelltests/string_for_int.yaml
+++ b/validator/shelltests/string_for_int.yaml
@@ -9,7 +9,8 @@ resource:
   # Configure resource attributes.
   attributes:
     # Configure `service.name` resource attribute
-    service.name: "${OTEL_SERVICE_NAME:-unknown_service}"
+    - name: service.name
+      value: "${OTEL_SERVICE_NAME:-unknown_service}"
 
 attribute_limits:
   # Configure max attribute value size.