Skip to content

Commit ae01667

Browse files
committed
[chore] remove jsoniter from dependencies
1 parent eefd51a commit ae01667

File tree

5 files changed

+37
-25
lines changed

5 files changed

+37
-25
lines changed

pkg/translator/azure/go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
go 1.24.0
44

55
require (
6-
github.com/json-iterator/go v1.1.12
6+
github.com/goccy/go-json v0.10.5
77
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.139.0
88
github.com/relvacode/iso8601 v1.7.0
99
github.com/stretchr/testify v1.11.1
@@ -19,6 +19,7 @@ require (
1919
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2020
github.com/davecgh/go-spew v1.1.1 // indirect
2121
github.com/hashicorp/go-version v1.7.0 // indirect
22+
github.com/json-iterator/go v1.1.12 // indirect
2223
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2324
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
2425
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.139.0 // indirect

pkg/translator/azure/go.sum

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/translator/azure/resourcelogs_to_logs.go

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ package azure // import "github.com/open-telemetry/opentelemetry-collector-contr
55

66
import (
77
"bytes"
8-
"encoding/json"
98
"errors"
109
"strconv"
1110
"time"
1211

13-
jsoniter "github.com/json-iterator/go"
12+
"github.com/goccy/go-json"
1413
"github.com/relvacode/iso8601"
1514
"go.opentelemetry.io/collector/pdata/pcommon"
1615
"go.opentelemetry.io/collector/pdata/plog"
@@ -64,7 +63,7 @@ type azureLogRecord struct {
6463
CallerIPAddress *string `json:"callerIpAddress"`
6564
CorrelationID *string `json:"correlationId"`
6665
Identity *any `json:"identity"`
67-
Level *json.Number `json:"Level"`
66+
Level any `json:"Level"`
6867
Location *string `json:"location"`
6968
Properties *any `json:"properties"`
7069
}
@@ -81,7 +80,7 @@ func (r ResourceLogsUnmarshaler) UnmarshalLogs(buf []byte) (plog.Logs, error) {
8180
l := plog.NewLogs()
8281

8382
var azureLogs azureRecords
84-
decoder := jsoniter.NewDecoder(bytes.NewReader(buf))
83+
decoder := json.NewDecoder(bytes.NewReader(buf))
8584
if err := decoder.Decode(&azureLogs); err != nil {
8685
return l, err
8786
}
@@ -118,9 +117,14 @@ func (r ResourceLogsUnmarshaler) UnmarshalLogs(buf []byte) (plog.Logs, error) {
118117
lr.SetTimestamp(nanos)
119118

120119
if log.Level != nil {
121-
severity := asSeverity(*log.Level)
120+
severity := asSeverity(log.Level)
122121
lr.SetSeverityNumber(severity)
123-
lr.SetSeverityText(log.Level.String())
122+
switch s := log.Level.(type) {
123+
case string:
124+
lr.SetSeverityText(s)
125+
case float64:
126+
lr.SetSeverityText(strconv.FormatFloat(s, 'f', -1, 64))
127+
}
124128
}
125129

126130
if err := lr.Attributes().FromRaw(extractRawAttributes(log)); err != nil {
@@ -165,22 +169,27 @@ func asTimestamp(s string, formats ...string) (pcommon.Timestamp, error) {
165169
// asSeverity converts the Azure log level to equivalent
166170
// OpenTelemetry severity numbers. If the log level is not
167171
// valid, then the 'Unspecified' value is returned.
168-
func asSeverity(number json.Number) plog.SeverityNumber {
169-
switch number.String() {
170-
case "Informational":
171-
return plog.SeverityNumberInfo
172-
case "Warning":
173-
return plog.SeverityNumberWarn
174-
case "Error":
175-
return plog.SeverityNumberError
176-
case "Critical":
177-
return plog.SeverityNumberFatal
178-
default:
179-
levelNumber, _ := number.Int64()
180-
if levelNumber > 0 {
181-
return plog.SeverityNumber(levelNumber)
172+
func asSeverity(number any) plog.SeverityNumber {
173+
switch l := number.(type) {
174+
case string:
175+
switch l {
176+
case "Informational":
177+
return plog.SeverityNumberInfo
178+
case "Warning":
179+
return plog.SeverityNumberWarn
180+
case "Error":
181+
return plog.SeverityNumberError
182+
case "Critical":
183+
return plog.SeverityNumberFatal
184+
default:
185+
return plog.SeverityNumberUnspecified
182186
}
183-
187+
case float64:
188+
if l > 0 {
189+
return plog.SeverityNumber(l)
190+
}
191+
return plog.SeverityNumberUnspecified
192+
default:
184193
return plog.SeverityNumberUnspecified
185194
}
186195
}

pkg/translator/azure/resourcelogs_to_logs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ func TestAsSeverity(t *testing.T) {
251251

252252
for input, expected := range tests {
253253
t.Run(input, func(t *testing.T) {
254-
assert.Equal(t, expected, asSeverity(json.Number(input)))
254+
assert.Equal(t, expected, asSeverity(input))
255255
})
256256
}
257257
}

pkg/translator/azure/resources_to_traces.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"encoding/hex"
99
"net/url"
1010

11-
jsoniter "github.com/json-iterator/go"
11+
json "github.com/goccy/go-json"
1212
"go.opentelemetry.io/collector/pdata/pcommon"
1313
"go.opentelemetry.io/collector/pdata/ptrace"
1414
conventions "go.opentelemetry.io/otel/semconv/v1.13.0"
@@ -71,7 +71,7 @@ func (r TracesUnmarshaler) UnmarshalTraces(buf []byte) (ptrace.Traces, error) {
7171
t := ptrace.NewTraces()
7272

7373
var azureTraces azureTracesRecords
74-
decoder := jsoniter.NewDecoder(bytes.NewReader(buf))
74+
decoder := json.NewDecoder(bytes.NewReader(buf))
7575
err := decoder.Decode(&azureTraces)
7676
if err != nil {
7777
return t, err

0 commit comments

Comments
 (0)