Merge in upstream/main

CHANGELOG.md

@@ -50,6 +50,7 @@
 ### 🧰 Bug fixes 🧰
 
 - Fix reading scope attributes for trace JSON, remove duplicate code. (#5930)
+- otlpjson/trace: skip unknown fields instead of error. (#5931)
 - Fix bug in setting the correct collector state after a configuration change event. (#5830)
 - Fix json trace unmarshalling for numbers (#5924):
  - Accept both string and number for float64.

pdata/internal/json/scope_test.go

@@ -33,7 +33,7 @@ func TestReadScope(t *testing.T) {
  name: "scope",
  jsonStr: `{
  "name": "name_value",
- "version": "version_value",
+ "version": "version_value"
 }`,
  want: &otlpcommon.InstrumentationScope{
  Name: "name_value",
@@ -48,22 +48,22 @@ func TestReadScope(t *testing.T) {
  "attributes": [
  {
  "key":"string_key",
- "value":{"stringValue": "value"}
+ "value":{ "stringValue": "value" }
  },
  {
  "key":"bool_key",
- "value":{"boolValue": true}
+ "value":{ "boolValue": true }
  },
  {
  "key":"int_key",
- "value":{"intValue": 314}
+ "value":{ "intValue": 314 }
  },
  {
  "key":"double_key",
- "value":{"doubleValue": 3.14}
+ "value":{ "doubleValue": 3.14 }
  }
  ],
- "dropped_attributes_count": 1,
+ "dropped_attributes_count": 1
 }`,
  want: &otlpcommon.InstrumentationScope{
  Name: "my_name",
@@ -105,14 +105,25 @@ func TestReadScope(t *testing.T) {
  DroppedAttributesCount: 1,
  },
  },
+ {
+ name: "unknown field",
+ jsonStr: `{
+ "name": "name_value",
+ "unknown": "version"
+}`,
+ want: &otlpcommon.InstrumentationScope{
+ Name: "name_value",
+ },
+ },
  }
  for _, tt := range tests {
  t.Run(tt.name, func(t *testing.T) {
  iter := jsoniter.ConfigFastest.BorrowIterator([]byte(tt.jsonStr))
  defer jsoniter.ConfigFastest.ReturnIterator(iter)
  got := &otlpcommon.InstrumentationScope{}
  ReadScope(iter, got)
- assert.EqualValues(t, tt.want, got)
+ assert.NoError(t, iter.Error)
+ assert.Equal(t, tt.want, got)
  })
  }
 }

pdata/ptrace/json_test.go

@@ -189,10 +189,9 @@ func TestReadScopeSpansUnknownField(t *testing.T) {
  jsonStr := `{"extra":""}`
  iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))
  defer jsoniter.ConfigFastest.ReturnIterator(iter)
- readScopeSpans(iter)
- if assert.Error(t, iter.Error) {
- assert.Contains(t, iter.Error.Error(), "unknown field")
- }
+ val := readScopeSpans(iter)
+ assert.NoError(t, iter.Error)
+ assert.Equal(t, &otlptrace.ScopeSpans{}, val)
 }
 
 func TestReadSpanUnknownField(t *testing.T) {