-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move compatibility changes to internal, use when pdata parses traces …
…from bytes Signed-off-by: Bogdan Drutu <[email protected]>
- Loading branch information
1 parent
c9f29e6
commit d3cc537
Showing
6 changed files
with
147 additions
and
139 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package internal | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
|
|
||
| collectortrace "go.opentelemetry.io/collector/internal/data/protogen/collector/trace/v1" | ||
| otlptrace "go.opentelemetry.io/collector/internal/data/protogen/trace/v1" | ||
| ) | ||
|
|
||
| func TestDeprecatedStatusCode(t *testing.T) { | ||
| // See specification for handling status code here: | ||
| // https://github.com/open-telemetry/opentelemetry-proto/blob/59c488bfb8fb6d0458ad6425758b70259ff4a2bd/opentelemetry/proto/trace/v1/trace.proto#L231 | ||
| tests := []struct { | ||
| sendCode otlptrace.Status_StatusCode | ||
| sendDeprecatedCode otlptrace.Status_DeprecatedStatusCode | ||
| expectedRcvCode otlptrace.Status_StatusCode | ||
| expectedDeprecatedCode otlptrace.Status_DeprecatedStatusCode | ||
| }{ | ||
| { | ||
| // If code==STATUS_CODE_UNSET then the value of `deprecated_code` is the | ||
| // carrier of the overall status according to these rules: | ||
| // | ||
| // if deprecated_code==DEPRECATED_STATUS_CODE_OK then the receiver MUST interpret | ||
| // the overall status to be STATUS_CODE_UNSET. | ||
| sendCode: otlptrace.Status_STATUS_CODE_UNSET, | ||
| sendDeprecatedCode: otlptrace.Status_DEPRECATED_STATUS_CODE_OK, | ||
| expectedRcvCode: otlptrace.Status_STATUS_CODE_UNSET, | ||
| expectedDeprecatedCode: otlptrace.Status_DEPRECATED_STATUS_CODE_OK, | ||
| }, | ||
| { | ||
| // if deprecated_code!=DEPRECATED_STATUS_CODE_OK then the receiver MUST interpret | ||
| // the overall status to be STATUS_CODE_ERROR. | ||
| sendCode: otlptrace.Status_STATUS_CODE_UNSET, | ||
| sendDeprecatedCode: otlptrace.Status_DEPRECATED_STATUS_CODE_ABORTED, | ||
| expectedRcvCode: otlptrace.Status_STATUS_CODE_ERROR, | ||
| expectedDeprecatedCode: otlptrace.Status_DEPRECATED_STATUS_CODE_ABORTED, | ||
| }, | ||
| { | ||
| // If code!=STATUS_CODE_UNSET then the value of `deprecated_code` MUST be | ||
| // overwritten, the `code` field is the sole carrier of the status. | ||
| sendCode: otlptrace.Status_STATUS_CODE_OK, | ||
| sendDeprecatedCode: otlptrace.Status_DEPRECATED_STATUS_CODE_OK, | ||
| expectedRcvCode: otlptrace.Status_STATUS_CODE_OK, | ||
| expectedDeprecatedCode: otlptrace.Status_DEPRECATED_STATUS_CODE_OK, | ||
| }, | ||
| { | ||
| // If code!=STATUS_CODE_UNSET then the value of `deprecated_code` MUST be | ||
| // overwritten, the `code` field is the sole carrier of the status. | ||
| sendCode: otlptrace.Status_STATUS_CODE_OK, | ||
| sendDeprecatedCode: otlptrace.Status_DEPRECATED_STATUS_CODE_UNKNOWN_ERROR, | ||
| expectedRcvCode: otlptrace.Status_STATUS_CODE_OK, | ||
| expectedDeprecatedCode: otlptrace.Status_DEPRECATED_STATUS_CODE_OK, | ||
| }, | ||
| { | ||
| // If code!=STATUS_CODE_UNSET then the value of `deprecated_code` MUST be | ||
| // overwritten, the `code` field is the sole carrier of the status. | ||
| sendCode: otlptrace.Status_STATUS_CODE_ERROR, | ||
| sendDeprecatedCode: otlptrace.Status_DEPRECATED_STATUS_CODE_OK, | ||
| expectedRcvCode: otlptrace.Status_STATUS_CODE_ERROR, | ||
| expectedDeprecatedCode: otlptrace.Status_DEPRECATED_STATUS_CODE_UNKNOWN_ERROR, | ||
| }, | ||
| { | ||
| // If code!=STATUS_CODE_UNSET then the value of `deprecated_code` MUST be | ||
| // overwritten, the `code` field is the sole carrier of the status. | ||
| sendCode: otlptrace.Status_STATUS_CODE_ERROR, | ||
| sendDeprecatedCode: otlptrace.Status_DEPRECATED_STATUS_CODE_UNKNOWN_ERROR, | ||
| expectedRcvCode: otlptrace.Status_STATUS_CODE_ERROR, | ||
| expectedDeprecatedCode: otlptrace.Status_DEPRECATED_STATUS_CODE_UNKNOWN_ERROR, | ||
| }, | ||
| } | ||
|
|
||
| for _, test := range tests { | ||
| t.Run(test.sendCode.String()+"/"+test.sendDeprecatedCode.String(), func(t *testing.T) { | ||
| req := &collectortrace.ExportTraceServiceRequest{ | ||
| ResourceSpans: []*otlptrace.ResourceSpans{ | ||
| { | ||
| InstrumentationLibrarySpans: []*otlptrace.InstrumentationLibrarySpans{ | ||
| { | ||
| Spans: []*otlptrace.Span{ | ||
| { | ||
| Status: otlptrace.Status{ | ||
| Code: test.sendCode, | ||
| DeprecatedCode: test.sendDeprecatedCode, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| TracesCompatibilityChanges(req) | ||
| spanProto := req.ResourceSpans[0].InstrumentationLibrarySpans[0].Spans[0] | ||
| // Check that DeprecatedCode is passed as is. | ||
| assert.EqualValues(t, test.expectedRcvCode, spanProto.Status.Code) | ||
| assert.EqualValues(t, test.expectedDeprecatedCode, spanProto.Status.DeprecatedCode) | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters