Skip to content

[chore] switch from jsoniter to goccy-json #44117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −9
Open

[chore] switch from jsoniter to goccy-json #44117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions receiver/azureeventhubreceiver/azureresourcemetrics_unmarshaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions receiver/azureeventhubreceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -59,14 +59,14 @@ 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
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
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
Expand Down
6 changes: 3 additions & 3 deletions receiver/azureeventhubreceiver/persister.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand All @@ -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
}
Expand All @@ -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
}