Skip to content

Commit 7f97a6e

Browse files
committed
Merge branch 'main' into ottl-xml-rename
2 parents 28b03fe + f02bdf9 commit 7f97a6e

File tree

40 files changed

+263
-150
lines changed

40 files changed

+263
-150
lines changed

.chloggen/ottl-faster-json.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: pkg/ottl
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Improved JSON unmarshaling performance by 10-20% by switching dependencies.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [35130]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

connector/countconnector/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ require (
3131
github.com/go-logr/stdr v1.2.2 // indirect
3232
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
3333
github.com/gobwas/glob v0.2.3 // indirect
34+
github.com/goccy/go-json v0.10.3 // indirect
3435
github.com/gogo/protobuf v1.3.2 // indirect
3536
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3637
github.com/google/uuid v1.6.0 // indirect

connector/countconnector/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.

connector/routingconnector/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ require (
2626
github.com/go-logr/stdr v1.2.2 // indirect
2727
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
2828
github.com/gobwas/glob v0.2.3 // indirect
29+
github.com/goccy/go-json v0.10.3 // indirect
2930
github.com/gogo/protobuf v1.3.2 // indirect
3031
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3132
github.com/google/uuid v1.6.0 // indirect

connector/routingconnector/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.

connector/sumconnector/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ require (
2727
github.com/go-logr/stdr v1.2.2 // indirect
2828
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
2929
github.com/gobwas/glob v0.2.3 // indirect
30+
github.com/goccy/go-json v0.10.3 // indirect
3031
github.com/gogo/protobuf v1.3.2 // indirect
3132
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3233
github.com/google/uuid v1.6.0 // indirect

connector/sumconnector/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.

exporter/honeycombmarkerexporter/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ require (
3434
github.com/go-logr/stdr v1.2.2 // indirect
3535
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
3636
github.com/gobwas/glob v0.2.3 // indirect
37+
github.com/goccy/go-json v0.10.3 // indirect
3738
github.com/gogo/protobuf v1.3.2 // indirect
3839
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3940
github.com/golang/snappy v0.0.4 // indirect

exporter/honeycombmarkerexporter/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.

internal/filter/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ require (
3030
github.com/go-logr/stdr v1.2.2 // indirect
3131
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
3232
github.com/gobwas/glob v0.2.3 // indirect
33+
github.com/goccy/go-json v0.10.3 // indirect
3334
github.com/gogo/protobuf v1.3.2 // indirect
3435
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3536
github.com/google/uuid v1.6.0 // indirect

0 commit comments

Comments
 (0)