Update OTLP to v0.6.0 (#1354)

* Update opentelemetry-proto submodule to v0.6.0 * Update generated code * Update the OTLP exporter with new proto * Update CHANGELOG
open-telemetry · Nov 20, 2020 · 5b5b4ab · 5b5b4ab
1 parent 4619c06
commit 5b5b4ab
Show file tree

Hide file tree

Showing 7 changed files with 313 additions and 234 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,7 +28,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
   - `EmptySpanContext` is removed.
 - Move the `go.opentelemetry.io/otel/api/trace/tracetest` package into `go.opentelemetry.io/otel/oteltest`. (#1229)
 - OTLP Exporter updates:
-  - supports OTLP v0.5.0 (#1230)
+  - supports OTLP v0.6.0 (#1230, #1354)
   - supports configurable aggregation temporality (default: Cumulative, optional: Stateless). (#1296)
 - The Sampler is now called on local child spans. (#1233)
 - The `Kind` type from the `go.opentelemetry.io/otel/api/metric` package was renamed to `InstrumentKind` to more specifically describe what it is and avoid semantic ambiguity. (#1240)

diff --git a/exporters/otlp/internal/opentelemetry-proto b/exporters/otlp/internal/opentelemetry-proto
diff --git a/exporters/otlp/internal/opentelemetry-proto-gen/collector/trace/v1/trace_config.pb.go b/exporters/otlp/internal/opentelemetry-proto-gen/collector/trace/v1/trace_config.pb.go
diff --git a/exporters/otlp/internal/opentelemetry-proto-gen/trace/v1/trace.pb.go b/exporters/otlp/internal/opentelemetry-proto-gen/trace/v1/trace.pb.go
diff --git a/exporters/otlp/internal/transform/span.go b/exporters/otlp/internal/transform/span.go
@@ -129,7 +129,7 @@ func status(status codes.Code, message string) *tracepb.Status {
 	var c tracepb.Status_StatusCode
 	switch status {
 	case codes.Error:
-		c = tracepb.Status_STATUS_CODE_UNKNOWN_ERROR
+		c = tracepb.Status_STATUS_CODE_ERROR
 	default:
 		c = tracepb.Status_STATUS_CODE_OK
 	}

diff --git a/exporters/otlp/internal/transform/span_test.go b/exporters/otlp/internal/transform/span_test.go
@@ -172,7 +172,7 @@ func TestStatus(t *testing.T) {
 		{
 			codes.Error,
 			"test Error",
-			tracepb.Status_STATUS_CODE_UNKNOWN_ERROR,
+			tracepb.Status_STATUS_CODE_ERROR,
 		},
 	} {
 		expected := &tracepb.Status{Code: test.otlpStatus, Message: test.message}

diff --git a/exporters/otlp/otlp_span_test.go b/exporters/otlp/otlp_span_test.go
@@ -341,7 +341,7 @@ func TestExportSpans(t *testing.T) {
 										},
 									},
 									Status: &tracepb.Status{
-										Code:    tracepb.Status_STATUS_CODE_UNKNOWN_ERROR,
+										Code:    tracepb.Status_STATUS_CODE_ERROR,
 										Message: "Unauthenticated",
 									},
 								},