Skip to content

Commit efbf6f5

Browse files
yaroliakhyaroliakh
authored
Merge branch 'main' into kafkaexporter_zipkin_encoding
2 parents e5d57fe + 44e1f67 commit efbf6f5

File tree

40 files changed

+94
-64
lines changed

40 files changed

+94
-64
lines changed

‎cmd/configschema/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ require (
270270
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
271271
github.com/aliyun/aliyun-log-go-sdk v0.1.50 // indirect
272272
github.com/andybalholm/brotli v1.0.5 // indirect
273-
github.com/antonmedv/expr v1.12.5 // indirect
273+
github.com/antonmedv/expr v1.12.7 // indirect
274274
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
275275
github.com/apache/pulsar-client-go v0.8.1 // indirect
276276
github.com/apache/pulsar-client-go/oauth2 v0.0.0-20220120090717-25e59572242e // indirect

‎cmd/configschema/go.sum

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

‎cmd/otelcontribcol/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ require (
289289
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
290290
github.com/aliyun/aliyun-log-go-sdk v0.1.50 // indirect
291291
github.com/andybalholm/brotli v1.0.5 // indirect
292-
github.com/antonmedv/expr v1.12.5 // indirect
292+
github.com/antonmedv/expr v1.12.7 // indirect
293293
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
294294
github.com/apache/pulsar-client-go v0.8.1 // indirect
295295
github.com/apache/pulsar-client-go/oauth2 v0.0.0-20220120090717-25e59572242e // indirect

‎cmd/otelcontribcol/go.sum

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

‎cmd/oteltestbedcol/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ require (
6565
github.com/Microsoft/go-winio v0.6.0 // indirect
6666
github.com/alecthomas/participle/v2 v2.0.0 // indirect
6767
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
68-
github.com/antonmedv/expr v1.12.5 // indirect
68+
github.com/antonmedv/expr v1.12.7 // indirect
6969
github.com/apache/thrift v0.18.1 // indirect
7070
github.com/armon/go-metrics v0.4.1 // indirect
7171
github.com/aws/aws-sdk-go v1.44.309 // indirect

‎cmd/oteltestbedcol/go.sum

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

‎exporter/datadogexporter/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ require (
6565
github.com/DataDog/zstd v1.5.2 // indirect
6666
github.com/Microsoft/go-winio v0.6.1 // indirect
6767
github.com/Showmax/go-fqdn v1.0.0 // indirect
68-
github.com/antonmedv/expr v1.12.5 // indirect
68+
github.com/antonmedv/expr v1.12.7 // indirect
6969
github.com/armon/go-metrics v0.4.1 // indirect
7070
github.com/benbjohnson/clock v1.3.0 // indirect
7171
github.com/beorn7/perks v1.0.1 // indirect

‎exporter/datadogexporter/go.sum

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

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ require (
267267
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
268268
github.com/aliyun/aliyun-log-go-sdk v0.1.50 // indirect
269269
github.com/andybalholm/brotli v1.0.5 // indirect
270-
github.com/antonmedv/expr v1.12.5 // indirect
270+
github.com/antonmedv/expr v1.12.7 // indirect
271271
github.com/apache/arrow/go/arrow v0.0.0-20211112161151-bc219186db40 // indirect
272272
github.com/apache/pulsar-client-go v0.8.1 // indirect
273273
github.com/apache/pulsar-client-go/oauth2 v0.0.0-20220120090717-25e59572242e // indirect

‎go.sum

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

0 commit comments

Comments
 (0)