Skip to content
This repository has been archived by the owner on Sep 30, 2024. It is now read-only.

chore/otel-collector: upgrade to v0.103.0, remove jaegerexporter #63171

Merged
merged 31 commits into from
Jul 10, 2024
Merged
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
73ecd42
chore/otel-collector: upgrade to v0.102.1
bobheadxi Jun 7, 2024
a106389
sg wolfi lock opentelemetry-collector
bobheadxi Jun 7, 2024
9bfcf1b
dependency_decisions
bobheadxi Jun 7, 2024
f28b182
fixups
bobheadxi Jun 7, 2024
8a5b1e4
more deps fixups
bobheadxi Jun 7, 2024
8f84108
more fixups
bobheadxi Jun 7, 2024
a2a9563
MORE FIXUPS
bobheadxi Jun 7, 2024
e0afb09
Merge branch 'main' of github.com:sourcegraph/sourcegraph into otel-c…
bobheadxi Jun 11, 2024
41b762c
add more and better lint:ignore
bobheadxi Jun 11, 2024
7fc979c
fixup
bobheadxi Jun 11, 2024
3e70bfc
bump alertmanager to match image
bobheadxi Jun 11, 2024
43e3ecf
lock prometheus
bobheadxi Jun 11, 2024
6dd8822
HACK: pin googlecloudexporter to 102.0
bobheadxi Jun 11, 2024
4f0c5a9
Merge branch 'main' of github.com:sourcegraph/sourcegraph into otel-c…
bobheadxi Jun 11, 2024
75327cc
epoch?
bobheadxi Jun 11, 2024
6279049
local build is slow, fingers crossed CI gets it
bobheadxi Jun 11, 2024
00e28ed
remove jaeger exporter
bobheadxi Jun 11, 2024
b6a8e5c
Merge branch 'main' of github.com:sourcegraph/sourcegraph into otel-c…
bobheadxi Jun 11, 2024
56d8bb6
Merge branch 'main' of github.com:sourcegraph/sourcegraph into otel-c…
bobheadxi Jun 26, 2024
85a3b03
v0.103.0
bobheadxi Jun 26, 2024
dad1ca2
jaeger-all-in-one: enable OTLP
bobheadxi Jun 26, 2024
a379d04
fixup
bobheadxi Jun 26, 2024
d3f793f
deps bzl
bobheadxi Jun 26, 2024
dce1a2b
update deprecated usage
bobheadxi Jun 26, 2024
17a7e06
Merge branch 'main' of github.com:sourcegraph/sourcegraph into otel-c…
bobheadxi Jun 26, 2024
62a143c
Merge branch 'main' of github.com:sourcegraph/sourcegraph into otel-c…
bobheadxi Jun 26, 2024
1821d78
use new env var format
bobheadxi Jun 26, 2024
eced3d8
Merge branch 'main' into otel-collector-upgrade
Chickensoupwithrice Jul 4, 2024
acff52b
fix(otel): update go.mod
Chickensoupwithrice Jul 5, 2024
8c29ba4
Merge branch 'main' into otel-collector-upgrade
Chickensoupwithrice Jul 9, 2024
419100b
fix(ci): run go mod tidy
Chickensoupwithrice Jul 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cmd/frontend/internal/app/otlpadapter/otlp.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ func newExporter(
case otlpenv.ProtocolGRPC:
exporterFactory = otlpexporter.NewFactory()
tempConfig := exporterFactory.CreateDefaultConfig().(*otlpexporter.Config)
tempConfig.GRPCClientSettings.Endpoint = endpoint
tempConfig.GRPCClientSettings.TLSSetting = configtls.TLSClientSetting{
tempConfig.Endpoint = endpoint
tempConfig.TLSSetting = configtls.ClientConfig{
Insecure: otlpenv.IsInsecure(endpoint),
}
signalExporterConfig = tempConfig

case otlpenv.ProtocolHTTPJSON:
exporterFactory = otlphttpexporter.NewFactory()
tempConfig := exporterFactory.CreateDefaultConfig().(*otlphttpexporter.Config)
tempConfig.HTTPClientSettings.Endpoint = endpoint
tempConfig.Endpoint = endpoint
signalExporterConfig = tempConfig

default:
Expand All @@ -52,7 +52,7 @@ func newReceiver(receiverURL *url.URL) (receiver.Factory, component.Config) {
signalReceiverConfig := receiverFactory.CreateDefaultConfig().(*otlpreceiver.Config)
signalReceiverConfig.GRPC = nil // disable gRPC receiver, we don't need it
signalReceiverConfig.HTTP = &otlpreceiver.HTTPConfig{
HTTPServerSettings: &confighttp.HTTPServerSettings{
ServerConfig: &confighttp.ServerConfig{
Endpoint: receiverURL.Host,
},
// Set explicit defaults based on docstrings of each field.
Expand Down
12 changes: 6 additions & 6 deletions cmd/frontend/internal/app/otlpadapter/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@ func Register(ctx context.Context, logger log.Logger, protocol otlpenv.Protocol,
{
PathPrefix: "/v1/traces",
CreateAdapter: func() (*signalAdapter, error) {
exporter, err := exporterFactory.CreateTracesExporter(ctx, exporter.CreateSettings{
exporter, err := exporterFactory.CreateTracesExporter(ctx, exporter.Settings{
ID: component.NewIDWithName(component.DataTypeTraces, componentName),
TelemetrySettings: telemetrySettings,
}, signalExporterConfig)
if err != nil {
return nil, errors.Wrap(err, "CreateTracesExporter")
}
receiver, err := receiverFactory.CreateTracesReceiver(ctx, receiver.CreateSettings{
receiver, err := receiverFactory.CreateTracesReceiver(ctx, receiver.Settings{
ID: component.NewIDWithName(component.DataTypeTraces, componentName),
TelemetrySettings: telemetrySettings,
}, signalReceiverConfig, exporter)
Expand All @@ -82,14 +82,14 @@ func Register(ctx context.Context, logger log.Logger, protocol otlpenv.Protocol,
{
PathPrefix: "/v1/metrics",
CreateAdapter: func() (*signalAdapter, error) {
exporter, err := exporterFactory.CreateMetricsExporter(ctx, exporter.CreateSettings{
exporter, err := exporterFactory.CreateMetricsExporter(ctx, exporter.Settings{
ID: component.NewIDWithName(component.DataTypeMetrics, componentName),
TelemetrySettings: telemetrySettings,
}, signalExporterConfig)
if err != nil {
return nil, errors.Wrap(err, "CreateMetricsExporter")
}
receiver, err := receiverFactory.CreateMetricsReceiver(ctx, receiver.CreateSettings{
receiver, err := receiverFactory.CreateMetricsReceiver(ctx, receiver.Settings{
ID: component.NewIDWithName(component.DataTypeMetrics, componentName),
TelemetrySettings: telemetrySettings,
}, signalReceiverConfig, exporter)
Expand All @@ -103,14 +103,14 @@ func Register(ctx context.Context, logger log.Logger, protocol otlpenv.Protocol,
{
PathPrefix: "/v1/logs",
CreateAdapter: func() (*signalAdapter, error) {
exporter, err := exporterFactory.CreateLogsExporter(ctx, exporter.CreateSettings{
exporter, err := exporterFactory.CreateLogsExporter(ctx, exporter.Settings{
ID: component.NewIDWithName(component.DataTypeLogs, componentName),
TelemetrySettings: telemetrySettings,
}, signalExporterConfig)
if err != nil {
return nil, errors.Wrap(err, "CreateLogsExporter")
}
receiver, err := receiverFactory.CreateLogsReceiver(ctx, receiver.CreateSettings{
receiver, err := receiverFactory.CreateLogsReceiver(ctx, receiver.Settings{
ID: component.NewIDWithName(component.DataTypeLogs, componentName),
TelemetrySettings: telemetrySettings,
}, signalReceiverConfig, exporter)
Expand Down
Loading
Loading