1
0
mirror of https://github.com/open-telemetry/opentelemetry-go.git synced 2025-02-07 13:31:42 +02:00

Merge branch 'master' into f_rename

This commit is contained in:
Anthony Mirabella 2020-08-17 18:14:25 -04:00 committed by GitHub
commit dce4aec172
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -3,11 +3,11 @@ executors:
current-go:
resource_class: large
docker:
- image: cimg/go:1.14
- image: cimg/go:1.15
prior-go:
resource_class: large
docker:
- image: cimg/go:1.13
- image: cimg/go:1.14
build-template: &build-template
environment:

View File

@ -24,7 +24,7 @@ import (
)
func TestExportKindIdentity(t *testing.T) {
akind := aggregation.Kind(0)
akind := aggregation.Kind("Noop")
require.Equal(t, CumulativeExporter, CumulativeExporter.ExportKindFor(nil, akind))
require.Equal(t, DeltaExporter, DeltaExporter.ExportKindFor(nil, akind))