Skip to content

Commit dbde3df

Browse files
committed
[chore] Pull fix for validate subcommand
Pull fix for the validate sub-command and re-enable failing tests
1 parent 8f3962c commit dbde3df

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565

6666
### 🧰 Bug fixes 🧰
6767

68+
- Fix `validate` subcommand if used withot `--config` flag ([#4873](https://github.com/signalfx/splunk-otel-collector/pull/4873))
6869
- `deltatocumulativeprocessor`: Evict only stale streams ([#33014](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/33014))
6970
Changes eviction behavior to only evict streams that are actually stale.
7071
Currently, once the stream limit is hit, on each new stream the oldest tracked one is evicted.
@@ -79,7 +80,6 @@
7980

8081
- `pkg/ottl`: Fixes a bug where function name could be used in a condition, resulting in a cryptic error message. ([#33051](https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/33051))
8182

82-
8383
## v0.100.0
8484

8585
### 🛑 Breaking changes 🛑

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ require (
131131
go.opentelemetry.io/collector/extension v0.101.0
132132
go.opentelemetry.io/collector/extension/ballastextension v0.101.0
133133
go.opentelemetry.io/collector/extension/zpagesextension v0.101.0
134-
go.opentelemetry.io/collector/otelcol v0.101.0
134+
go.opentelemetry.io/collector/otelcol v0.101.1-0.20240522182134-4f365892b751
135135
go.opentelemetry.io/collector/pdata v1.8.0
136136
go.opentelemetry.io/collector/processor v0.101.0
137137
go.opentelemetry.io/collector/processor/batchprocessor v0.101.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1880,8 +1880,8 @@ go.opentelemetry.io/collector/featuregate v1.8.0 h1:p/bAuk5LiSfdYS88yFl/Jzao9bHE
18801880
go.opentelemetry.io/collector/featuregate v1.8.0/go.mod h1:w7nUODKxEi3FLf1HslCiE6YWtMtOOrMnSwsDam8Mg9w=
18811881
go.opentelemetry.io/collector/filter v0.101.0 h1:tNs6+liajg4hxSmtX5tcuGBefSPB+TEyyK3KTPp+dYY=
18821882
go.opentelemetry.io/collector/filter v0.101.0/go.mod h1:Kp9rCRB60SDm+pjrsaK95fkwfEXGh4j1yewvATTNkfI=
1883-
go.opentelemetry.io/collector/otelcol v0.101.0 h1:6kF2dcXpu5NjxK2j0ksCRzZhqigxCGrP/u7n57FSMOg=
1884-
go.opentelemetry.io/collector/otelcol v0.101.0/go.mod h1:qGrb+hlZXId/hJj0y28vq0YkMd6Xsoz2w7mZkXJOw68=
1883+
go.opentelemetry.io/collector/otelcol v0.101.1-0.20240522182134-4f365892b751 h1:lW37bLhUThP+ka1DSu1OGmM76INIrAvVofcNvOXhy8w=
1884+
go.opentelemetry.io/collector/otelcol v0.101.1-0.20240522182134-4f365892b751/go.mod h1:/gdhzzo+4ycaBX8onnmBq9wLj9KrWqENkWMNAUIvFCg=
18851885
go.opentelemetry.io/collector/pdata v1.8.0 h1:d/QQgZxB4Y+d3mqLVh2ozvzujUhloD3P/fk7X+In764=
18861886
go.opentelemetry.io/collector/pdata v1.8.0/go.mod h1:/W7clu0wFC4WSRp94Ucn6Vm36Wkrt+tmtlDb1aiNZCY=
18871887
go.opentelemetry.io/collector/pdata/testdata v0.101.0 h1:JzeUtg5RN1iIFgY8DakGlqBkGxOTJlkaYlLausnEGKY=

tests/general/validate_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
)
3030

3131
func TestCoreValidateDefaultConfig(t *testing.T) {
32-
t.Skip("Skip until https://github.com/open-telemetry/opentelemetry-collector/pull/10203 is merged")
3332
tc := testutils.NewTestcase(t)
3433
defer tc.PrintLogsOnFailure()
3534
defer tc.ShutdownOTLPReceiverSink()
@@ -65,7 +64,6 @@ func TestCoreValidateDefaultConfig(t *testing.T) {
6564
}
6665

6766
func TestCoreValidateYamlProvider(t *testing.T) {
68-
t.Skip("Skip until https://github.com/open-telemetry/opentelemetry-collector/pull/10203 is merged")
6967
tc := testutils.NewTestcase(t)
7068
defer tc.PrintLogsOnFailure()
7169
defer tc.ShutdownOTLPReceiverSink()
@@ -113,7 +111,6 @@ service:
113111
}
114112

115113
func TestCoreValidateDetectsInvalidYamlProvider(t *testing.T) {
116-
t.Skip("Skip until https://github.com/open-telemetry/opentelemetry-collector/pull/10203 is merged")
117114
tc := testutils.NewTestcase(t)
118115
defer tc.PrintLogsOnFailure()
119116
defer tc.ShutdownOTLPReceiverSink()

0 commit comments

Comments
 (0)