Skip to content

Commit

Permalink
build(deps): bump the otel-collector group with 15 updates (jaegertra…
Browse files Browse the repository at this point in the history 
…cing#5089)

Bumps the otel-collector group with 15 updates:

| Package | From | To |
| --- | --- | --- |
|
[github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector](https://github.com/open-telemetry/opentelemetry-collector-contrib)
| `0.91.0` | `0.92.0` |
|
[github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib)
| `0.91.0` | `0.92.0` |
|
[github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib)
| `0.91.0` | `0.92.0` |
|
[github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib)
| `0.91.0` | `0.92.0` |
|
[github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib)
| `0.91.0` | `0.92.0` |
|
[go.opentelemetry.io/collector/connector/forwardconnector](https://github.com/open-telemetry/opentelemetry-collector)
| `0.91.0` | `0.92.0` |
|
[go.opentelemetry.io/collector/exporter/loggingexporter](https://github.com/open-telemetry/opentelemetry-collector)
| `0.91.0` | `0.92.0` |
|
[go.opentelemetry.io/collector/exporter/otlpexporter](https://github.com/open-telemetry/opentelemetry-collector)
| `0.91.0` | `0.92.0` |
|
[go.opentelemetry.io/collector/exporter/otlphttpexporter](https://github.com/open-telemetry/opentelemetry-collector)
| `0.91.0` | `0.92.0` |
|
[go.opentelemetry.io/collector/extension/ballastextension](https://github.com/open-telemetry/opentelemetry-collector)
| `0.91.0` | `0.92.0` |
|
[go.opentelemetry.io/collector/extension/zpagesextension](https://github.com/open-telemetry/opentelemetry-collector)
| `0.91.0` | `0.92.0` |
|
[go.opentelemetry.io/collector/otelcol](https://github.com/open-telemetry/opentelemetry-collector)
| `0.91.0` | `0.92.0` |
|
[go.opentelemetry.io/collector/processor/batchprocessor](https://github.com/open-telemetry/opentelemetry-collector)
| `0.91.0` | `0.92.0` |
|
[go.opentelemetry.io/collector/processor/memorylimiterprocessor](https://github.com/open-telemetry/opentelemetry-collector)
| `0.91.0` | `0.92.0` |
|
[go.opentelemetry.io/collector/receiver/otlpreceiver](https://github.com/open-telemetry/opentelemetry-collector)
| `0.91.0` | `0.92.0` |


---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Yuri Shkuro <github@ysh.us>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yuri Shkuro <github@ysh.us>
Co-authored-by: Yuri Shkuro <yurishkuro@users.noreply.github.com>
  • Loading branch information
@dependabot @yurishkuro
3 people committed Jan 10, 2024
1 parent b9f614c commit 09f7a30
Show file tree
Hide file tree
Showing 5 changed files with 176 additions and 162 deletions.
12 changes: 8 additions & 4 deletions cmd/collector/app/handler/otlp_receiver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,20 @@ func startOTLPReceiver(
otlpReceiverConfig := otlpFactory.CreateDefaultConfig().(*otlpreceiver.Config)
applyGRPCSettings(otlpReceiverConfig.GRPC, &options.OTLP.GRPC)
applyHTTPSettings(otlpReceiverConfig.HTTP.HTTPServerSettings, &options.OTLP.HTTP)
statusReporter := func(ev *component.StatusEvent) {
// TODO this could be wired into changing healthcheck.HealthCheck
logger.Info("OTLP receiver status change", zap.Stringer("status", ev.Status()))
}
otlpReceiverSettings := receiver.CreateSettings{
TelemetrySettings: component.TelemetrySettings{
Logger: logger,
TracerProvider: nooptrace.NewTracerProvider(),
MeterProvider: noopmetric.NewMeterProvider(), // TODO wire this with jaegerlib metrics?
ReportComponentStatus: component.StatusFunc(func(ev *component.StatusEvent) error {
// TODO this could be wired into changing healthcheck.HealthCheck
logger.Info("OTLP receiver status change", zap.Stringer("status", ev.Status()))
ReportComponentStatus: func(ev *component.StatusEvent) error {
statusReporter(ev)
return nil
}),
},
ReportStatus: statusReporter,
},
}

Expand Down
2 changes: 2 additions & 0 deletions cmd/jaeger/internal/exporters/storageexporter/exporter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/ptrace"
noopmetric "go.opentelemetry.io/otel/metric/noop"
nooptrace "go.opentelemetry.io/otel/trace/noop"
"go.uber.org/zap"

Expand Down Expand Up @@ -81,6 +82,7 @@ func TestExporter(t *testing.T) {
telemetrySettings := component.TelemetrySettings{
Logger: zap.L(),
TracerProvider: nooptrace.NewTracerProvider(),
MeterProvider: noopmetric.NewMeterProvider(),
}

const memstoreName = "memstore"
Expand Down
3 changes: 2 additions & 1 deletion cmd/jaeger/internal/exporters/storageexporter/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"context"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configretry"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/exporter/exporterhelper"
Expand Down Expand Up @@ -39,7 +40,7 @@ func createTracesExporter(ctx context.Context, set exporter.CreateSettings, conf
exporterhelper.WithCapabilities(consumer.Capabilities{MutatesData: false}),
// Disable Timeout/RetryOnFailure and SendingQueue
exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}),
exporterhelper.WithRetry(exporterhelper.RetrySettings{Enabled: false}),
exporterhelper.WithRetry(configretry.BackOffConfig{Enabled: false}),
exporterhelper.WithQueue(exporterhelper.QueueSettings{Enabled: false}),
exporterhelper.WithStart(ex.start),
exporterhelper.WithShutdown(ex.close),
Expand Down
106 changes: 54 additions & 52 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ require (
github.com/hashicorp/go-plugin v1.6.0
github.com/kr/pretty v0.3.1
github.com/olivere/elastic v6.2.37+incompatible
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.91.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.91.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.91.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.91.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.91.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.91.0
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.92.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.92.0
github.com/prometheus/client_golang v1.18.0
github.com/prometheus/client_model v0.5.0
github.com/prometheus/common v0.45.0
Expand All @@ -40,27 +40,28 @@ require (
github.com/stretchr/testify v1.8.4
github.com/uber/jaeger-client-go v2.30.0+incompatible
github.com/xdg-go/scram v1.1.2
go.opentelemetry.io/collector/component v0.91.0
go.opentelemetry.io/collector/config/configgrpc v0.91.0
go.opentelemetry.io/collector/config/confighttp v0.91.0
go.opentelemetry.io/collector/config/configtls v0.91.0
go.opentelemetry.io/collector/connector v0.91.0
go.opentelemetry.io/collector/connector/forwardconnector v0.91.0
go.opentelemetry.io/collector/consumer v0.91.0
go.opentelemetry.io/collector/exporter v0.91.0
go.opentelemetry.io/collector/exporter/loggingexporter v0.91.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.91.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.91.0
go.opentelemetry.io/collector/extension v0.91.0
go.opentelemetry.io/collector/extension/ballastextension v0.91.0
go.opentelemetry.io/collector/extension/zpagesextension v0.91.0
go.opentelemetry.io/collector/otelcol v0.91.0
go.opentelemetry.io/collector/pdata v1.0.0
go.opentelemetry.io/collector/processor v0.91.0
go.opentelemetry.io/collector/processor/batchprocessor v0.91.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.91.0
go.opentelemetry.io/collector/receiver v0.91.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.91.0
go.opentelemetry.io/collector/component v0.92.0
go.opentelemetry.io/collector/config/configgrpc v0.92.0
go.opentelemetry.io/collector/config/confighttp v0.92.0
go.opentelemetry.io/collector/config/configretry v0.92.0
go.opentelemetry.io/collector/config/configtls v0.92.0
go.opentelemetry.io/collector/connector v0.92.0
go.opentelemetry.io/collector/connector/forwardconnector v0.92.0
go.opentelemetry.io/collector/consumer v0.92.0
go.opentelemetry.io/collector/exporter v0.92.0
go.opentelemetry.io/collector/exporter/loggingexporter v0.92.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.92.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.92.0
go.opentelemetry.io/collector/extension v0.92.0
go.opentelemetry.io/collector/extension/ballastextension v0.92.0
go.opentelemetry.io/collector/extension/zpagesextension v0.92.0
go.opentelemetry.io/collector/otelcol v0.92.0
go.opentelemetry.io/collector/pdata v1.0.1
go.opentelemetry.io/collector/processor v0.92.0
go.opentelemetry.io/collector/processor/batchprocessor v0.92.0
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.92.0
go.opentelemetry.io/collector/receiver v0.92.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.92.0
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1
go.opentelemetry.io/otel v1.21.0
Expand All @@ -74,9 +75,9 @@ require (
go.uber.org/automaxprocs v1.5.3
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.26.0
golang.org/x/net v0.19.0
golang.org/x/sys v0.15.0
google.golang.org/grpc v1.60.0
golang.org/x/net v0.20.0
golang.org/x/sys v0.16.0
google.golang.org/grpc v1.60.1
google.golang.org/protobuf v1.32.0
gopkg.in/yaml.v2 v2.4.0
)
Expand All @@ -85,7 +86,7 @@ require (
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
github.com/IBM/sarama v1.42.1 // indirect
github.com/VividCortex/gohistogram v1.0.0 // indirect
github.com/aws/aws-sdk-go v1.48.14 // indirect
github.com/aws/aws-sdk-go v1.49.17 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
Expand All @@ -110,7 +111,7 @@ require (
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/flatbuffers v1.12.1 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/google/uuid v1.5.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand Down Expand Up @@ -150,11 +151,12 @@ require (
github.com/mostynb/go-grpc-compression v1.2.2 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.91.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.91.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.91.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.91.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.91.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kafka v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/azure v0.92.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.92.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/openzipkin/zipkin-go v0.4.2 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
Expand All @@ -172,7 +174,7 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/shirou/gopsutil/v3 v3.23.11 // indirect
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
Expand All @@ -187,18 +189,18 @@ require (
github.com/xdg-go/stringprep v1.0.4 // indirect
github.com/yusufpapurcu/wmi v1.2.3 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector v0.91.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.91.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.91.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.91.0 // indirect
go.opentelemetry.io/collector/config/configopaque v0.91.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.91.0 // indirect
go.opentelemetry.io/collector/config/internal v0.91.0 // indirect
go.opentelemetry.io/collector/confmap v0.91.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.91.0 // indirect
go.opentelemetry.io/collector/featuregate v1.0.0 // indirect
go.opentelemetry.io/collector/semconv v0.91.0 // indirect
go.opentelemetry.io/collector/service v0.91.0 // indirect
go.opentelemetry.io/collector v0.92.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.92.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.92.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.92.0 // indirect
go.opentelemetry.io/collector/config/configopaque v0.92.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.92.0 // indirect
go.opentelemetry.io/collector/config/internal v0.92.0 // indirect
go.opentelemetry.io/collector/confmap v0.92.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.92.0 // indirect
go.opentelemetry.io/collector/featuregate v1.0.1 // indirect
go.opentelemetry.io/collector/semconv v0.92.0 // indirect
go.opentelemetry.io/collector/service v0.92.0 // indirect
go.opentelemetry.io/contrib/config v0.1.1 // indirect
go.opentelemetry.io/contrib/propagators/b3 v1.21.1 // indirect
go.opentelemetry.io/contrib/zpages v0.46.1 // indirect
Expand All @@ -211,8 +213,8 @@ require (
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
golang.org/x/crypto v0.18.0 // indirect
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
golang.org/x/text v0.14.0 // indirect
gonum.org/v1/gonum v0.14.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
Expand Down
Loading

0 comments on commit 09f7a30

Please sign in to comment.