@@ -11,6 +11,7 @@ import (
11
11
"testing"
12
12
13
13
"github.com/go-logr/logr"
14
+ "github.com/google/go-cmp/cmp"
14
15
"github.com/stretchr/testify/assert"
15
16
"github.com/stretchr/testify/require"
16
17
"gopkg.in/yaml.v3"
@@ -158,7 +159,7 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
158
159
Mode : v1beta1 .ModeDeployment ,
159
160
UpgradeStrategy : v1beta1 .UpgradeStrategyAutomatic ,
160
161
Config : func () v1beta1.Config {
161
- const input = `{"receivers":{"otlp":{"protocols":{"grpc":{"endpoint":"0.0.0.0:4317"},"http":{"endpoint":"0.0.0.0:4318"}}}},"exporters":{"debug":null},"service":{"telemetry":{"metrics":{"address":" 0.0.0.0:8888" }},"pipelines":{"traces":{"receivers":["otlp"],"exporters":["debug"]}}}}`
162
+ const input = `{"receivers":{"otlp":{"protocols":{"grpc":{"endpoint":"0.0.0.0:4317"},"http":{"endpoint":"0.0.0.0:4318"}}}},"exporters":{"debug":null},"service":{"telemetry":{"metrics":{"readers":[{"pull":{"exporter":{"prometheus":{"host":" 0.0.0.0","port" :8888}}}}] }},"pipelines":{"traces":{"receivers":["otlp"],"exporters":["debug"]}}}}`
162
163
var cfg v1beta1.Config
163
164
require .NoError (t , yaml .Unmarshal ([]byte (input ), & cfg ))
164
165
return cfg
@@ -171,7 +172,7 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
171
172
otelcol : v1beta1.OpenTelemetryCollector {
172
173
Spec : v1beta1.OpenTelemetryCollectorSpec {
173
174
Config : func () v1beta1.Config {
174
- const input = `{"receivers":{"otlp":{"protocols":{"grpc":{"headers":{"example":"another"}},"http":{"endpoint":"0.0.0.0:4000"}}}},"exporters":{"debug":null},"service":{"telemetry":{"metrics":{"address":"1.2.3.4:7654" }},"pipelines":{"traces":{"receivers":["otlp"],"exporters":["debug"]}}}}`
175
+ const input = `{"receivers":{"otlp":{"protocols":{"grpc":{"headers":{"example":"another"}},"http":{"endpoint":"0.0.0.0:4000"}}}},"exporters":{"debug":null},"service":{"telemetry":{"metrics":{"readers":[{"pull":{"exporter":{"prometheus":{"host":"localhost","port":9999}}}}] }},"pipelines":{"traces":{"receivers":["otlp"],"exporters":["debug"]}}}}`
175
176
var cfg v1beta1.Config
176
177
require .NoError (t , yaml .Unmarshal ([]byte (input ), & cfg ))
177
178
return cfg
@@ -190,7 +191,7 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
190
191
Mode : v1beta1 .ModeDeployment ,
191
192
UpgradeStrategy : v1beta1 .UpgradeStrategyAutomatic ,
192
193
Config : func () v1beta1.Config {
193
- const input = `{"receivers":{"otlp":{"protocols":{"grpc":{"endpoint":"0.0.0.0:4317","headers":{"example":"another"}},"http":{"endpoint":"0.0.0.0:4000"}}}},"exporters":{"debug":null},"service":{"telemetry":{"metrics":{"address":"1.2.3.4:7654" }},"pipelines":{"traces":{"receivers":["otlp"],"exporters":["debug"]}}}}`
194
+ const input = `{"receivers":{"otlp":{"protocols":{"grpc":{"endpoint":"0.0.0.0:4317","headers":{"example":"another"}},"http":{"endpoint":"0.0.0.0:4000"}}}},"exporters":{"debug":null},"service":{"telemetry":{"metrics":{"readers":[{"pull":{"exporter":{"prometheus":{"host":"localhost","port":9999}}}}] }},"pipelines":{"traces":{"receivers":["otlp"],"exporters":["debug"]}}}}`
194
195
var cfg v1beta1.Config
195
196
require .NoError (t , yaml .Unmarshal ([]byte (input ), & cfg ))
196
197
return cfg
@@ -547,7 +548,9 @@ func TestCollectorDefaultingWebhook(t *testing.T) {
547
548
assert .NoError (t , test .expected .Spec .Config .Service .ApplyDefaults (logr .Discard ()), "could not apply defaults" )
548
549
}
549
550
assert .NoError (t , err )
550
- assert .Equal (t , test .expected , test .otelcol )
551
+ if diff := cmp .Diff (test .expected , test .otelcol ); diff != "" {
552
+ t .Errorf ("v1beta1.OpenTelemetryCollector mismatch (-want +got):\n %s" , diff )
553
+ }
551
554
})
552
555
}
553
556
}
0 commit comments