From 04efff8268c2bd425581a522d14ba0949b5c0289 Mon Sep 17 00:00:00 2001 From: Antoine Toulme Date: Sat, 8 Nov 2025 13:10:23 -0800 Subject: [PATCH] [chore] switch from jsoniter to goccy-json --- .../azureresourcemetrics_unmarshaler.go | 8 ++++---- receiver/azureeventhubreceiver/go.mod | 4 ++-- receiver/azureeventhubreceiver/persister.go | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/receiver/azureeventhubreceiver/azureresourcemetrics_unmarshaler.go b/receiver/azureeventhubreceiver/azureresourcemetrics_unmarshaler.go index 1d6054244d9b0..4487036d44098 100644 --- a/receiver/azureeventhubreceiver/azureresourcemetrics_unmarshaler.go +++ b/receiver/azureeventhubreceiver/azureresourcemetrics_unmarshaler.go @@ -9,7 +9,7 @@ import ( "strings" "time" - jsoniter "github.com/json-iterator/go" + json "github.com/goccy/go-json" "github.com/relvacode/iso8601" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pcommon" @@ -54,7 +54,7 @@ func (r *azureGenericMetricRecord) UnmarshalJSON(data []byte) error { var recordWithType struct { Type string `json:"Type"` } - typeDecoder := jsoniter.NewDecoder(bytes.NewReader(data)) + typeDecoder := json.NewDecoder(bytes.NewReader(data)) err := typeDecoder.Decode(&recordWithType) if err != nil { return err @@ -67,7 +67,7 @@ func (r *azureGenericMetricRecord) UnmarshalJSON(data []byte) error { r.Record = &azureResourceMetricRecord{} } - recordDecoder := jsoniter.NewDecoder(bytes.NewReader(data)) + recordDecoder := json.NewDecoder(bytes.NewReader(data)) err = recordDecoder.Decode(r.Record) if err != nil { return err @@ -297,7 +297,7 @@ func (r *azureResourceMetricsUnmarshaler) UnmarshalMetrics(event *azureEvent) (p md := pmetric.NewMetrics() var azureMetrics azureMetricRecords - decoder := jsoniter.NewDecoder(bytes.NewReader(event.Data())) + decoder := json.NewDecoder(bytes.NewReader(event.Data())) err := decoder.Decode(&azureMetrics) if err != nil { return md, err diff --git a/receiver/azureeventhubreceiver/go.mod b/receiver/azureeventhubreceiver/go.mod index ed706e2990c5b..cfe23511915d1 100644 --- a/receiver/azureeventhubreceiver/go.mod +++ b/receiver/azureeventhubreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/Azure/azure-event-hubs-go/v3 v3.6.2 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1 github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/v2 v2.0.1 - github.com/json-iterator/go v1.1.12 + github.com/goccy/go-json v0.10.5 github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.139.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/stanza v0.139.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.139.0 @@ -59,7 +59,6 @@ require ( github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/gobwas/glob v0.2.3 // indirect - github.com/goccy/go-json v0.10.5 // indirect github.com/golang-jwt/jwt/v4 v4.5.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect @@ -67,6 +66,7 @@ require ( github.com/hashicorp/go-version v1.7.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.2 // indirect github.com/knadh/koanf/providers/confmap v1.0.0 // indirect github.com/knadh/koanf/v2 v2.3.0 // indirect diff --git a/receiver/azureeventhubreceiver/persister.go b/receiver/azureeventhubreceiver/persister.go index f0ccff5b5a6d9..91e99938ce8eb 100644 --- a/receiver/azureeventhubreceiver/persister.go +++ b/receiver/azureeventhubreceiver/persister.go @@ -7,7 +7,7 @@ import ( "context" "fmt" - jsoniter "github.com/json-iterator/go" + json "github.com/goccy/go-json" "go.opentelemetry.io/collector/extension/xextension/storage" ) @@ -21,7 +21,7 @@ type storageCheckpointPersister[T any] struct { } func (s *storageCheckpointPersister[T]) Write(namespace, name, consumerGroup, partitionID string, checkpoint T) error { - b, err := jsoniter.Marshal(checkpoint) + b, err := json.Marshal(checkpoint) if err != nil { return err } @@ -37,6 +37,6 @@ func (s *storageCheckpointPersister[T]) Read(namespace, name, consumerGroup, par if len(bytes) == 0 { return s.defaultValue, err } - err = jsoniter.Unmarshal(bytes, &checkpoint) + err = json.Unmarshal(bytes, &checkpoint) return checkpoint, err }