From adfb97cdfb8ae95ecd1f9bea0a935fc64064f368 Mon Sep 17 00:00:00 2001 From: Rakshit Parashar <34675136+ChillOrb@users.noreply.github.com> Date: Sun, 19 Mar 2023 10:14:38 -0700 Subject: [PATCH 1/6] Allow SPM to pass bearer token to Prometheus #4247 (#4295) ## Which problem is this PR solving? - Resolves #4219 ## Short description of the changes - Follow up to #4247 --------- Signed-off-by: ChillOrb Signed-off-by: Yuri Shkuro Co-authored-by: Yuri Shkuro --- pkg/prometheus/config/config.go | 1 + plugin/metrics/prometheus/factory_test.go | 37 +++++++++----- .../metrics/prometheus/metricsstore/reader.go | 21 +++++++- .../prometheus/metricsstore/reader_test.go | 50 ++++++++++++++++++- plugin/metrics/prometheus/options.go | 10 ++-- 5 files changed, 100 insertions(+), 19 deletions(-) diff --git a/pkg/prometheus/config/config.go b/pkg/prometheus/config/config.go index 6560f51fd9a7..9cb84f780615 100644 --- a/pkg/prometheus/config/config.go +++ b/pkg/prometheus/config/config.go @@ -25,4 +25,5 @@ type Configuration struct { ServerURL string ConnectTimeout time.Duration TLS tlscfg.Options + TokenFilePath string } diff --git a/plugin/metrics/prometheus/factory_test.go b/plugin/metrics/prometheus/factory_test.go index 957d8142c224..aeedd9fe2932 100644 --- a/plugin/metrics/prometheus/factory_test.go +++ b/plugin/metrics/prometheus/factory_test.go @@ -50,22 +50,35 @@ func TestPrometheusFactory(t *testing.T) { func TestWithDefaultConfiguration(t *testing.T) { f := NewFactory() - assert.Equal(t, f.options.Primary.ServerURL, "http://localhost:9090") - assert.Equal(t, f.options.Primary.ConnectTimeout, 30*time.Second) + assert.Equal(t, "http://localhost:9090", f.options.Primary.ServerURL) + assert.Equal(t, 30*time.Second, f.options.Primary.ConnectTimeout) } func TestWithConfiguration(t *testing.T) { - f := NewFactory() - v, command := config.Viperize(f.AddFlags) - err := command.ParseFlags([]string{ - "--prometheus.server-url=http://localhost:1234", - "--prometheus.connect-timeout=5s", + t.Run("With custom configuration and no space in token file path", func(t *testing.T) { + f := NewFactory() + v, command := config.Viperize(f.AddFlags) + err := command.ParseFlags([]string{ + "--prometheus.server-url=http://localhost:1234", + "--prometheus.connect-timeout=5s", + "--prometheus.token-file=test/test_file.txt", + }) + require.NoError(t, err) + f.InitFromViper(v, zap.NewNop()) + assert.Equal(t, "http://localhost:1234", f.options.Primary.ServerURL) + assert.Equal(t, 5*time.Second, f.options.Primary.ConnectTimeout) + assert.Equal(t, "test/test_file.txt", f.options.Primary.TokenFilePath) + }) + t.Run("With space in token file path", func(t *testing.T) { + f := NewFactory() + v, command := config.Viperize(f.AddFlags) + err := command.ParseFlags([]string{ + "--prometheus.token-file=test/ test file.txt", + }) + require.NoError(t, err) + f.InitFromViper(v, zap.NewNop()) + assert.Equal(t, "test/ test file.txt", f.options.Primary.TokenFilePath) }) - require.NoError(t, err) - - f.InitFromViper(v, zap.NewNop()) - assert.Equal(t, f.options.Primary.ServerURL, "http://localhost:1234") - assert.Equal(t, f.options.Primary.ConnectTimeout, 5*time.Second) } func TestFailedTLSOptions(t *testing.T) { diff --git a/plugin/metrics/prometheus/metricsstore/reader.go b/plugin/metrics/prometheus/metricsstore/reader.go index e5d3b7af203e..06f9ec59d0d5 100644 --- a/plugin/metrics/prometheus/metricsstore/reader.go +++ b/plugin/metrics/prometheus/metricsstore/reader.go @@ -20,6 +20,8 @@ import ( "fmt" "net" "net/http" + "os" + "path/filepath" "strings" "time" "unicode" @@ -252,7 +254,6 @@ func getHTTPRoundTripper(c *config.Configuration, logger *zap.Logger) (rt http.R return nil, err } } - // KeepAlive and TLSHandshake timeouts are kept to existing Prometheus client's // DefaultRoundTripper to simplify user configuration and may be made configurable when required. httpTransport := &http.Transport{ @@ -264,8 +265,26 @@ func getHTTPRoundTripper(c *config.Configuration, logger *zap.Logger) (rt http.R TLSHandshakeTimeout: 10 * time.Second, TLSClientConfig: ctlsConfig, } + + token := "" + if c.TokenFilePath != "" { + tokenFromFile, err := loadToken(c.TokenFilePath) + if err != nil { + return nil, err + } + token = tokenFromFile + } return bearertoken.RoundTripper{ Transport: httpTransport, OverrideFromCtx: true, + StaticToken: token, }, nil } + +func loadToken(path string) (string, error) { + b, err := os.ReadFile(filepath.Clean(path)) + if err != nil { + return "", fmt.Errorf("failed to get token from file: %w", err) + } + return strings.TrimRight(string(b), "\r\n"), nil +} diff --git a/plugin/metrics/prometheus/metricsstore/reader_test.go b/plugin/metrics/prometheus/metricsstore/reader_test.go index 3ecd96ea3c3a..737dd177a7d6 100644 --- a/plugin/metrics/prometheus/metricsstore/reader_test.go +++ b/plugin/metrics/prometheus/metricsstore/reader_test.go @@ -314,7 +314,7 @@ func TestWarningResponse(t *testing.T) { assert.NotNil(t, m) } -func TestGetRoundTripper(t *testing.T) { +func TestGetRoundTripperTLSConfig(t *testing.T) { for _, tc := range []struct { name string tlsEnabled bool @@ -325,7 +325,6 @@ func TestGetRoundTripper(t *testing.T) { t.Run(tc.name, func(t *testing.T) { logger := zap.NewNop() rt, err := getHTTPRoundTripper(&config.Configuration{ - ServerURL: "https://localhost:1234", ConnectTimeout: 9 * time.Millisecond, TLS: tlscfg.Options{ Enabled: tc.tlsEnabled, @@ -357,6 +356,53 @@ func TestGetRoundTripper(t *testing.T) { } } +func TestGetRoundTripperToken(t *testing.T) { + const wantBearer = "token from file" + + file, err := os.CreateTemp("", "token_") + require.NoError(t, err) + defer func() { assert.NoError(t, os.Remove(file.Name())) }() + + _, err = file.Write([]byte(wantBearer)) + require.NoError(t, err) + require.NoError(t, file.Close()) + + rt, err := getHTTPRoundTripper(&config.Configuration{ + ConnectTimeout: time.Second, + TokenFilePath: file.Name(), + }, nil) + require.NoError(t, err) + server := httptest.NewServer( + http.HandlerFunc( + func(w http.ResponseWriter, r *http.Request) { + assert.Equal(t, "Bearer "+wantBearer, r.Header.Get("Authorization")) + }, + ), + ) + defer server.Close() + ctx := context.Background() + req, err := http.NewRequestWithContext( + ctx, + http.MethodGet, + server.URL, + nil, + ) + require.NoError(t, err) + resp, err := rt.RoundTrip(req) + require.NoError(t, err) + assert.Equal(t, http.StatusOK, resp.StatusCode) +} + +func TestGetRoundTripperTokenError(t *testing.T) { + tokenFilePath := "this file does not exist" + + _, err := getHTTPRoundTripper(&config.Configuration{ + TokenFilePath: tokenFilePath, + }, nil) + require.Error(t, err) + assert.Contains(t, err.Error(), "failed to get token from file") +} + func TestInvalidCertFile(t *testing.T) { logger := zap.NewNop() reader, err := NewMetricsReader(logger, config.Configuration{ diff --git a/plugin/metrics/prometheus/options.go b/plugin/metrics/prometheus/options.go index ad13f6ee0e99..fb33dc986be2 100644 --- a/plugin/metrics/prometheus/options.go +++ b/plugin/metrics/prometheus/options.go @@ -27,11 +27,12 @@ import ( ) const ( - suffixServerURL = ".server-url" - suffixConnectTimeout = ".connect-timeout" - + suffixServerURL = ".server-url" + suffixConnectTimeout = ".connect-timeout" + suffixTokenFilePath = ".token-file" defaultServerURL = "http://localhost:9090" defaultConnectTimeout = 30 * time.Second + defaultTokenFilePath = "" ) type namespaceConfig struct { @@ -64,7 +65,7 @@ func (opt *Options) AddFlags(flagSet *flag.FlagSet) { nsConfig := &opt.Primary flagSet.String(nsConfig.namespace+suffixServerURL, defaultServerURL, "The Prometheus server's URL, must include the protocol scheme e.g. http://localhost:9090") flagSet.Duration(nsConfig.namespace+suffixConnectTimeout, defaultConnectTimeout, "The period to wait for a connection to Prometheus when executing queries.") - + flagSet.String(nsConfig.namespace+suffixTokenFilePath, defaultTokenFilePath, "The path to a file containing the bearer token which will be included when executing queries against the Prometheus API.") nsConfig.getTLSFlagsConfig().AddFlags(flagSet) } @@ -73,6 +74,7 @@ func (opt *Options) InitFromViper(v *viper.Viper) error { cfg := &opt.Primary cfg.ServerURL = stripWhiteSpace(v.GetString(cfg.namespace + suffixServerURL)) cfg.ConnectTimeout = v.GetDuration(cfg.namespace + suffixConnectTimeout) + cfg.TokenFilePath = v.GetString(cfg.namespace + suffixTokenFilePath) var err error cfg.TLS, err = cfg.getTLSFlagsConfig().InitFromViper(v) if err != nil { From 5ac3d8e365370e173c6a3887c47bd4c5ce21cd82 Mon Sep 17 00:00:00 2001 From: Shubham Sawaiker <39957099+shubbham1219@users.noreply.github.com> Date: Sun, 19 Mar 2023 22:49:24 +0530 Subject: [PATCH 2/6] #4163 | Speed-up CI by using published UI artifacts (#4314) Which problem is this PR solving? Resolves https://github.com/jaegertracing/jaeger/issues/4163 Short description of the changes Issues raised by the previous pull request at https://github.com/jaegertracing/jaeger/pull/4251 --------- Signed-off-by: shubbham1215 Signed-off-by: Yuri Shkuro Co-authored-by: Yuri Shkuro --- scripts/rebuild-ui.sh | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/scripts/rebuild-ui.sh b/scripts/rebuild-ui.sh index 7134f47067a8..05acafdd0cf1 100644 --- a/scripts/rebuild-ui.sh +++ b/scripts/rebuild-ui.sh @@ -4,16 +4,26 @@ set -euxf -o pipefail cd jaeger-ui -tag=$(git describe --exact-match --tags) -if [[ "$tag" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - temp_file=$(mktemp) - trap "rm -f ${temp_file}" EXIT - release_url="https://github.com/jaegertracing/jaeger-ui/releases/download/${tag}/assets.tar.gz" - if curl --silent --fail --location --output "$temp_file" "$release_url"; then - mkdir -p packages/jaeger-ui/build/ - tar -zxvf "$temp_file" packages/jaeger-ui/build/ - exit 0 +LAST_TAG=$(git describe --abbrev=0 --tags 2>/dev/null) +BRANCH_HASH=$(git rev-parse HEAD) +LAST_TAG_HASH=$(git rev-parse $LAST_TAG) + +if [[ "$BRANCH_HASH" == "$LAST_TAG_HASH" ]]; then + + if [[ "$LAST_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then + temp_file=$(mktemp) + trap "rm -f ${temp_file}" EXIT + release_url="https://github.com/jaegertracing/jaeger-ui/releases/download/${LAST_TAG}/assets.tar.gz" + if curl --silent --fail --location --output "$temp_file" "$release_url"; then + + mkdir -p packages/jaeger-ui/build/ + rm -r -f packages/jaeger-ui/build/ + tar -zxvf "$temp_file" packages/jaeger-ui/build/ + exit 0 + + fi fi + fi # do a regular full build From 8830672c1f28b30ddd0bff8f0710b2043c6e58d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 01:54:00 -0400 Subject: [PATCH 3/6] Bump go.uber.org/automaxprocs from 1.5.1 to 1.5.2 (#4317) Bumps [go.uber.org/automaxprocs](https://github.com/uber-go/automaxprocs) from 1.5.1 to 1.5.2.
Release notes

Sourced from go.uber.org/automaxprocs's releases.

v1.5.2

  • Support child control cgroups
  • Fix file descriptor leak
  • Update dependencies
Changelog

Sourced from go.uber.org/automaxprocs's changelog.

v1.5.2 (2023-03-16)

  • Support child control cgroups
  • Fix file descriptor leak
  • Update dependencies
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=go.uber.org/automaxprocs&package-manager=go_modules&previous-version=1.5.1&new-version=1.5.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0f1a05f31119..0eac1ced40f0 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( go.opentelemetry.io/otel/sdk v1.14.0 go.opentelemetry.io/otel/trace v1.14.0 go.uber.org/atomic v1.10.0 - go.uber.org/automaxprocs v1.5.1 + go.uber.org/automaxprocs v1.5.2 go.uber.org/zap v1.24.0 golang.org/x/net v0.7.0 golang.org/x/sys v0.6.0 diff --git a/go.sum b/go.sum index 7cbcd1fad058..74dcd30c7ff9 100644 --- a/go.sum +++ b/go.sum @@ -767,8 +767,8 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/automaxprocs v1.5.1 h1:e1YG66Lrk73dn4qhg8WFSvhF0JuFQF0ERIp4rpuV8Qk= -go.uber.org/automaxprocs v1.5.1/go.mod h1:BF4eumQw0P9GtnuxxovUd06vwm1o18oMzFtK66vU6XU= +go.uber.org/automaxprocs v1.5.2 h1:2LxUOGiR3O6tw8ui5sZa2LAaHnsviZdVOUZw4fvbnME= +go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= From e0590e892dc5677e472f0293a5f406a0860a3af0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 06:15:24 +0000 Subject: [PATCH 4/6] Bump github.com/grpc-ecosystem/go-grpc-middleware from 1.3.0 to 1.4.0 (#4306) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [github.com/grpc-ecosystem/go-grpc-middleware](https://github.com/grpc-ecosystem/go-grpc-middleware) from 1.3.0 to 1.4.0.
Release notes

Sourced from github.com/grpc-ecosystem/go-grpc-middleware's releases.

v1.4.0

What's Changed

New Contributors

Full Changelog: https://github.com/grpc-ecosystem/go-grpc-middleware/compare/v1.3.0...v1.4.0

Commits
  • d42ae9d v1: Mentioned v2 in README; fixed CI; removed changelog (we will use release ...
  • da1b13e Update nicemd.go (#539)
  • 99612e8 Fix OSX build error in outdated golang.org/x/sys dependency (#514)
  • 7c811bc fix typo in nicemd (#509)
  • 854bd94 use strconv.FormatUint instead of fmt.Sprintf (#503)
  • 7fdae0e Fix memory leakage in kit.PayloadUnaryServerInterceptor (#501)
  • 6aeac52 fix some typos (#493)
  • 68c8cdc Add OpenTelemetry interceptors (#491)
  • 560829f Fix: middleware unary chain order (#464)
  • b6d97fa Improve zap grpc logger documentation on verbosity levels (#456)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/grpc-ecosystem/go-grpc-middleware&package-manager=go_modules&previous-version=1.3.0&new-version=1.4.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 0eac1ced40f0..545627084e9e 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/golang/protobuf v1.5.2 github.com/gorilla/handlers v1.5.1 github.com/gorilla/mux v1.8.0 - github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 + github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 github.com/hashicorp/go-hclog v1.4.0 diff --git a/go.sum b/go.sum index 74dcd30c7ff9..b6fd17e28887 100644 --- a/go.sum +++ b/go.sum @@ -81,6 +81,7 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72H github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -339,8 +340,8 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= @@ -763,19 +764,18 @@ go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+go go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/automaxprocs v1.5.2 h1:2LxUOGiR3O6tw8ui5sZa2LAaHnsviZdVOUZw4fvbnME= go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -978,6 +978,7 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1026,6 +1027,7 @@ golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= From dc7f907bc30ea2b61c0190406247f971e388fa74 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 05:55:01 +0000 Subject: [PATCH 5/6] Bump github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger from 0.73.0 to 0.74.0 (#4321) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger](https://github.com/open-telemetry/opentelemetry-collector-contrib) from 0.73.0 to 0.74.0.
Release notes

Sourced from github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger's releases.

v0.74.0

The OpenTelemetry Collector Contrib contains everything in the opentelemetry-collector release, be sure to check the release notes there as well.

Changelog

Sourced from github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger's changelog.

v0.74.0

🛑 Breaking changes 🛑

  • k8sattributes: Remove support of deprecated pod_association fields (#19642) Fields are now nested under the pod_association::sources

  • k8sattributes: Remove support of deprecated options in extract.metadata field (#19438)

  • spanmetricsconnector: Remove deprecated latency_histogram_buckets configuration parameter. (#19372) Use the histogram configuration section to provide buckets for explicit buckets histogram metrics.

  • spanmetricsconnector: Rename latency histogram metrics to duration. (#19214)

🚩 Deprecations 🚩

  • spanmetricsprocessor: Deprecate the spanmetrics processor in favour of the spanmetrics connector. (#19736) Please note that the spanmetrics connector contains breaking changes related to configurations metrics names and attributes. Please see the spanmetrics connector README for more information.

🚀 New components 🚀

  • lokireceiver: The Loki receiver implements the Loki push api as specified here (#18635)
  • cloudflarereceiver: Adds support for receiving logs from Cloudflare's LogPush API. (#19201)
  • webhookeventreceiver: New component wireframe for webhookeventreceiver (#18101)
  • spanmetricsconnector: Add the spanmetricsconnector connector to build. (#18760)

💡 Enhancements 💡

  • exporter/awsemfexporter: Add ServiceName/service.name as a valid token replacement in log_stream_name (#16531)

  • azureeventhubreceiver: Add the ability to consume Metrics from Azure Diagnostic Settings and convert them into OpenTelemetry Metrics (#18690)

  • mdatagen: use metadata to generate status table (#19175) This change updates mdatagen to support auto-generation of the stability level table in the documentation. It also generates a generated_status.go file which contains the stability which is used in the factory of a component.

  • mdatagen: Allow mdatagen to support components that do not produce metrics. (#19772) This allows us to define metadata.yaml files for components that don't generate metrics, specifically in support of generating the status table.

  • countconnector: Add ability to count by attributes (#19432)

  • healthcheckextension: Add response_body configuration option that allows specifying a specific response body (#18824)

  • k8sobjectsreceiver: Enabling resource version filter on pull mode (#18828)

  • kubeletstatsreceiver: Add support for kubeConfig auth_type in kubeletstatsreceiver (#17562)

  • translator/loki: Loki add raw log export format (#18888)

  • clickhouseexporter: Improve clickhouse DSN parsing (#18079) Improve clickhouse DSN parsing to support all possible configuration options and fixes TLS support.

  • routingprocessor: Adds new error_mode configuration option that allows specifying how errors returned by OTTL statements should be handled. (#19147) If a condition errors when using ignore the payload will be routed to the default exporter.

  • spanmetricsconnector: Set resource attributes for generated metrics. (#18502)

  • spanmetricsconnector: Add optional seconds unit support for recording generated duration measurements. (#18698) The unit is configurable. The allowed values are ms and s. The default unit is ms.

... (truncated)

Commits
  • f08863c Prepare v0.74.0 - update otelcol core (#19799)
  • e4a2605 [receiver/apache] update to use generated status (#19770)
  • 0141826 [receiver/aerospike] update to use generated status (#19771)
  • dde97b5 [receiver/azureeventhub] add metric support (#19436)
  • c4c631f [chore][receiver/postgresql] update to use generated status (#19788)
  • 25cbf9d [receiver/loki] Added new component (#19399)
  • 0aea76a [cmd/mdatagen] [chore] Fix Test_inlineReplace on Windows (#19784)
  • 5015dea [receiver/activedirectory] update to use generated status (#19768)
  • 538c1ca [chore][receiver/oracledb] update to use generated status (#19787)
  • 4606525 [mdatagen] only generate metrics if metrics are present (#19772)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger&package-manager=go_modules&previous-version=0.73.0&new-version=0.74.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
--------- Signed-off-by: dependabot[bot] Signed-off-by: Yuri Shkuro Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Yuri Shkuro --- go.mod | 32 ++++++++++++++--------------- go.sum | 63 +++++++++++++++++++++++++++++----------------------------- 2 files changed, 48 insertions(+), 47 deletions(-) diff --git a/go.mod b/go.mod index 545627084e9e..30499176f05b 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/gocql/gocql v1.3.1 github.com/gogo/googleapis v1.4.1 github.com/gogo/protobuf v1.3.2 - github.com/golang/protobuf v1.5.2 + github.com/golang/protobuf v1.5.3 github.com/gorilla/handlers v1.5.1 github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 @@ -31,7 +31,7 @@ require ( github.com/hashicorp/go-plugin v1.4.8 github.com/kr/pretty v0.3.1 github.com/olivere/elastic v6.2.37+incompatible - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.73.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.74.0 github.com/opentracing-contrib/go-grpc v0.0.0-20230205024533-5ced129e5996 github.com/opentracing-contrib/go-stdlib v1.0.0 github.com/opentracing/opentracing-go v1.2.0 @@ -47,13 +47,13 @@ require ( github.com/uber/jaeger-client-go v2.30.0+incompatible github.com/uber/jaeger-lib v2.4.1+incompatible github.com/xdg-go/scram v1.1.2 - go.opentelemetry.io/collector v0.73.0 - go.opentelemetry.io/collector/component v0.73.0 - go.opentelemetry.io/collector/consumer v0.73.0 - go.opentelemetry.io/collector/pdata v1.0.0-rc7 - go.opentelemetry.io/collector/receiver v0.73.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.73.0 - go.opentelemetry.io/collector/semconv v0.73.0 + go.opentelemetry.io/collector v0.74.0 + go.opentelemetry.io/collector/component v0.74.0 + go.opentelemetry.io/collector/consumer v0.74.0 + go.opentelemetry.io/collector/pdata v1.0.0-rc8 + go.opentelemetry.io/collector/receiver v0.74.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.74.0 + go.opentelemetry.io/collector/semconv v0.74.0 go.opentelemetry.io/otel v1.14.0 go.opentelemetry.io/otel/bridge/opentracing v1.14.0 go.opentelemetry.io/otel/exporters/jaeger v1.14.0 @@ -66,7 +66,7 @@ require ( go.uber.org/atomic v1.10.0 go.uber.org/automaxprocs v1.5.2 go.uber.org/zap v1.24.0 - golang.org/x/net v0.7.0 + golang.org/x/net v0.8.0 golang.org/x/sys v0.6.0 google.golang.org/grpc v1.53.0 google.golang.org/protobuf v1.29.1 @@ -133,7 +133,7 @@ require ( github.com/oklog/ulid v1.3.1 // indirect github.com/onsi/ginkgo v1.16.4 // indirect github.com/onsi/gomega v1.13.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.73.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.74.0 // indirect github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect @@ -152,14 +152,14 @@ require ( github.com/xdg-go/stringprep v1.0.4 // indirect go.mongodb.org/mongo-driver v1.10.0 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector/confmap v0.73.0 // indirect - go.opentelemetry.io/collector/exporter v0.73.0 // indirect - go.opentelemetry.io/collector/featuregate v0.73.0 // indirect + go.opentelemetry.io/collector/confmap v0.74.0 // indirect + go.opentelemetry.io/collector/exporter v0.74.0 // indirect + go.opentelemetry.io/collector/featuregate v0.74.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect - go.uber.org/multierr v1.9.0 // indirect + go.uber.org/multierr v1.10.0 // indirect golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect golang.org/x/text v0.8.0 // indirect google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect diff --git a/go.sum b/go.sum index b6fd17e28887..8e3ed24f40ee 100644 --- a/go.sum +++ b/go.sum @@ -289,8 +289,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= @@ -546,10 +547,10 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak= github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.73.0 h1:1WpzAuX9TOKBUWZjJv/iDNcU59jKKc6/Ev+l03u4syU= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.73.0/go.mod h1:WD0hPhMuyROSaxL7mtY5NBK3uK5x+UP5UCaLpnF0mHc= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.73.0 h1:MjkBAWse2+AQm7OBlED4PNRyUHPCkd/2VKT6sQEkRhw= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.73.0/go.mod h1:Ij96QQlIpfHJfwzaExTJL9V3LDXv+VufMoka27b0KX4= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.74.0 h1:vU5ZebauzCuYNXFlQaWaYnOfjoOAnS+Sc8+oNWoHkbM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.74.0/go.mod h1:TEu3TnUv1TuyHtjllrUDQ/ImpyD+GrkDejZv4hxl3G8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.74.0 h1:ww1pPXfAM0WHsymQnsN+s4B9DgwQC+GyoBq0t27JV/k= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.74.0/go.mod h1:OpEw7tyCg+iG1ywEgZ03qe5sP/8fhYdtWCMoqA8JCug= github.com/opentracing-contrib/go-grpc v0.0.0-20230205024533-5ced129e5996 h1:cNKquGUykT1G88PgdGC8yEB7eU3H3GyuySp/jfJS49w= github.com/opentracing-contrib/go-grpc v0.0.0-20230205024533-5ced129e5996/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo= github.com/opentracing-contrib/go-stdlib v1.0.0 h1:TBS7YuVotp8myLon4Pv7BtCBzOTo1DeZCld0Z63mW2w= @@ -715,30 +716,30 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/collector v0.73.0 h1:oEBFtf5WcXiIPGXcjOM5gSQ3GNh/3d6pHf0IThhGmfw= -go.opentelemetry.io/collector v0.73.0/go.mod h1:DtfQzKUyi/4ZAoUOC2e0acSdqP4BswnrMcRjnV0Nkxc= -go.opentelemetry.io/collector/component v0.73.0 h1:ka24yVJoVETCru+l5Fm85xGc2y0HwvGfYwyRe7qmjq0= -go.opentelemetry.io/collector/component v0.73.0/go.mod h1:6ZmxciGN5aqIDjrR3DDqlR4d3w95+yM2C/uHKNznBR8= -go.opentelemetry.io/collector/confmap v0.73.0 h1:tC8x8sDk7JQ3QcbosqrxLe756sYcg4iUdTXsx7Ie4CM= -go.opentelemetry.io/collector/confmap v0.73.0/go.mod h1:zEYi9hTAYmCHvN3XWxlN8LvHBrhs2FyQ99k7Ox60L1A= -go.opentelemetry.io/collector/consumer v0.73.0 h1:gy89oaG198A7KGbXIsMIdN4lWVQqqSdx6dsBCfzLujU= -go.opentelemetry.io/collector/consumer v0.73.0/go.mod h1:g49ej965fnT6kEyfefS/cGvqfurC4x0njqU2UFOPIVE= -go.opentelemetry.io/collector/exporter v0.73.0 h1:Yj84r1esCraT8253rvh94ptVvVFEFiQv4ccz9X1WtmQ= -go.opentelemetry.io/collector/exporter v0.73.0/go.mod h1:ttIoT/8hKZwKxQjMKoG9crGeCBgMfeAz9E+2rcF/l5Y= -go.opentelemetry.io/collector/featuregate v0.73.0 h1:hpHKXmRiJqMLefIzXwIuqDo9df2HcI/66IAKLo+g7nc= -go.opentelemetry.io/collector/featuregate v0.73.0/go.mod h1:oIrO4ysPfThwkYKoNlgpHjDU/TgS9kIv2OI74pDUkp4= -go.opentelemetry.io/collector/pdata v1.0.0-rc7 h1:W3wCN9rG/GMuUSQDEzi5FZPmA6pUJWtzKB9+L3t3k/w= -go.opentelemetry.io/collector/pdata v1.0.0-rc7/go.mod h1:YSlrEri/QKzmeaN8rio2iPYsxPUJo4WkL6fQc4Ph7fk= -go.opentelemetry.io/collector/receiver v0.73.0 h1:lAYguaTjf9JDK7oGJUoBDsqGYDxjJAGLQ6O4qAuFPEY= -go.opentelemetry.io/collector/receiver v0.73.0/go.mod h1:VP0eJZn2sh9qfZ3Bre8m2rndo69r0D+h/V9KzSUk76M= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.73.0 h1:clOSxhHfqyXrvZfupsOf2G9JHH//V46QRCAa7qu20pY= -go.opentelemetry.io/collector/receiver/otlpreceiver v0.73.0/go.mod h1:AmnYdG++eXFLU6Ubk9YfwUkTgcdgSY/YhDMxpL4Y5sM= -go.opentelemetry.io/collector/semconv v0.73.0 h1:gF4f6z1q8YfWzzo/gPKysjFmmM4Pv4nC2bWrTPxTPaE= -go.opentelemetry.io/collector/semconv v0.73.0/go.mod h1:xt8oDOiwa1jy24tGUo8+SzpphI7ZredS2WM/0m8rtTA= +go.opentelemetry.io/collector v0.74.0 h1:0s2DKWczGj/pLTsXGb1P+Je7dyuGx9Is4/Dri1+cS7g= +go.opentelemetry.io/collector v0.74.0/go.mod h1:7NjZAvkhQ6E+NLN4EAH2hw3Nssi+F14t7mV7lMNXCto= +go.opentelemetry.io/collector/component v0.74.0 h1:W32ILPgbA5LO+m9Se61hbbtiLM6FYusNM36K5/CCOi0= +go.opentelemetry.io/collector/component v0.74.0/go.mod h1:zHbWqbdmnHeIZAuO3s1Fo/kWPC2oKuolIhlPmL4bzyo= +go.opentelemetry.io/collector/confmap v0.74.0 h1:tl4fSHC/MXZiEvsZhDhd03TgzvArOe69Qn020sZsTfQ= +go.opentelemetry.io/collector/confmap v0.74.0/go.mod h1:NvUhMS2v8rniLvDAnvGjYOt0qBohk6TIibb1NuyVB1Q= +go.opentelemetry.io/collector/consumer v0.74.0 h1:+kjT/ixG+4SVSHg7u9mQe0+LNDc6PuG8Wn2hoL/yGYk= +go.opentelemetry.io/collector/consumer v0.74.0/go.mod h1:MuGqt8/OKVAOjrh5WHr1TR2qwHizy64ZP2uNSr+XpvI= +go.opentelemetry.io/collector/exporter v0.74.0 h1:VZxDuVz9kJM/Yten3xA/abJwLJNkxLThiao6E1ULW7c= +go.opentelemetry.io/collector/exporter v0.74.0/go.mod h1:kw5YoorpKqEpZZ/a5ODSoYFK1mszzcKBNORd32S8Z7c= +go.opentelemetry.io/collector/featuregate v0.74.0 h1:hzkzhi6pvjqEK5+CkVBJX69wpEEYqgtTFMHGlZFsQyE= +go.opentelemetry.io/collector/featuregate v0.74.0/go.mod h1:pmVMr98Ps6QKyEHiVPN7o3Qd8K//M2NapfOv5BMWvA0= +go.opentelemetry.io/collector/pdata v1.0.0-rc8 h1:vBikWdZFsRiT5dVsLQhnE99w3edM7eem3Q9dSqMlStE= +go.opentelemetry.io/collector/pdata v1.0.0-rc8/go.mod h1:BVCBhWgclYCh7Oi6BkMiQfRa6MXv1uRTlKXuL5oBby8= +go.opentelemetry.io/collector/receiver v0.74.0 h1:jlgBFa0iByvn8VuX27UxtqiPiZE8ejmU5lb1nSptWD8= +go.opentelemetry.io/collector/receiver v0.74.0/go.mod h1:SQkyATvoZCJefNkI2jnrR63SOdrmDLYCnQqXJ7ACqn0= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.74.0 h1:e/X/W0z2Jtpy3Yd3CXkmEm9vSpKq/P3pKUrEVMUFBRw= +go.opentelemetry.io/collector/receiver/otlpreceiver v0.74.0/go.mod h1:9X9/RYFxJIaK0JLlRZ0PpmQSSlYpY+r4KsTOj2jWj14= +go.opentelemetry.io/collector/semconv v0.74.0 h1:tPpbz87CPu/pM2/fSEKBJWXTvWvUJvEChbQkzdhWQHE= +go.opentelemetry.io/collector/semconv v0.74.0/go.mod h1:xt8oDOiwa1jy24tGUo8+SzpphI7ZredS2WM/0m8rtTA= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 h1:5jD3teb4Qh7mx/nfzq4jO2WFFpvXD0vYWFDrdvNWmXk= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0/go.mod h1:UMklln0+MRhZC4e3PwmN3pCtq4DyIadWw4yikh6bNrw= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0 h1:vFEBG7SieZJzvnRWQ81jxpuEqe6J8Ex+hgc9CqOTzHc= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0/go.mod h1:9rgTcOKdIhDOC0IcAu8a+R+FChqSUBihKpM1lVNi6T0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 h1:lE9EJyw3/JhrjWH/hEy9FptnalDQgj7vpbgC2KCCCxE= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0/go.mod h1:pcQ3MM3SWvrA71U4GDqv9UFDJ3HQsW7y5ZO3tDTlUdI= go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= go.opentelemetry.io/otel/bridge/opentracing v1.14.0 h1:IHlyjkJCOJQdX70C4r7PXm4LCMmGfGVsU/54KDVCtVI= @@ -772,8 +773,8 @@ go.uber.org/automaxprocs v1.5.2/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnw go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= -go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= +go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= +go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= @@ -884,8 +885,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220725212005-46097bf591d3/go.mod h1:AaygXjzTFtRAg2ttMY5RMuhpJ3cNnI0XpyFJD1iQRSM= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= 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= From 6ab3f0184ca2cd8900079998a38b1690bf1c03d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Mar 2023 01:55:27 -0400 Subject: [PATCH 6/6] Bump google.golang.org/grpc from 1.53.0 to 1.54.0 (#4326) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.53.0 to 1.54.0.
Release notes

Sourced from google.golang.org/grpc's releases.

Release 1.54.0

Behavior Changes

  • xds: remove support for xDS v2 transport API (#6013)

New Features

  • server: expose SetSendCompressor API to set send compressor name (#5744)
  • xdsclient: include Node proto only in the first discovery request message, to improve performance (#6078)

Bug Fixes

  • metadata: fix validation logic and properly validate metadata appended via AppendToOutgoingContext (#6001)
  • transport: do not close connections when we encounter I/O errors until after all data is consumed (#6110)
  • ringhash: ensure addresses are consistently hashed across updates (#6066)
  • xds/clusterimpl: fix a bug causing unnecessary closing and re-opening of LRS streams (#6112)
  • xds: NACK route configuration if sum of weights of weighted clusters exceeds uint32_max (#6085)

Documentation

  • resolver: update Resolver.Scheme() docstring to mention requirement of lowercase scheme names (#6014)
  • resolver: document expected error handling of UpdateState errors (#6002)
  • examples: add example for ORCA load reporting (#6114)
  • examples: add an example to illustrate authorization (authz) support (#5920)
Commits
  • 2997e84 Change version to 1.54.0 (#6129)
  • b638faf stats/opencensus: Add message prefix to metrics names (#6126)
  • c84a500 credentials/alts: defer ALTS stream creation until handshake time (#6077)
  • 6f44ae8 metadata: add benchmark test for FromIncomingContext and ValueFromIncomingCon...
  • a1e657c client: log last error on subchannel connectivity change (#6109)
  • 36fd0a4 gcp/observability: Add compressed metrics to observability module and synchro...
  • 52ca957 xds: make comparison of server configs in bootstrap more reliable (#6112)
  • 7507ea6 gcp/observability: Change logging schema and set queue size limit for logs an...
  • 16c3b7d examples: add example for ORCA load reporting (#6114)
  • b458a4f transport: stop always closing connections when loopy returns (#6110)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=google.golang.org/grpc&package-manager=go_modules&previous-version=1.53.0&new-version=1.54.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 30499176f05b..160afaced399 100644 --- a/go.mod +++ b/go.mod @@ -68,7 +68,7 @@ require ( go.uber.org/zap v1.24.0 golang.org/x/net v0.8.0 golang.org/x/sys v0.6.0 - google.golang.org/grpc v1.53.0 + google.golang.org/grpc v1.54.0 google.golang.org/protobuf v1.29.1 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index 8e3ed24f40ee..0a62441bd108 100644 --- a/go.sum +++ b/go.sum @@ -1169,8 +1169,8 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= -google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= +google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= +google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=