Skip to content

Commit

Permalink
rename test vars as per feedback
Browse files Browse the repository at this point in the history
Signed-off-by: Alex Boten <aboten@lightstep.com>
  • Loading branch information
Alex Boten committed Oct 11, 2023
1 parent f24cfcc commit 5753343
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 26 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

- Add the new `go.opentelemetry.io/contrib/instrgen` package to provide auto-generated source code instrumentation. (#3068, #3108)
- Add `"go.opentelemetry.io/contrib/samplers/jaegerremote".WithSamplingStrategyFetcher` which sets custom fetcher implementation. (#4045)
- Add `"go.opentelemetry.io/contrib/config"` package that includes configuration models generated via go-jsonschema (#4376)
- Add `"go.opentelemetry.io/contrib/config"` package that includes configuration models generated via go-jsonschema. (#4376)
- Add `NewSDK` method to `"go.opentelemetry.io/contrib/config"`. The initial implementation only returns noop providers. (#4414)

### Changed

Expand Down
27 changes: 14 additions & 13 deletions config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"context"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"go.opentelemetry.io/otel/metric/noop"
Expand All @@ -17,16 +18,16 @@ import (

func TestNewSDK(t *testing.T) {
tests := []struct {
name string
cfg []ConfigurationOption
tracerProvider any
meterProvider any
err error
name string
cfg []ConfigurationOption
wantTracerProvider any
wantMeterProvider any
wantErr error
}{
{
name: "no-configuration",
tracerProvider: trace.NewNoopTracerProvider(),
meterProvider: noop.NewMeterProvider(),
name: "no-configuration",
wantTracerProvider: trace.NewNoopTracerProvider(),
wantMeterProvider: noop.NewMeterProvider(),
},
{
name: "with-configuration",
Expand All @@ -37,14 +38,14 @@ func TestNewSDK(t *testing.T) {
MeterProvider: &MeterProvider{},
}),
},
tracerProvider: &sdktrace.TracerProvider{},
meterProvider: &sdkmetric.MeterProvider{},
wantTracerProvider: &sdktrace.TracerProvider{},
wantMeterProvider: &sdkmetric.MeterProvider{},
},
}
for _, tt := range tests {
sdk, err := NewSDK(tt.cfg...)
require.Equal(t, tt.err, err)
assert.IsType(t, tt.tracerProvider, sdk.TracerProvider())
assert.IsType(t, tt.meterProvider, sdk.MeterProvider())
require.Equal(t, tt.wantErr, err)
assert.IsType(t, tt.wantTracerProvider, sdk.TracerProvider())
assert.IsType(t, tt.wantMeterProvider, sdk.MeterProvider())
}
}
12 changes: 6 additions & 6 deletions config/metric_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ import (

func TestInitMeterProvider(t *testing.T) {
tests := []struct {
name string
cfg configOptions
provider metric.MeterProvider
name string
cfg configOptions
wantProvider metric.MeterProvider
}{
{
name: "no-meter-provider-configured",
provider: noop.NewMeterProvider(),
name: "no-meter-provider-configured",
wantProvider: noop.NewMeterProvider(),
},
}
for _, tt := range tests {
require.Equal(t, tt.provider, initMeterProvider(tt.cfg))
require.Equal(t, tt.wantProvider, initMeterProvider(tt.cfg))
}
}
12 changes: 6 additions & 6 deletions config/trace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ import (

func TestInitTracerPovider(t *testing.T) {
tests := []struct {
name string
cfg configOptions
provider trace.TracerProvider
name string
cfg configOptions
wantProvider trace.TracerProvider
}{
{
name: "no-tracer-provider-configured",
provider: trace.NewNoopTracerProvider(),
name: "no-tracer-provider-configured",
wantProvider: trace.NewNoopTracerProvider(),
},
}
for _, tt := range tests {
require.Equal(t, tt.provider, initTracerProvider(tt.cfg))
require.Equal(t, tt.wantProvider, initTracerProvider(tt.cfg))
}
}

0 comments on commit 5753343

Please sign in to comment.