From ef1ab4b02014a0bc3d9f00862406f00fba612811 Mon Sep 17 00:00:00 2001
From: David Ashpole <dashpole@google.com>
Date: Tue, 23 Apr 2024 19:34:36 +0000
Subject: [PATCH] support parsing metric.metadata from OTLP JSON

---
 .chloggen/json-metric-metadata.yaml | 25 +++++++++++++++++++++++++
 pdata/pmetric/json.go               |  5 +++++
 pdata/pmetric/json_test.go          |  6 ++++--
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 .chloggen/json-metric-metadata.yaml

diff --git a/.chloggen/json-metric-metadata.yaml b/.chloggen/json-metric-metadata.yaml
new file mode 100644
index 00000000000..725ba1aa041
--- /dev/null
+++ b/.chloggen/json-metric-metadata.yaml
@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: pmetric
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Support parsing metric.metadata from OTLP JSON.
+
+# One or more tracking issues or pull requests related to the change
+issues: [10026]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []
diff --git a/pdata/pmetric/json.go b/pdata/pmetric/json.go
index c8b76b0e6ec..394b8af7c65 100644
--- a/pdata/pmetric/json.go
+++ b/pdata/pmetric/json.go
@@ -106,6 +106,11 @@ func (ms Metric) unmarshalJsoniter(iter *jsoniter.Iterator) {
 			ms.orig.Description = iter.ReadString()
 		case "unit":
 			ms.orig.Unit = iter.ReadString()
+		case "metadata":
+			iter.ReadArrayCB(func(iter *jsoniter.Iterator) bool {
+				ms.orig.Metadata = append(ms.orig.Metadata, json.ReadAttribute(iter))
+				return true
+			})
 		case "sum":
 			ms.SetEmptySum().unmarshalJsoniter(iter)
 		case "gauge":
diff --git a/pdata/pmetric/json_test.go b/pdata/pmetric/json_test.go
index cebc40e8e41..552eee39edf 100644
--- a/pdata/pmetric/json_test.go
+++ b/pdata/pmetric/json_test.go
@@ -21,11 +21,13 @@ var metricsOTLP = func() Metrics {
 	il := rm.ScopeMetrics().AppendEmpty()
 	il.Scope().SetName("name")
 	il.Scope().SetVersion("version")
-	il.Metrics().AppendEmpty().SetName("testMetric")
+	m := il.Metrics().AppendEmpty()
+	m.SetName("testMetric")
+	m.Metadata().PutStr("metadatakey", "metadatavalue")
 	return md
 }()
 
-var metricsJSON = `{"resourceMetrics":[{"resource":{"attributes":[{"key":"host.name","value":{"stringValue":"testHost"}}]},"scopeMetrics":[{"scope":{"name":"name","version":"version"},"metrics":[{"name":"testMetric"}]}]}]}`
+var metricsJSON = `{"resourceMetrics":[{"resource":{"attributes":[{"key":"host.name","value":{"stringValue":"testHost"}}]},"scopeMetrics":[{"scope":{"name":"name","version":"version"},"metrics":[{"name":"testMetric","metadata":[{"key":"metadatakey","value":{"stringValue":"metadatavalue"}}]}]}]}]}`
 
 func TestMetricsJSON(t *testing.T) {
 	encoder := &JSONMarshaler{}