Skip to content
Merged
Changes from all 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
12 changes: 6 additions & 6 deletions otelconf/config_json.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func (j *ConsoleExporter) UnmarshalJSON(b []byte) error {

// UnmarshalJSON implements json.Unmarshaler.
func (j *B3Propagator) UnmarshalJSON(b []byte) error {
type plain ConsoleExporter
type plain B3Propagator
var p plain
if err := json.Unmarshal(b, &p); err != nil {
return errors.Join(newErrUnmarshal(j), err)
Expand All @@ -44,7 +44,7 @@ func (j *B3Propagator) UnmarshalJSON(b []byte) error {

// UnmarshalJSON implements json.Unmarshaler.
func (j *B3MultiPropagator) UnmarshalJSON(b []byte) error {
type plain ConsoleExporter
type plain B3MultiPropagator
var p plain
if err := json.Unmarshal(b, &p); err != nil {
return errors.Join(newErrUnmarshal(j), err)
Expand All @@ -60,7 +60,7 @@ func (j *B3MultiPropagator) UnmarshalJSON(b []byte) error {

// UnmarshalJSON implements json.Unmarshaler.
func (j *BaggagePropagator) UnmarshalJSON(b []byte) error {
type plain ConsoleExporter
type plain BaggagePropagator
var p plain
if err := json.Unmarshal(b, &p); err != nil {
return errors.Join(newErrUnmarshal(j), err)
Expand All @@ -76,7 +76,7 @@ func (j *BaggagePropagator) UnmarshalJSON(b []byte) error {

// UnmarshalJSON implements json.Unmarshaler.
func (j *JaegerPropagator) UnmarshalJSON(b []byte) error {
type plain ConsoleExporter
type plain JaegerPropagator
var p plain
if err := json.Unmarshal(b, &p); err != nil {
return errors.Join(newErrUnmarshal(j), err)
Expand All @@ -92,7 +92,7 @@ func (j *JaegerPropagator) UnmarshalJSON(b []byte) error {

// UnmarshalJSON implements json.Unmarshaler.
func (j *OpenTracingPropagator) UnmarshalJSON(b []byte) error {
type plain ConsoleExporter
type plain OpenTracingPropagator
var p plain
if err := json.Unmarshal(b, &p); err != nil {
return errors.Join(newErrUnmarshal(j), err)
Expand All @@ -108,7 +108,7 @@ func (j *OpenTracingPropagator) UnmarshalJSON(b []byte) error {

// UnmarshalJSON implements json.Unmarshaler.
func (j *TraceContextPropagator) UnmarshalJSON(b []byte) error {
type plain ConsoleExporter
type plain TraceContextPropagator
var p plain
if err := json.Unmarshal(b, &p); err != nil {
return errors.Join(newErrUnmarshal(j), err)
Expand Down
Loading