From 756749034e4cf4c9ac983e143ad774cc78b3d1a0 Mon Sep 17 00:00:00 2001 From: Shubham Sawaiker Date: Tue, 8 Nov 2022 01:03:11 +0530 Subject: [PATCH 1/9] [Bug]: span tags of type int64 may lose precision #3958 Signed-off-by: Shubham Sawaiker --- model/converter/json/fixtures/domain_01.json | 5 +++++ model/converter/json/fixtures/ui_01.json | 5 +++++ model/converter/json/from_domain.go | 10 ++++++++++ 3 files changed, 20 insertions(+) diff --git a/model/converter/json/fixtures/domain_01.json b/model/converter/json/fixtures/domain_01.json index 581d3ffc23c..2c35e937789 100644 --- a/model/converter/json/fixtures/domain_01.json +++ b/model/converter/json/fixtures/domain_01.json @@ -57,6 +57,11 @@ "vType": "FLOAT64", "vFloat64": 72.5 }, + { + "key":"javascript_limit", + "vType":"INT64", + "vInt64":9223372036854775222 + }, { "key": "blob", "vType": "BINARY", diff --git a/model/converter/json/fixtures/ui_01.json b/model/converter/json/fixtures/ui_01.json index 06a61ddb6c7..fa6e34cfb19 100644 --- a/model/converter/json/fixtures/ui_01.json +++ b/model/converter/json/fixtures/ui_01.json @@ -62,6 +62,11 @@ "type": "float64", "value": 72.5 }, + { + "key":"javascript_limit", + "vType":"INT64", + "vInt64":9223372036854775222 + }, { "key": "blob", "type": "binary", diff --git a/model/converter/json/from_domain.go b/model/converter/json/from_domain.go index 2786b63a6bc..64fca0d9032 100644 --- a/model/converter/json/from_domain.go +++ b/model/converter/json/from_domain.go @@ -16,12 +16,18 @@ package json import ( + "fmt" "strings" "github.com/jaegertracing/jaeger/model" "github.com/jaegertracing/jaeger/model/json" ) +const ( + js_limit_max = 9007199254740991 + js_limit_min = -9007199254740991 +) + // FromDomain converts model.Trace into json.Trace format. // It assumes that the domain model is valid, namely that all enums // have valid values, so that it does not need to check for errors. @@ -122,6 +128,10 @@ func (fd fromDomain) convertKeyValues(keyValues model.KeyValues) []json.KeyValue value = kv.Bool() case model.Int64Type: value = kv.Int64() + if kv.Int64() > js_limit_max || kv.Int64() < js_limit_min { + kv.VType = 0 + value = fmt.Sprintf("%d", value) + } case model.Float64Type: value = kv.Float64() case model.BinaryType: From ae3f76bdcf747342f67f837ddc02b924503fbeae Mon Sep 17 00:00:00 2001 From: Shubham Sawaiker Date: Tue, 8 Nov 2022 23:07:38 +0530 Subject: [PATCH 2/9] Signed-off-by: Shubham Sawaiker [Bug]: span tags of type int64 may lose precision #3958 Signed-off-by: Shubham Sawaiker --- model/converter/json/from_domain.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/model/converter/json/from_domain.go b/model/converter/json/from_domain.go index 64fca0d9032..a11cc060eb5 100644 --- a/model/converter/json/from_domain.go +++ b/model/converter/json/from_domain.go @@ -24,8 +24,8 @@ import ( ) const ( - js_limit_max = 9007199254740991 - js_limit_min = -9007199254740991 + jsMaxSafeInteger = int64(1)<<53 - 1 + jsMinSafeInteger = -jsMaxSafeInteger ) // FromDomain converts model.Trace into json.Trace format. @@ -128,7 +128,7 @@ func (fd fromDomain) convertKeyValues(keyValues model.KeyValues) []json.KeyValue value = kv.Bool() case model.Int64Type: value = kv.Int64() - if kv.Int64() > js_limit_max || kv.Int64() < js_limit_min { + if kv.Int64() > jsMaxSafeInteger || kv.Int64() < jsMinSafeInteger { kv.VType = 0 value = fmt.Sprintf("%d", value) } From ca26556bdac04ec33404fac7e1d1749e9e40e8b7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 00:52:59 -0500 Subject: [PATCH 3/9] Bump github.com/spf13/viper from 1.13.0 to 1.14.0 (#4027) Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.13.0 to 1.14.0. - [Release notes](https://github.com/spf13/viper/releases) - [Commits](https://github.com/spf13/viper/compare/v1.13.0...v1.14.0) --- updated-dependencies: - dependency-name: github.com/spf13/viper dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Shubham Sawaiker --- go.mod | 8 ++++---- go.sum | 23 ++++++++++++----------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index c7c71a6d178..63747d6c645 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,7 @@ require ( github.com/soheilhy/cmux v0.1.5 github.com/spf13/cobra v1.6.1 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.13.0 + github.com/spf13/viper v1.14.0 github.com/stretchr/testify v1.8.1 github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/uber/jaeger-lib v2.4.1+incompatible @@ -55,7 +55,7 @@ require ( go.uber.org/atomic v1.10.0 go.uber.org/automaxprocs v1.5.1 go.uber.org/zap v1.23.0 - golang.org/x/net v0.0.0-20220926192436-02166a98028e + golang.org/x/net v0.0.0-20221014081412-f15817d10f9b golang.org/x/sys v0.0.0-20221010170243-090e33056c14 google.golang.org/grpc v1.50.1 google.golang.org/protobuf v1.28.1 @@ -130,7 +130,7 @@ require ( github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/spf13/afero v1.8.2 // indirect + github.com/spf13/afero v1.9.2 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/stretchr/objx v0.5.0 // indirect @@ -146,7 +146,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect golang.org/x/text v0.4.0 // indirect - google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect + google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 5f20e2528ac..76625f530e6 100644 --- a/go.sum +++ b/go.sum @@ -17,14 +17,15 @@ cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHOb cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= -cloud.google.com/go v0.100.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y= +cloud.google.com/go v0.104.0 h1:gSmWO7DY1vOm0MVU6DNXM11BWHHsTUmsC5cv1fuW5X8= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.6.1 h1:2sMmt8prCn7DPaG4Pmh0N3Inmc8cT8ae5k1M6VJ9Wqc= +cloud.google.com/go/compute v1.12.1 h1:gKVJMEyqV5c/UnpzjjQbo3Rjvvqpr9B1DFSbJC4OXr0= +cloud.google.com/go/compute/metadata v0.2.1 h1:efOwf5ymceDhK6PKMnnrTHP4pppY5L22mle96M1yP48= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -634,8 +635,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= -github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= +github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= @@ -650,8 +651,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.13.0 h1:BWSJ/M+f+3nmdz9bxB+bWX28kkALN2ok11D0rSo8EJU= -github.com/spf13/viper v1.13.0/go.mod h1:Icm2xNL3/8uyh/wFuB1jI7TiTNKp8632Nwegu+zgdYw= +github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= +github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -849,8 +850,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= -golang.org/x/net v0.0.0-20220926192436-02166a98028e h1:I51lVG9ykW5AQeTE50sJ0+gJCAF0J78Hf1+1VUCGxDI= -golang.org/x/net v0.0.0-20220926192436-02166a98028e/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU= +golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -862,7 +863,7 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE= +golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1102,8 +1103,8 @@ google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc h1:Nf+EdcTLHR8qDNN/KfkQL0u0ssxt9OhbaWCl5C0ucEI= -google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= +google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e h1:S9GbmC1iCgvbLyAokVCwiO6tVIrU9Y7c5oMx1V/ki/Y= +google.golang.org/genproto v0.0.0-20221024183307-1bc688fe9f3e/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= From 432a9ad949b6d80b7c3b90ee2a94741d4823f9de Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 00:53:11 -0500 Subject: [PATCH 4/9] Bump github.com/dgraph-io/badger/v3 from 3.2103.3 to 3.2103.4 (#4026) Bumps [github.com/dgraph-io/badger/v3](https://github.com/dgraph-io/badger) from 3.2103.3 to 3.2103.4. - [Release notes](https://github.com/dgraph-io/badger/releases) - [Changelog](https://github.com/dgraph-io/badger/blob/main/CHANGELOG.md) - [Commits](https://github.com/dgraph-io/badger/compare/v3.2103.3...v3.2103.4) --- updated-dependencies: - dependency-name: github.com/dgraph-io/badger/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Shubham Sawaiker --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 63747d6c645..f336337ef94 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/apache/thrift v0.17.0 github.com/bsm/sarama-cluster v2.1.13+incompatible github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b - github.com/dgraph-io/badger/v3 v3.2103.3 + github.com/dgraph-io/badger/v3 v3.2103.4 github.com/fsnotify/fsnotify v1.6.0 github.com/go-kit/kit v0.12.0 github.com/go-openapi/errors v0.20.2 diff --git a/go.sum b/go.sum index 76625f530e6..7dd06e3fdc8 100644 --- a/go.sum +++ b/go.sum @@ -125,8 +125,8 @@ github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgraph-io/badger/v3 v3.2103.3 h1:s63J1pisDhKpzWslXFe+ChuthuZptpwTE6qEKoczPb4= -github.com/dgraph-io/badger/v3 v3.2103.3/go.mod h1:4MPiseMeDQ3FNCYwRbbcBOGJLf5jsE0PPFzRiKjtcdw= +github.com/dgraph-io/badger/v3 v3.2103.4 h1:WE1B07YNTTJTtG9xjBcSW2wn0RJLyiV99h959RKZqM4= +github.com/dgraph-io/badger/v3 v3.2103.4/go.mod h1:4MPiseMeDQ3FNCYwRbbcBOGJLf5jsE0PPFzRiKjtcdw= github.com/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczCTSixgIKmwPv6+wP5DGjqLYw5SUiA= From 1e20b194ce56c1682d4aca4e1ee93313e8b4b79c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 00:53:25 -0500 Subject: [PATCH 5/9] Bump github/codeql-action from 2.1.29 to 2.1.31 (#4025) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.1.29 to 2.1.31. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/ec3cf9c605b848da5f1e41e8452719eb1ccfb9a6...c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Shubham Sawaiker --- .github/workflows/codeql.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index dbd19f83c2b..08a509f2cd3 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -39,7 +39,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@ec3cf9c605b848da5f1e41e8452719eb1ccfb9a6 + uses: github/codeql-action/init@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -48,7 +48,7 @@ jobs: # queries: ./path/to/local/query, your-org/your-repo/queries@main - name: Autobuild - uses: github/codeql-action/autobuild@ec3cf9c605b848da5f1e41e8452719eb1ccfb9a6 + uses: github/codeql-action/autobuild@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@ec3cf9c605b848da5f1e41e8452719eb1ccfb9a6 + uses: github/codeql-action/analyze@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 From 28ffca5b0b4cb6f60dd4ff9386bb96cfae5128e4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 00:53:49 -0500 Subject: [PATCH 6/9] Bump anchore/sbom-action from 0.13.0 to 0.13.1 (#4024) Bumps [anchore/sbom-action](https://github.com/anchore/sbom-action) from 0.13.0 to 0.13.1. - [Release notes](https://github.com/anchore/sbom-action/releases) - [Commits](https://github.com/anchore/sbom-action/compare/b7e8507c6a3c89b7099a0198366d862c8f3ad8f1...06e109483e6aa305a2b2395eabae554e51530e1d) --- updated-dependencies: - dependency-name: anchore/sbom-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Signed-off-by: Shubham Sawaiker --- .github/workflows/ci-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index b3660c1d8a1..ae6e93539ef 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -79,6 +79,6 @@ jobs: QUAY_TOKEN: ${{ secrets.QUAY_TOKEN }} - name: SBOM Generation - uses: anchore/sbom-action@b7e8507c6a3c89b7099a0198366d862c8f3ad8f1 + uses: anchore/sbom-action@06e109483e6aa305a2b2395eabae554e51530e1d with: artifact-name: jaeger-SBOM.spdx.json From b1d5a1cfe21b7664aebb037cd90100645147f2cf Mon Sep 17 00:00:00 2001 From: Shubham Sawaiker Date: Wed, 9 Nov 2022 01:02:32 +0530 Subject: [PATCH 7/9] [Bug]: span tags of type int64 may lose precision Signed-off-by: Shubham Sawaiker --- model/converter/json/from_domain.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/model/converter/json/from_domain.go b/model/converter/json/from_domain.go index a11cc060eb5..6ed1d119c20 100644 --- a/model/converter/json/from_domain.go +++ b/model/converter/json/from_domain.go @@ -121,6 +121,10 @@ func (fd fromDomain) convertKeyValues(keyValues model.KeyValues) []json.KeyValue out := make([]json.KeyValue, len(keyValues)) for i, kv := range keyValues { var value interface{} + var jsflag bool = false + if kv.Int64() > jsMaxSafeInteger || kv.Int64() < jsMinSafeInteger { + jsflag = true + } switch kv.VType { case model.StringType: value = kv.VStr @@ -128,8 +132,7 @@ func (fd fromDomain) convertKeyValues(keyValues model.KeyValues) []json.KeyValue value = kv.Bool() case model.Int64Type: value = kv.Int64() - if kv.Int64() > jsMaxSafeInteger || kv.Int64() < jsMinSafeInteger { - kv.VType = 0 + if jsflag { value = fmt.Sprintf("%d", value) } case model.Float64Type: From e20eddbdf40fd68385154c8e56923fc0e0ad89b1 Mon Sep 17 00:00:00 2001 From: Shubham Sawaiker Date: Wed, 9 Nov 2022 01:16:55 +0530 Subject: [PATCH 8/9] Signed-off-by: Shubham Sawaiker [Bug]: span tags of type int64 may lose precision --- model/converter/json/fixtures/domain_01.json | 6 +++--- model/converter/json/fixtures/ui_01.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/model/converter/json/fixtures/domain_01.json b/model/converter/json/fixtures/domain_01.json index 2c35e937789..0193d43f842 100644 --- a/model/converter/json/fixtures/domain_01.json +++ b/model/converter/json/fixtures/domain_01.json @@ -58,9 +58,9 @@ "vFloat64": 72.5 }, { - "key":"javascript_limit", - "vType":"INT64", - "vInt64":9223372036854775222 + "key": "javascript_limit", + "vType": "INT64", + "vInt64": 9223372036854775222 }, { "key": "blob", diff --git a/model/converter/json/fixtures/ui_01.json b/model/converter/json/fixtures/ui_01.json index fa6e34cfb19..7cc55463d36 100644 --- a/model/converter/json/fixtures/ui_01.json +++ b/model/converter/json/fixtures/ui_01.json @@ -63,9 +63,9 @@ "value": 72.5 }, { - "key":"javascript_limit", - "vType":"INT64", - "vInt64":9223372036854775222 + "key": "javascript_limit", + "type": "int64", + "value": "9223372036854775222" }, { "key": "blob", From a95117a978a79a69b1272365bb4b97ce07b6b753 Mon Sep 17 00:00:00 2001 From: Shubham Sawaiker Date: Wed, 9 Nov 2022 02:06:00 +0530 Subject: [PATCH 9/9] Signed-off-by: Shubham Sawaiker [Bug]: span tags of type int64 may lose precision --- model/converter/json/from_domain.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/model/converter/json/from_domain.go b/model/converter/json/from_domain.go index 6ed1d119c20..26c2e47d6f0 100644 --- a/model/converter/json/from_domain.go +++ b/model/converter/json/from_domain.go @@ -121,10 +121,6 @@ func (fd fromDomain) convertKeyValues(keyValues model.KeyValues) []json.KeyValue out := make([]json.KeyValue, len(keyValues)) for i, kv := range keyValues { var value interface{} - var jsflag bool = false - if kv.Int64() > jsMaxSafeInteger || kv.Int64() < jsMinSafeInteger { - jsflag = true - } switch kv.VType { case model.StringType: value = kv.VStr @@ -132,7 +128,7 @@ func (fd fromDomain) convertKeyValues(keyValues model.KeyValues) []json.KeyValue value = kv.Bool() case model.Int64Type: value = kv.Int64() - if jsflag { + if kv.Int64() > jsMaxSafeInteger || kv.Int64() < jsMinSafeInteger { value = fmt.Sprintf("%d", value) } case model.Float64Type: