-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move span transforms of the OTLP exporter to internal (#593)
* Move span transforms of the OTLP exporter to internal Breakup and move functionality of the `transform_spans.go` file into appropriate files in the `internal/transform` sub-package. This is in preparation of using some of the overlapping functionality to implement Resource support in the metric side of the exporter. Adds more specific unit tests for some of the functionality transferred. The tests removed used the exporter as a processing engine and the replacement tests do not do this. The test found in the `oltp_test.go` seem to comprehensively cover this type of test. Include Link `Name` in the exporter span link and adds a test to check for this. Resolves #527 * Apply suggestions from code review Co-Authored-By: Rahul Patel <rghetia@yahoo.com> * Fix SpanData doc * Consolidate span comparison Co-authored-by: Rahul Patel <rghetia@yahoo.com> Co-authored-by: Joshua MacDonald <jmacd@users.noreply.github.com>
- Loading branch information
3 people
authored
Mar 25, 2020
1 parent
cfe74cf
commit c9dcc1b
Showing
10 changed files
with
645 additions
and
536 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| // 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 transform | ||
|
|
||
| import ( | ||
| commonpb "github.com/open-telemetry/opentelemetry-proto/gen/go/common/v1" | ||
|
|
||
| "go.opentelemetry.io/otel/api/core" | ||
| ) | ||
|
|
||
| // Attributes transforms a slice of KeyValues into a slice of OTLP attribute key-values. | ||
| func Attributes(attrs []core.KeyValue) []*commonpb.AttributeKeyValue { | ||
| if len(attrs) == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| out := make([]*commonpb.AttributeKeyValue, 0, len(attrs)) | ||
| for _, v := range attrs { | ||
| switch v.Value.Type() { | ||
| case core.BOOL: | ||
| out = append(out, &commonpb.AttributeKeyValue{ | ||
| Key: string(v.Key), | ||
| Type: commonpb.AttributeKeyValue_BOOL, | ||
| BoolValue: v.Value.AsBool(), | ||
| }) | ||
| case core.INT64, core.INT32, core.UINT32, core.UINT64: | ||
| out = append(out, &commonpb.AttributeKeyValue{ | ||
| Key: string(v.Key), | ||
| Type: commonpb.AttributeKeyValue_INT, | ||
| IntValue: v.Value.AsInt64(), | ||
| }) | ||
| case core.FLOAT32: | ||
| f32 := v.Value.AsFloat32() | ||
| out = append(out, &commonpb.AttributeKeyValue{ | ||
| Key: string(v.Key), | ||
| Type: commonpb.AttributeKeyValue_DOUBLE, | ||
| DoubleValue: float64(f32), | ||
| }) | ||
| case core.FLOAT64: | ||
| out = append(out, &commonpb.AttributeKeyValue{ | ||
| Key: string(v.Key), | ||
| Type: commonpb.AttributeKeyValue_DOUBLE, | ||
| DoubleValue: v.Value.AsFloat64(), | ||
| }) | ||
| case core.STRING: | ||
| out = append(out, &commonpb.AttributeKeyValue{ | ||
| Key: string(v.Key), | ||
| Type: commonpb.AttributeKeyValue_STRING, | ||
| StringValue: v.Value.AsString(), | ||
| }) | ||
| } | ||
| } | ||
| return out | ||
| } |
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,113 @@ | ||
| // 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 transform | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| commonpb "github.com/open-telemetry/opentelemetry-proto/gen/go/common/v1" | ||
| "github.com/stretchr/testify/assert" | ||
|
|
||
| "go.opentelemetry.io/otel/api/core" | ||
| ) | ||
|
|
||
| func TestAttributes(t *testing.T) { | ||
| for _, test := range []struct { | ||
| attrs []core.KeyValue | ||
| expected []*commonpb.AttributeKeyValue | ||
| }{ | ||
| {nil, nil}, | ||
| { | ||
| []core.KeyValue{ | ||
| core.Key("int to int").Int(123), | ||
| core.Key("uint to int").Uint(1234), | ||
| core.Key("int32 to int").Int32(12345), | ||
| core.Key("uint32 to int").Uint32(123456), | ||
| core.Key("int64 to int64").Int64(1234567), | ||
| core.Key("uint64 to int64").Uint64(12345678), | ||
| core.Key("float32 to double").Float32(3.14), | ||
| core.Key("float64 to double").Float32(1.61), | ||
| core.Key("string to string").String("string"), | ||
| core.Key("bool to bool").Bool(true), | ||
| }, | ||
| []*commonpb.AttributeKeyValue{ | ||
| { | ||
| Key: "int to int", | ||
| Type: commonpb.AttributeKeyValue_INT, | ||
| IntValue: 123, | ||
| }, | ||
| { | ||
| Key: "uint to int", | ||
| Type: commonpb.AttributeKeyValue_INT, | ||
| IntValue: 1234, | ||
| }, | ||
| { | ||
| Key: "int32 to int", | ||
| Type: commonpb.AttributeKeyValue_INT, | ||
| IntValue: 12345, | ||
| }, | ||
| { | ||
| Key: "uint32 to int", | ||
| Type: commonpb.AttributeKeyValue_INT, | ||
| IntValue: 123456, | ||
| }, | ||
| { | ||
| Key: "int64 to int64", | ||
| Type: commonpb.AttributeKeyValue_INT, | ||
| IntValue: 1234567, | ||
| }, | ||
| { | ||
| Key: "uint64 to int64", | ||
| Type: commonpb.AttributeKeyValue_INT, | ||
| IntValue: 12345678, | ||
| }, | ||
| { | ||
| Key: "float32 to double", | ||
| Type: commonpb.AttributeKeyValue_DOUBLE, | ||
| DoubleValue: 3.14, | ||
| }, | ||
| { | ||
| Key: "float64 to double", | ||
| Type: commonpb.AttributeKeyValue_DOUBLE, | ||
| DoubleValue: 1.61, | ||
| }, | ||
| { | ||
| Key: "string to string", | ||
| Type: commonpb.AttributeKeyValue_STRING, | ||
| StringValue: "string", | ||
| }, | ||
| { | ||
| Key: "bool to bool", | ||
| Type: commonpb.AttributeKeyValue_BOOL, | ||
| BoolValue: true, | ||
| }, | ||
| }, | ||
| }, | ||
| } { | ||
| got := Attributes(test.attrs) | ||
| if !assert.Len(t, got, len(test.expected)) { | ||
| continue | ||
| } | ||
| for i, actual := range got { | ||
| if actual.Type == commonpb.AttributeKeyValue_DOUBLE { | ||
| if !assert.InDelta(t, test.expected[i].DoubleValue, actual.DoubleValue, 0.01) { | ||
| continue | ||
| } | ||
| test.expected[i].DoubleValue = actual.DoubleValue | ||
| } | ||
| assert.Equal(t, test.expected[i], actual) | ||
| } | ||
| } | ||
| } |
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,29 @@ | ||
| // 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 transform | ||
|
|
||
| import ( | ||
| resourcepb "github.com/open-telemetry/opentelemetry-proto/gen/go/resource/v1" | ||
|
|
||
| "go.opentelemetry.io/otel/sdk/resource" | ||
| ) | ||
|
|
||
| // Resource transforms a Resource into an OTLP Resource. | ||
| func Resource(r *resource.Resource) *resourcepb.Resource { | ||
| if r == nil { | ||
| return nil | ||
| } | ||
| return &resourcepb.Resource{Attributes: Attributes(r.Attributes())} | ||
| } |
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,34 @@ | ||
| package transform | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
|
|
||
| "go.opentelemetry.io/otel/api/core" | ||
| "go.opentelemetry.io/otel/sdk/resource" | ||
| ) | ||
|
|
||
| func TestNilResource(t *testing.T) { | ||
| assert.Empty(t, Resource(nil)) | ||
| } | ||
|
|
||
| func TestEmptyResource(t *testing.T) { | ||
| assert.Empty(t, Resource(&resource.Resource{})) | ||
| } | ||
|
|
||
| /* | ||
| * This does not include any testing on the ordering of Resource Attributes. | ||
| * They are stored as a map internally to the Resource and their order is not | ||
| * guaranteed. | ||
| */ | ||
|
|
||
| func TestResourceAttributes(t *testing.T) { | ||
| attrs := []core.KeyValue{core.Key("one").Int(1), core.Key("two").Int(2)} | ||
|
|
||
| got := Resource(resource.New(attrs...)).GetAttributes() | ||
| if !assert.Len(t, attrs, 2) { | ||
| return | ||
| } | ||
| assert.ElementsMatch(t, Attributes(attrs), got) | ||
| } |
Oops, something went wrong.