Fix reading scope attributes for trace JSON, remove duplicate code

Signed-off-by: Bogdan <[email protected]>

CHANGELOG.md

@@ -31,6 +31,7 @@
 
 ### 🧰 Bug fixes 🧰
 
+- Fix reading scope attributes for trace JSON, remove duplicate code. (#5930)
 - 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 int32/uint32.

pdata/internal/json/scope.go

@@ -0,0 +1,42 @@
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http:https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package json // import "go.opentelemetry.io/collector/pdata/internal/json"
+
+import (
+ jsoniter "github.com/json-iterator/go"
+
+ otlpcommon "go.opentelemetry.io/collector/pdata/internal/data/protogen/common/v1"
+)
+
+func ReadScope(iter *jsoniter.Iterator, scope *otlpcommon.InstrumentationScope) {
+ iter.ReadObjectCB(func(iter *jsoniter.Iterator, f string) bool {
+ switch f {
+ case "name":
+ scope.Name = iter.ReadString()
+ case "version":
+ scope.Version = iter.ReadString()
+ case "attributes":
+ iter.ReadArrayCB(func(iter *jsoniter.Iterator) bool {
+ scope.Attributes = append(scope.Attributes, ReadAttribute(iter))
+ return true
+ })
+ case "droppedAttributesCount", "dropped_attributes_count":
+ scope.DroppedAttributesCount = ReadUint32(iter)
+ default:
+ iter.Skip()
+ }
+ return true
+ })
+}

pdata/internal/json/scope_test.go

@@ -0,0 +1,118 @@
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http:https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package json
+
+import (
+ "testing"
+
+ jsoniter "github.com/json-iterator/go"
+ "github.com/stretchr/testify/assert"
+
+ otlpcommon "go.opentelemetry.io/collector/pdata/internal/data/protogen/common/v1"
+)
+
+func TestReadScope(t *testing.T) {
+ tests := []struct {
+ name string
+ jsonStr string
+ want *otlpcommon.InstrumentationScope
+ }{
+ {
+ name: "scope",
+ jsonStr: `{
+ "name": "name_value",
+ "version": "version_value",
+}`,
+ want: &otlpcommon.InstrumentationScope{
+ Name: "name_value",
+ Version: "version_value",
+ },
+ },
+ {
+ name: "with attributes",
+ jsonStr: `{
+ "name": "my_name",
+ "version": "my_version",
+ "attributes": [
+ {
+ "key":"string_key",
+ "value":{"stringValue": "value"}
+ },
+ {
+ "key":"bool_key",
+ "value":{"boolValue": true}
+ },
+ {
+ "key":"int_key",
+ "value":{"intValue": 314}
+ },
+ {
+ "key":"double_key",
+ "value":{"doubleValue": 3.14}
+ }
+ ],
+ "dropped_attributes_count": 1,
+}`,
+ want: &otlpcommon.InstrumentationScope{
+ Name: "my_name",
+ Version: "my_version",
+ Attributes: []otlpcommon.KeyValue{
+ {
+ Key: "string_key",
+ Value: otlpcommon.AnyValue{
+ Value: &otlpcommon.AnyValue_StringValue{
+ StringValue: "value",
+ },
+ },
+ },
+ {
+ Key: "bool_key",
+ Value: otlpcommon.AnyValue{
+ Value: &otlpcommon.AnyValue_BoolValue{
+ BoolValue: true,
+ },
+ },
+ },
+ {
+ Key: "int_key",
+ Value: otlpcommon.AnyValue{
+ Value: &otlpcommon.AnyValue_IntValue{
+ IntValue: 314,
+ },
+ },
+ },
+ {
+ Key: "double_key",
+ Value: otlpcommon.AnyValue{
+ Value: &otlpcommon.AnyValue_DoubleValue{
+ DoubleValue: 3.14,
+ },
+ },
+ },
+ },
+ DroppedAttributesCount: 1,
+ },
+ },
+ }
+ 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)
+ })
+ }
+}

pdata/pmetric/json.go

@@ -122,25 +122,7 @@ func (d *jsonUnmarshaler) readScopeMetrics(iter *jsoniter.Iterator) *otlpmetrics
  iter.ReadObjectCB(func(iter *jsoniter.Iterator, f string) bool {
  switch f {
  case "scope":
- iter.ReadObjectCB(func(iter *jsoniter.Iterator, f string) bool {
- switch f {
- case "name":
- ils.Scope.Name = iter.ReadString()
- case "version":
- ils.Scope.Version = iter.ReadString()
- case "attributes":
- iter.ReadArrayCB(func(iter *jsoniter.Iterator) bool {
- ils.Scope.Attributes = append(ils.Scope.Attributes,
- json.ReadAttribute(iter))
- return true
- })
- case "droppedAttributesCount", "dropped_attributes_count":
- ils.Scope.DroppedAttributesCount = json.ReadUint32(iter)
- default:
- iter.Skip()
- }
- return true
- })
+ json.ReadScope(iter, &ils.Scope)
  case "metrics":
  iter.ReadArrayCB(func(iter *jsoniter.Iterator) bool {
  ils.Metrics = append(ils.Metrics, d.readMetric(iter))

pdata/ptrace/json.go

@@ -101,8 +101,7 @@ func readResourceSpans(iter *jsoniter.Iterator) *otlptrace.ResourceSpans {
  })
  case "scopeSpans", "scope_spans":
  iter.ReadArrayCB(func(iter *jsoniter.Iterator) bool {
- rs.ScopeSpans = append(rs.ScopeSpans,
- readScopeSpans(iter))
+ rs.ScopeSpans = append(rs.ScopeSpans, readScopeSpans(iter))
  return true
  })
  case "schemaUrl", "schema_url":
@@ -121,17 +120,7 @@ func readScopeSpans(iter *jsoniter.Iterator) *otlptrace.ScopeSpans {
  iter.ReadObjectCB(func(iter *jsoniter.Iterator, f string) bool {
  switch f {
  case "scope":
- iter.ReadObjectCB(func(iter *jsoniter.Iterator, f string) bool {
- switch f {
- case "name":
- ils.Scope.Name = iter.ReadString()
- case "version":
- ils.Scope.Version = iter.ReadString()
- default:
- iter.ReportError("readScopeSpans.instrumentationLibrary", fmt.Sprintf("unknown field:%v", f))
- }
- return true
- })
+ json.ReadScope(iter, &ils.Scope)
  case "spans":
  iter.ReadArrayCB(func(iter *jsoniter.Iterator) bool {
  ils.Spans = append(ils.Spans, readSpan(iter))

pdata/ptrace/json_test.go

@@ -199,16 +199,6 @@ func TestReadScopeSpansUnknownField(t *testing.T) {
  }
 }
 
-func TestReadScopeSpansUnknownScopeField(t *testing.T) {
- jsonStr := `{"scope":{"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")
- }
-}
-
 func TestReadSpanUnknownField(t *testing.T) {
  jsonStr := `{"extra":""}`
  iter := jsoniter.ConfigFastest.BorrowIterator([]byte(jsonStr))