From 3b01a854d1cbdcaebf38f89af8b2f28fb90489eb Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Fri, 24 Jul 2020 20:44:51 -0700 Subject: [PATCH] Make the stdout exporter a package (#963) * Make the stdout exporter its own package Follow the pattern of the other exporters. * Update dependabot with stdout exporter * Add replace directives for stdout exporter * Remove outdated example test from metric SDK * go mod tidy * Update othttp example test Remove unused stdout exporter. * Remove tests in API that depend on stdout exporter The global package does not need to be validated with the SDK. A more properly constructed end-to-end integration test should be built if this is actually needed. * Add replace clause for otel in stdout go.mod --- .github/dependabot.yml | 4 + api/global/internal/meter_test.go | 66 ------------- example/basic/go.mod | 10 +- example/grpc/go.mod | 6 +- example/http/go.mod | 10 +- example/namedtracer/go.mod | 10 +- exporters/stdout/go.mod | 11 +++ exporters/stdout/go.sum | 97 +++++++++++++++++++ .../othttp/handler_example_test.go | 11 --- sdk/metric/example_test.go | 55 ----------- 10 files changed, 141 insertions(+), 139 deletions(-) create mode 100644 exporters/stdout/go.mod create mode 100644 exporters/stdout/go.sum delete mode 100644 sdk/metric/example_test.go diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b14a2c11fc1..4f5154d410a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -17,6 +17,10 @@ updates: directory: "/exporters/otlp" # Location of package manifests schedule: interval: "daily" + - package-ecosystem: "gomod" # See documentation for possible values + directory: "/exporters/stdout" # Location of package manifests + schedule: + interval: "daily" - package-ecosystem: "gomod" # See documentation for possible values directory: "/exporters/metric/prometheus" # Location of package manifests schedule: diff --git a/api/global/internal/meter_test.go b/api/global/internal/meter_test.go index 6bc65c350cb..aad2e3fabd2 100644 --- a/api/global/internal/meter_test.go +++ b/api/global/internal/meter_test.go @@ -15,11 +15,8 @@ package internal_test import ( - "bytes" "context" "errors" - "io" - "io/ioutil" "testing" "github.com/stretchr/testify/require" @@ -28,7 +25,6 @@ import ( "go.opentelemetry.io/otel/api/global/internal" "go.opentelemetry.io/otel/api/kv" "go.opentelemetry.io/otel/api/metric" - "go.opentelemetry.io/otel/exporters/stdout" metrictest "go.opentelemetry.io/otel/internal/metric" ) @@ -229,41 +225,6 @@ func TestUnbind(t *testing.T) { boundM.Unbind() } -func TestDefaultSDK(t *testing.T) { - internal.ResetForTest() - - ctx := context.Background() - meter1 := global.Meter("builtin") - labels1 := []kv.KeyValue{kv.String("A", "B")} - - counter := Must(meter1).NewInt64Counter("test.builtin") - counter.Add(ctx, 1, labels1...) - counter.Add(ctx, 1, labels1...) - - in, out := io.Pipe() - pusher, err := stdout.InstallNewPipeline([]stdout.Option{ - stdout.WithWriter(out), - stdout.WithoutTimestamps(), - }, nil) - if err != nil { - panic(err) - } - - counter.Add(ctx, 1, labels1...) - - ch := make(chan string) - go func() { - data, _ := ioutil.ReadAll(in) - ch <- string(data) - }() - - pusher.Stop() - out.Close() - - require.Equal(t, `[{"Name":"test.builtin{instrumentation.name=builtin,A=B}","Sum":1}] -`, <-ch) -} - func TestUnbindThenRecordOne(t *testing.T) { internal.ResetForTest() @@ -394,30 +355,3 @@ func TestRecordBatchMock(t *testing.T) { }, asStructs(mock.MeasurementBatches)) } - -func TestRecordBatchRealSDK(t *testing.T) { - internal.ResetForTest() - - meter := global.MeterProvider().Meter("builtin") - - counter := Must(meter).NewInt64Counter("test.counter") - - meter.RecordBatch(context.Background(), nil, counter.Measurement(1)) - - var buf bytes.Buffer - - pusher, err := stdout.InstallNewPipeline([]stdout.Option{ - stdout.WithWriter(&buf), - stdout.WithoutTimestamps(), - }, nil) - if err != nil { - t.Fatal(err) - } - global.SetMeterProvider(pusher.Provider()) - - meter.RecordBatch(context.Background(), nil, counter.Measurement(1)) - pusher.Stop() - - require.Equal(t, `[{"Name":"test.counter{instrumentation.name=builtin}","Sum":1}] -`, buf.String()) -} diff --git a/example/basic/go.mod b/example/basic/go.mod index d73d0030ea7..d790f1c0849 100644 --- a/example/basic/go.mod +++ b/example/basic/go.mod @@ -2,6 +2,12 @@ module go.opentelemetry.io/otel/example/basic go 1.13 -replace go.opentelemetry.io/otel => ../.. +replace ( + go.opentelemetry.io/otel => ../.. + go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout +) -require go.opentelemetry.io/otel v0.9.0 +require ( + go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/otel/exporters/stdout v0.9.0 +) diff --git a/example/grpc/go.mod b/example/grpc/go.mod index 8b65a4b0c3b..6d3f4a48d71 100644 --- a/example/grpc/go.mod +++ b/example/grpc/go.mod @@ -2,11 +2,15 @@ module go.opentelemetry.io/otel/example/grpc go 1.13 -replace go.opentelemetry.io/otel => ../.. +replace ( + go.opentelemetry.io/otel => ../.. + go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout +) require ( github.com/golang/protobuf v1.4.2 go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/otel/exporters/stdout v0.9.0 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 google.golang.org/grpc v1.30.0 ) diff --git a/example/http/go.mod b/example/http/go.mod index 34d2feb4444..eb19941b78a 100644 --- a/example/http/go.mod +++ b/example/http/go.mod @@ -2,6 +2,12 @@ module go.opentelemetry.io/otel/example/http go 1.13 -replace go.opentelemetry.io/otel => ../.. +replace ( + go.opentelemetry.io/otel => ../.. + go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout +) -require go.opentelemetry.io/otel v0.9.0 +require ( + go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/otel/exporters/stdout v0.9.0 +) diff --git a/example/namedtracer/go.mod b/example/namedtracer/go.mod index bb6f07160fb..f1e5ba11b24 100644 --- a/example/namedtracer/go.mod +++ b/example/namedtracer/go.mod @@ -2,6 +2,12 @@ module go.opentelemetry.io/otel/example/namedtracer go 1.13 -replace go.opentelemetry.io/otel => ../.. +replace ( + go.opentelemetry.io/otel => ../.. + go.opentelemetry.io/otel/exporters/stdout => ../../exporters/stdout +) -require go.opentelemetry.io/otel v0.9.0 +require ( + go.opentelemetry.io/otel v0.9.0 + go.opentelemetry.io/otel/exporters/stdout v0.9.0 +) diff --git a/exporters/stdout/go.mod b/exporters/stdout/go.mod new file mode 100644 index 00000000000..da51b99c4dd --- /dev/null +++ b/exporters/stdout/go.mod @@ -0,0 +1,11 @@ +module go.opentelemetry.io/otel/exporters/stdout + +go 1.14 + +replace go.opentelemetry.io/otel => ../.. + +require ( + github.com/stretchr/testify v1.6.1 + go.opentelemetry.io/otel v0.9.0 + google.golang.org/grpc v1.30.0 +) diff --git a/exporters/stdout/go.sum b/exporters/stdout/go.sum new file mode 100644 index 00000000000..ac2b345dfaa --- /dev/null +++ b/exporters/stdout/go.sum @@ -0,0 +1,97 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf98Yf+CNIJx9vOZOfHFDDzgDRYsnNk/vs= +github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= +github.com/benbjohnson/clock v1.0.3 h1:vkLuvpK4fmtSCuo60+yC63p7y0BmQ8gm5ZXGuBCJyXg= +github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1 h1:JFrFEBb2xKufg6XkJsJr+WbKb4FQlURi5RUcBveYu9k= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03 h1:4HYDjxeNXAOTv3o1N2tjo8UUSlhQgAD52FVkwxnWgM8= +google.golang.org/genproto v0.0.0-20191009194640-548a555dbc03/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.30.0 h1:M5a8xTlYTxwMn5ZFkwhRabsygDY5G8TYLyQDBxJNAxE= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/instrumentation/othttp/handler_example_test.go b/instrumentation/othttp/handler_example_test.go index c01c379ae01..080022d0b7e 100644 --- a/instrumentation/othttp/handler_example_test.go +++ b/instrumentation/othttp/handler_example_test.go @@ -25,7 +25,6 @@ import ( "go.opentelemetry.io/otel/api/kv" "go.opentelemetry.io/otel/api/trace" - "go.opentelemetry.io/otel/exporters/stdout" "go.opentelemetry.io/otel/instrumentation/othttp" ) @@ -44,16 +43,6 @@ func ExampleNewHandler() { a painting */ - // Write spans to stdout - pusher, err := stdout.InstallNewPipeline([]stdout.Option{ - stdout.WithPrettyPrint(), - stdout.WithoutTimestamps(), // This makes the output deterministic - }, nil) - if err != nil { - log.Fatal(err) - } - defer pusher.Stop() - figureOutName := func(ctx context.Context, s string) (string, error) { pp := strings.SplitN(s, "/", 2) var err error diff --git a/sdk/metric/example_test.go b/sdk/metric/example_test.go deleted file mode 100644 index 28b1c0d40bb..00000000000 --- a/sdk/metric/example_test.go +++ /dev/null @@ -1,55 +0,0 @@ -// 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 metric_test - -import ( - "bytes" - "context" - "fmt" - - "go.opentelemetry.io/otel/api/kv" - - "go.opentelemetry.io/otel/api/metric" - "go.opentelemetry.io/otel/exporters/stdout" -) - -func ExampleNew() { - buf := bytes.Buffer{} - _, pusher, err := stdout.NewExportPipeline([]stdout.Option{ - // Defaults to STDOUT. - stdout.WithWriter(&buf), - stdout.WithPrettyPrint(), - stdout.WithoutTimestamps(), // This makes the output deterministic - }, nil) - if err != nil { - panic(fmt.Sprintln("Could not initialize stdout exporter:", err)) - } - - meter := metric.Must(pusher.Provider().Meter("example")) - counter := meter.NewInt64Counter("a.counter") - counter.Add(context.Background(), 100, kv.String("key", "value")) - - // Flush everything - pusher.Stop() - - fmt.Println(buf.String()) - // Output: - // [ - // { - // "Name": "a.counter{instrumentation.name=example,key=value}", - // "Sum": 100 - // } - // ] -}