Skip to content

Commit 04efff8

Browse files
committed
[chore] switch from jsoniter to goccy-json
1 parent eefd51a commit 04efff8

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

receiver/azureeventhubreceiver/azureresourcemetrics_unmarshaler.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"time"
1111

12-
jsoniter "github.com/json-iterator/go"
12+
json "github.com/goccy/go-json"
1313
"github.com/relvacode/iso8601"
1414
"go.opentelemetry.io/collector/component"
1515
"go.opentelemetry.io/collector/pdata/pcommon"
@@ -54,7 +54,7 @@ func (r *azureGenericMetricRecord) UnmarshalJSON(data []byte) error {
5454
var recordWithType struct {
5555
Type string `json:"Type"`
5656
}
57-
typeDecoder := jsoniter.NewDecoder(bytes.NewReader(data))
57+
typeDecoder := json.NewDecoder(bytes.NewReader(data))
5858
err := typeDecoder.Decode(&recordWithType)
5959
if err != nil {
6060
return err
@@ -67,7 +67,7 @@ func (r *azureGenericMetricRecord) UnmarshalJSON(data []byte) error {
6767
r.Record = &azureResourceMetricRecord{}
6868
}
6969

70-
recordDecoder := jsoniter.NewDecoder(bytes.NewReader(data))
70+
recordDecoder := json.NewDecoder(bytes.NewReader(data))
7171
err = recordDecoder.Decode(r.Record)
7272
if err != nil {
7373
return err
@@ -297,7 +297,7 @@ func (r *azureResourceMetricsUnmarshaler) UnmarshalMetrics(event *azureEvent) (p
297297
md := pmetric.NewMetrics()
298298

299299
var azureMetrics azureMetricRecords
300-
decoder := jsoniter.NewDecoder(bytes.NewReader(event.Data()))
300+
decoder := json.NewDecoder(bytes.NewReader(event.Data()))
301301
err := decoder.Decode(&azureMetrics)
302302
if err != nil {
303303
return md, err

receiver/azureeventhubreceiver/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/Azure/azure-event-hubs-go/v3 v3.6.2
88
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1
99
github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/v2 v2.0.1
10-
github.com/json-iterator/go v1.1.12
10+
github.com/goccy/go-json v0.10.5
1111
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.139.0
1212
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.139.0
1313
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.139.0
@@ -59,14 +59,14 @@ require (
5959
github.com/go-ole/go-ole v1.2.6 // indirect
6060
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
6161
github.com/gobwas/glob v0.2.3 // indirect
62-
github.com/goccy/go-json v0.10.5 // indirect
6362
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
6463
github.com/google/uuid v1.6.0 // indirect
6564
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
6665
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
6766
github.com/hashicorp/go-version v1.7.0 // indirect
6867
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6968
github.com/jpillora/backoff v1.0.0 // indirect
69+
github.com/json-iterator/go v1.1.12 // indirect
7070
github.com/knadh/koanf/maps v0.1.2 // indirect
7171
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
7272
github.com/knadh/koanf/v2 v2.3.0 // indirect

receiver/azureeventhubreceiver/persister.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"context"
88
"fmt"
99

10-
jsoniter "github.com/json-iterator/go"
10+
json "github.com/goccy/go-json"
1111
"go.opentelemetry.io/collector/extension/xextension/storage"
1212
)
1313

@@ -21,7 +21,7 @@ type storageCheckpointPersister[T any] struct {
2121
}
2222

2323
func (s *storageCheckpointPersister[T]) Write(namespace, name, consumerGroup, partitionID string, checkpoint T) error {
24-
b, err := jsoniter.Marshal(checkpoint)
24+
b, err := json.Marshal(checkpoint)
2525
if err != nil {
2626
return err
2727
}
@@ -37,6 +37,6 @@ func (s *storageCheckpointPersister[T]) Read(namespace, name, consumerGroup, par
3737
if len(bytes) == 0 {
3838
return s.defaultValue, err
3939
}
40-
err = jsoniter.Unmarshal(bytes, &checkpoint)
40+
err = json.Unmarshal(bytes, &checkpoint)
4141
return checkpoint, err
4242
}

0 commit comments

Comments
 (0)