diff --git a/.chloggen/add-json-jaeger.yaml b/.chloggen/add-json-jaeger.yaml index e592b71db76f..93d903a5e371 100644 --- a/.chloggen/add-json-jaeger.yaml +++ b/.chloggen/add-json-jaeger.yaml @@ -10,7 +10,7 @@ component: encoding/jaegerencodingextension note: Add support for JSON protocol for jaeger codec # Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists. -issues: [] +issues: [6272] # (Optional) One or more lines of additional information to render under the primary note. # These lines will be padded with 2 spaces and then inserted directly into the document. diff --git a/extension/encoding/jaegerencodingextension/extension.go b/extension/encoding/jaegerencodingextension/extension.go index e0be3066eb23..a035a589b970 100644 --- a/extension/encoding/jaegerencodingextension/extension.go +++ b/extension/encoding/jaegerencodingextension/extension.go @@ -5,7 +5,6 @@ package jaegerencodingextension // import "github.com/open-telemetry/opentelemet import ( "context" - "errors" "fmt" "go.opentelemetry.io/collector/component" @@ -16,32 +15,22 @@ import ( var _ encoding.TracesUnmarshalerExtension = &jaegerExtension{} var _ ptrace.Unmarshaler = &jaegerExtension{} -var _ ptrace.Marshaler = &jaegerExtension{} type jaegerExtension struct { config *Config unmarshaler ptrace.Unmarshaler - marshaler ptrace.Marshaler } func (e *jaegerExtension) UnmarshalTraces(buf []byte) (ptrace.Traces, error) { return e.unmarshaler.UnmarshalTraces(buf) } -func (e *jaegerExtension) MarshalTraces(td ptrace.Traces) ([]byte, error) { - if e.marshaler == nil { - return nil, errors.New("unsupported encoding") - } - return e.marshaler.MarshalTraces(td) -} - func (e *jaegerExtension) Start(_ context.Context, _ component.Host) error { - e.marshaler = nil switch e.config.Protocol { case JaegerProtocolProtobuf: e.unmarshaler = jaegerProtobufTrace{} case JaegerProtocolJSON: - e.unmarshaler = jaegerJsonTrace{} + e.unmarshaler = jaegerJSONTrace{} default: return fmt.Errorf("unsupported protocol: %q", e.config.Protocol) } diff --git a/extension/encoding/jaegerencodingextension/jaeger.go b/extension/encoding/jaegerencodingextension/jaeger.go index 4c051e101344..c3321882a9ff 100644 --- a/extension/encoding/jaegerencodingextension/jaeger.go +++ b/extension/encoding/jaegerencodingextension/jaeger.go @@ -25,10 +25,10 @@ func (j jaegerProtobufTrace) UnmarshalTraces(buf []byte) (ptrace.Traces, error) return jaegerSpanToTraces(span) } -type jaegerJsonTrace struct { +type jaegerJSONTrace struct { } -func (j jaegerJsonTrace) UnmarshalTraces(buf []byte) (ptrace.Traces, error) { +func (j jaegerJSONTrace) UnmarshalTraces(buf []byte) (ptrace.Traces, error) { span := &jaegerproto.Span{} err := jsonpb.Unmarshal(bytes.NewReader(buf), span) if err != nil {