Skip to content

Commit

Permalink
PR review changes
Browse files Browse the repository at this point in the history
  • Loading branch information
ptodev committed Jun 29, 2023
1 parent da2cd6d commit 0b7b5e4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
2 changes: 2 additions & 0 deletions component/otelcol/receiver/loki/loki.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/traces/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down

0 comments on commit 0b7b5e4

Please sign in to comment.