Skip to content
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Main (unreleased)

- Schedule new path targets faster in `loki.source.file`. (@kalleep)

- Update Beyla component to 2.7.4. (@grcevski)

### Bugfixes

Expand Down
274 changes: 154 additions & 120 deletions go.mod

Large diffs are not rendered by default.

501 changes: 262 additions & 239 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/alloycli/cmd_convert.go
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ func parseExtraArgs(extraArgs string) ([]string, error) {
arguments := strings.Fields(extraArgs)
for i, arg := range arguments {
fs := pflag.NewFlagSet("extra-args", pflag.ExitOnError)
fs.ParseErrorsWhitelist.UnknownFlags = true
fs.ParseErrorsAllowlist.UnknownFlags = true
keyStartIndex := 0
doParseFlagValue := false

Expand Down
5 changes: 4 additions & 1 deletion internal/component/beyla/ebpf/beyla_linux_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,10 @@ func TestConvert_Attributes(t *testing.T) {
Exclude: []string{"db_statement"},
},
},
DropMetricsUnresolvedIPs: true,
RenameUnresolvedHosts: "unresolved",
RenameUnresolvedHostsOutgoing: "outgoing",
RenameUnresolvedHostsIncoming: "incoming",
MetricSpanNameAggregationLimit: 100,
}
expectedConfig.InstanceID.OverrideHostname = "test"
expectedConfig.InstanceID.HostnameDNSResolution = true
Expand Down
2 changes: 1 addition & 1 deletion internal/runtime/tracing/tracing.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
"go.opentelemetry.io/otel/sdk/resource"
tracesdk "go.opentelemetry.io/otel/sdk/trace"
semconv "go.opentelemetry.io/otel/semconv/v1.34.0"
semconv "go.opentelemetry.io/otel/semconv/v1.37.0"
"go.opentelemetry.io/otel/trace"
)

Expand Down
Loading