From 8fddc59c012cc4cbc4ef7d15cd658c087d9b182e Mon Sep 17 00:00:00 2001 From: Paulin Todev Date: Thu, 29 Jun 2023 18:23:16 +0100 Subject: [PATCH] PR review changes --- .../internal/jaegerremotesampling/extension.go | 2 +- component/otelcol/receiver/loki/loki.go | 2 ++ pkg/traces/instance.go | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/component/otelcol/extension/jaeger_remote_sampling/internal/jaegerremotesampling/extension.go b/component/otelcol/extension/jaeger_remote_sampling/internal/jaegerremotesampling/extension.go index 45e917c0127e..e149aecbbb9d 100644 --- a/component/otelcol/extension/jaeger_remote_sampling/internal/jaegerremotesampling/extension.go +++ b/component/otelcol/extension/jaeger_remote_sampling/internal/jaegerremotesampling/extension.go @@ -73,7 +73,7 @@ func (jrse *jrsExtension) Start(ctx context.Context, host component.Host) error } if jrse.cfg.Source.Remote != nil { - conn, err := jrse.cfg.Source.Remote.ToClientConn(context.Background(), host, jrse.telemetry) + conn, err := jrse.cfg.Source.Remote.ToClientConn(ctx, host, jrse.telemetry) if err != nil { return fmt.Errorf("error while connecting to the remote sampling source: %w", err) } diff --git a/component/otelcol/receiver/loki/loki.go b/component/otelcol/receiver/loki/loki.go index d776e94e1d8c..a46296e3f5ba 100644 --- a/component/otelcol/receiver/loki/loki.go +++ b/component/otelcol/receiver/loki/loki.go @@ -124,6 +124,8 @@ func convertLokiEntryToPlog(lokiEntry loki.Entry) plog.Logs { // transformation happens. lr.Attributes().PutStr("log.file.path", filenameStr) lr.Attributes().PutStr("log.file.name", path.Base(filenameStr)) + // TODO(@tpaschalis) Remove the addition of "log.file.path" and "log.file.name", + // because the Collector doesn't do it and we would be more in line with it. } var lbls []string diff --git a/pkg/traces/instance.go b/pkg/traces/instance.go index 6e92d43bab80..0075112c466e 100644 --- a/pkg/traces/instance.go +++ b/pkg/traces/instance.go @@ -167,7 +167,7 @@ func (i *Instance) buildAndStartPipeline(ctx context.Context, cfg InstanceConfig Extensions: extension.NewBuilder(otelConfig.Extensions, factories.Extensions), OtelMetricViews: servicegraphprocessor.OtelMetricViews(), OtelMetricReader: *promExporter, - UseExternalMetricsServer: false, + UseExternalMetricsServer: true, TracerProvider: trace.NewNoopTracerProvider(), //TODO: Plug in an AsyncErrorChannel to shut down the Agent in case of a fatal event LoggingOptions: []zap.Option{