vendor: update all dependencies
This commit is contained in:
+65
@@ -0,0 +1,65 @@
|
||||
// Copyright 2017, Google Inc. All rights reserved.
|
||||
//
|
||||
// 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.
|
||||
|
||||
// AUTO-GENERATED CODE. DO NOT EDIT.
|
||||
|
||||
package trace
|
||||
|
||||
import (
|
||||
cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
|
||||
)
|
||||
|
||||
import (
|
||||
"strconv"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"cloud.google.com/go/internal/testutil"
|
||||
"golang.org/x/net/context"
|
||||
"google.golang.org/api/iterator"
|
||||
"google.golang.org/api/option"
|
||||
)
|
||||
|
||||
var _ = iterator.Done
|
||||
var _ = strconv.FormatUint
|
||||
var _ = time.Now
|
||||
|
||||
func TestTraceServiceSmoke(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("skipping smoke test in short mode")
|
||||
}
|
||||
ctx := context.Background()
|
||||
ts := testutil.TokenSource(ctx, DefaultAuthScopes()...)
|
||||
if ts == nil {
|
||||
t.Skip("Integration tests skipped. See CONTRIBUTING.md for details")
|
||||
}
|
||||
|
||||
projectId := testutil.ProjID()
|
||||
_ = projectId
|
||||
|
||||
c, err := NewClient(ctx, option.WithTokenSource(ts))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
var projectId2 string = projectId
|
||||
var request = &cloudtracepb.ListTracesRequest{
|
||||
ProjectId: projectId2,
|
||||
}
|
||||
|
||||
iter := c.ListTraces(ctx, request)
|
||||
if _, err := iter.Next(); err != nil && err != iterator.Done {
|
||||
t.Error(err)
|
||||
}
|
||||
}
|
||||
+15
-5
@@ -15,7 +15,7 @@
|
||||
// AUTO-GENERATED CODE. DO NOT EDIT.
|
||||
|
||||
// Package trace is an experimental, auto-generated package for the
|
||||
// trace API.
|
||||
// Stackdriver Trace API.
|
||||
//
|
||||
// Send and retrieve trace data from Stackdriver Trace. Data is generated and
|
||||
// available by default for all App Engine applications. Data from other
|
||||
@@ -30,9 +30,19 @@ import (
|
||||
"google.golang.org/grpc/metadata"
|
||||
)
|
||||
|
||||
func insertXGoog(ctx context.Context, val string) context.Context {
|
||||
md, _ := metadata.FromContext(ctx)
|
||||
func insertXGoog(ctx context.Context, val []string) context.Context {
|
||||
md, _ := metadata.FromOutgoingContext(ctx)
|
||||
md = md.Copy()
|
||||
md["x-goog-api-client"] = []string{val}
|
||||
return metadata.NewContext(ctx, md)
|
||||
md["x-goog-api-client"] = val
|
||||
return metadata.NewOutgoingContext(ctx, md)
|
||||
}
|
||||
|
||||
// DefaultAuthScopes reports the authentication scopes required
|
||||
// by this package.
|
||||
func DefaultAuthScopes() []string {
|
||||
return []string{
|
||||
"https://www.googleapis.com/auth/cloud-platform",
|
||||
"https://www.googleapis.com/auth/trace.append",
|
||||
"https://www.googleapis.com/auth/trace.readonly",
|
||||
}
|
||||
}
|
||||
|
||||
+37
-15
@@ -17,16 +17,18 @@
|
||||
package trace
|
||||
|
||||
import (
|
||||
google_protobuf "github.com/golang/protobuf/ptypes/empty"
|
||||
emptypb "github.com/golang/protobuf/ptypes/empty"
|
||||
cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
|
||||
)
|
||||
|
||||
import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"io"
|
||||
"log"
|
||||
"net"
|
||||
"os"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/golang/protobuf/proto"
|
||||
@@ -36,6 +38,8 @@ import (
|
||||
status "google.golang.org/genproto/googleapis/rpc/status"
|
||||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/codes"
|
||||
"google.golang.org/grpc/metadata"
|
||||
gstatus "google.golang.org/grpc/status"
|
||||
)
|
||||
|
||||
var _ = io.EOF
|
||||
@@ -57,7 +61,11 @@ type mockTraceServer struct {
|
||||
resps []proto.Message
|
||||
}
|
||||
|
||||
func (s *mockTraceServer) ListTraces(_ context.Context, req *cloudtracepb.ListTracesRequest) (*cloudtracepb.ListTracesResponse, error) {
|
||||
func (s *mockTraceServer) ListTraces(ctx context.Context, req *cloudtracepb.ListTracesRequest) (*cloudtracepb.ListTracesResponse, error) {
|
||||
md, _ := metadata.FromIncomingContext(ctx)
|
||||
if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
|
||||
return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
|
||||
}
|
||||
s.reqs = append(s.reqs, req)
|
||||
if s.err != nil {
|
||||
return nil, s.err
|
||||
@@ -65,7 +73,11 @@ func (s *mockTraceServer) ListTraces(_ context.Context, req *cloudtracepb.ListTr
|
||||
return s.resps[0].(*cloudtracepb.ListTracesResponse), nil
|
||||
}
|
||||
|
||||
func (s *mockTraceServer) GetTrace(_ context.Context, req *cloudtracepb.GetTraceRequest) (*cloudtracepb.Trace, error) {
|
||||
func (s *mockTraceServer) GetTrace(ctx context.Context, req *cloudtracepb.GetTraceRequest) (*cloudtracepb.Trace, error) {
|
||||
md, _ := metadata.FromIncomingContext(ctx)
|
||||
if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
|
||||
return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
|
||||
}
|
||||
s.reqs = append(s.reqs, req)
|
||||
if s.err != nil {
|
||||
return nil, s.err
|
||||
@@ -73,12 +85,16 @@ func (s *mockTraceServer) GetTrace(_ context.Context, req *cloudtracepb.GetTrace
|
||||
return s.resps[0].(*cloudtracepb.Trace), nil
|
||||
}
|
||||
|
||||
func (s *mockTraceServer) PatchTraces(_ context.Context, req *cloudtracepb.PatchTracesRequest) (*google_protobuf.Empty, error) {
|
||||
func (s *mockTraceServer) PatchTraces(ctx context.Context, req *cloudtracepb.PatchTracesRequest) (*emptypb.Empty, error) {
|
||||
md, _ := metadata.FromIncomingContext(ctx)
|
||||
if xg := md["x-goog-api-client"]; len(xg) == 0 || !strings.Contains(xg[0], "gl-go/") {
|
||||
return nil, fmt.Errorf("x-goog-api-client = %v, expected gl-go key", xg)
|
||||
}
|
||||
s.reqs = append(s.reqs, req)
|
||||
if s.err != nil {
|
||||
return nil, s.err
|
||||
}
|
||||
return s.resps[0].(*google_protobuf.Empty), nil
|
||||
return s.resps[0].(*emptypb.Empty), nil
|
||||
}
|
||||
|
||||
// clientOpt is the option tests should use to connect to the test server.
|
||||
@@ -111,7 +127,7 @@ func TestMain(m *testing.M) {
|
||||
}
|
||||
|
||||
func TestTraceServicePatchTraces(t *testing.T) {
|
||||
var expectedResponse *google_protobuf.Empty = &google_protobuf.Empty{}
|
||||
var expectedResponse *emptypb.Empty = &emptypb.Empty{}
|
||||
|
||||
mockTrace.err = nil
|
||||
mockTrace.reqs = nil
|
||||
@@ -143,8 +159,8 @@ func TestTraceServicePatchTraces(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestTraceServicePatchTracesError(t *testing.T) {
|
||||
errCode := codes.Internal
|
||||
mockTrace.err = grpc.Errorf(errCode, "test error")
|
||||
errCode := codes.PermissionDenied
|
||||
mockTrace.err = gstatus.Error(errCode, "test error")
|
||||
|
||||
var projectId string = "projectId-1969970175"
|
||||
var traces *cloudtracepb.Traces = &cloudtracepb.Traces{}
|
||||
@@ -160,7 +176,9 @@ func TestTraceServicePatchTracesError(t *testing.T) {
|
||||
|
||||
err = c.PatchTraces(context.Background(), request)
|
||||
|
||||
if c := grpc.Code(err); c != errCode {
|
||||
if st, ok := gstatus.FromError(err); !ok {
|
||||
t.Errorf("got error %v, expected grpc error", err)
|
||||
} else if c := st.Code(); c != errCode {
|
||||
t.Errorf("got error code %q, want %q", c, errCode)
|
||||
}
|
||||
}
|
||||
@@ -205,8 +223,8 @@ func TestTraceServiceGetTrace(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestTraceServiceGetTraceError(t *testing.T) {
|
||||
errCode := codes.Internal
|
||||
mockTrace.err = grpc.Errorf(errCode, "test error")
|
||||
errCode := codes.PermissionDenied
|
||||
mockTrace.err = gstatus.Error(errCode, "test error")
|
||||
|
||||
var projectId string = "projectId-1969970175"
|
||||
var traceId string = "traceId1270300245"
|
||||
@@ -222,7 +240,9 @@ func TestTraceServiceGetTraceError(t *testing.T) {
|
||||
|
||||
resp, err := c.GetTrace(context.Background(), request)
|
||||
|
||||
if c := grpc.Code(err); c != errCode {
|
||||
if st, ok := gstatus.FromError(err); !ok {
|
||||
t.Errorf("got error %v, expected grpc error", err)
|
||||
} else if c := st.Code(); c != errCode {
|
||||
t.Errorf("got error code %q, want %q", c, errCode)
|
||||
}
|
||||
_ = resp
|
||||
@@ -277,8 +297,8 @@ func TestTraceServiceListTraces(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestTraceServiceListTracesError(t *testing.T) {
|
||||
errCode := codes.Internal
|
||||
mockTrace.err = grpc.Errorf(errCode, "test error")
|
||||
errCode := codes.PermissionDenied
|
||||
mockTrace.err = gstatus.Error(errCode, "test error")
|
||||
|
||||
var projectId string = "projectId-1969970175"
|
||||
var request = &cloudtracepb.ListTracesRequest{
|
||||
@@ -292,7 +312,9 @@ func TestTraceServiceListTracesError(t *testing.T) {
|
||||
|
||||
resp, err := c.ListTraces(context.Background(), request).Next()
|
||||
|
||||
if c := grpc.Code(err); c != errCode {
|
||||
if st, ok := gstatus.FromError(err); !ok {
|
||||
t.Errorf("got error %v, expected grpc error", err)
|
||||
} else if c := st.Code(); c != errCode {
|
||||
t.Errorf("got error code %q, want %q", c, errCode)
|
||||
}
|
||||
_ = resp
|
||||
|
||||
+19
-20
@@ -41,11 +41,7 @@ type CallOptions struct {
|
||||
func defaultClientOptions() []option.ClientOption {
|
||||
return []option.ClientOption{
|
||||
option.WithEndpoint("cloudtrace.googleapis.com:443"),
|
||||
option.WithScopes(
|
||||
"https://www.googleapis.com/auth/cloud-platform",
|
||||
"https://www.googleapis.com/auth/trace.append",
|
||||
"https://www.googleapis.com/auth/trace.readonly",
|
||||
),
|
||||
option.WithScopes(DefaultAuthScopes()...),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,7 +79,7 @@ type Client struct {
|
||||
CallOptions *CallOptions
|
||||
|
||||
// The metadata to be sent with each request.
|
||||
xGoogHeader string
|
||||
xGoogHeader []string
|
||||
}
|
||||
|
||||
// NewClient creates a new trace service client.
|
||||
@@ -124,8 +120,8 @@ func (c *Client) Close() error {
|
||||
// use by Google-written clients.
|
||||
func (c *Client) SetGoogleClientInfo(keyval ...string) {
|
||||
kv := append([]string{"gl-go", version.Go()}, keyval...)
|
||||
kv = append(kv, "gapic", version.Repo, "gax", gax.Version, "grpc", "")
|
||||
c.xGoogHeader = gax.XGoogHeader(kv...)
|
||||
kv = append(kv, "gapic", version.Repo, "gax", gax.Version, "grpc", grpc.Version)
|
||||
c.xGoogHeader = []string{gax.XGoogHeader(kv...)}
|
||||
}
|
||||
|
||||
// PatchTraces sends new traces to Stackdriver Trace or updates existing traces. If the ID
|
||||
@@ -133,25 +129,27 @@ func (c *Client) SetGoogleClientInfo(keyval ...string) {
|
||||
// in the existing trace and its spans are overwritten by the provided values,
|
||||
// and any new fields provided are merged with the existing trace data. If the
|
||||
// ID does not match, a new trace is created.
|
||||
func (c *Client) PatchTraces(ctx context.Context, req *cloudtracepb.PatchTracesRequest) error {
|
||||
func (c *Client) PatchTraces(ctx context.Context, req *cloudtracepb.PatchTracesRequest, opts ...gax.CallOption) error {
|
||||
ctx = insertXGoog(ctx, c.xGoogHeader)
|
||||
err := gax.Invoke(ctx, func(ctx context.Context) error {
|
||||
opts = append(c.CallOptions.PatchTraces[0:len(c.CallOptions.PatchTraces):len(c.CallOptions.PatchTraces)], opts...)
|
||||
err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
|
||||
var err error
|
||||
_, err = c.client.PatchTraces(ctx, req)
|
||||
_, err = c.client.PatchTraces(ctx, req, settings.GRPC...)
|
||||
return err
|
||||
}, c.CallOptions.PatchTraces...)
|
||||
}, opts...)
|
||||
return err
|
||||
}
|
||||
|
||||
// GetTrace gets a single trace by its ID.
|
||||
func (c *Client) GetTrace(ctx context.Context, req *cloudtracepb.GetTraceRequest) (*cloudtracepb.Trace, error) {
|
||||
func (c *Client) GetTrace(ctx context.Context, req *cloudtracepb.GetTraceRequest, opts ...gax.CallOption) (*cloudtracepb.Trace, error) {
|
||||
ctx = insertXGoog(ctx, c.xGoogHeader)
|
||||
opts = append(c.CallOptions.GetTrace[0:len(c.CallOptions.GetTrace):len(c.CallOptions.GetTrace)], opts...)
|
||||
var resp *cloudtracepb.Trace
|
||||
err := gax.Invoke(ctx, func(ctx context.Context) error {
|
||||
err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
|
||||
var err error
|
||||
resp, err = c.client.GetTrace(ctx, req)
|
||||
resp, err = c.client.GetTrace(ctx, req, settings.GRPC...)
|
||||
return err
|
||||
}, c.CallOptions.GetTrace...)
|
||||
}, opts...)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -159,8 +157,9 @@ func (c *Client) GetTrace(ctx context.Context, req *cloudtracepb.GetTraceRequest
|
||||
}
|
||||
|
||||
// ListTraces returns of a list of traces that match the specified filter conditions.
|
||||
func (c *Client) ListTraces(ctx context.Context, req *cloudtracepb.ListTracesRequest) *TraceIterator {
|
||||
func (c *Client) ListTraces(ctx context.Context, req *cloudtracepb.ListTracesRequest, opts ...gax.CallOption) *TraceIterator {
|
||||
ctx = insertXGoog(ctx, c.xGoogHeader)
|
||||
opts = append(c.CallOptions.ListTraces[0:len(c.CallOptions.ListTraces):len(c.CallOptions.ListTraces)], opts...)
|
||||
it := &TraceIterator{}
|
||||
it.InternalFetch = func(pageSize int, pageToken string) ([]*cloudtracepb.Trace, string, error) {
|
||||
var resp *cloudtracepb.ListTracesResponse
|
||||
@@ -170,11 +169,11 @@ func (c *Client) ListTraces(ctx context.Context, req *cloudtracepb.ListTracesReq
|
||||
} else {
|
||||
req.PageSize = int32(pageSize)
|
||||
}
|
||||
err := gax.Invoke(ctx, func(ctx context.Context) error {
|
||||
err := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
|
||||
var err error
|
||||
resp, err = c.client.ListTraces(ctx, req)
|
||||
resp, err = c.client.ListTraces(ctx, req, settings.GRPC...)
|
||||
return err
|
||||
}, c.CallOptions.ListTraces...)
|
||||
}, opts...)
|
||||
if err != nil {
|
||||
return nil, "", err
|
||||
}
|
||||
|
||||
+4
-1
@@ -19,6 +19,7 @@ package trace_test
|
||||
import (
|
||||
"cloud.google.com/go/trace/apiv1"
|
||||
"golang.org/x/net/context"
|
||||
"google.golang.org/api/iterator"
|
||||
cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1"
|
||||
)
|
||||
|
||||
@@ -79,9 +80,11 @@ func ExampleClient_ListTraces() {
|
||||
it := c.ListTraces(ctx, req)
|
||||
for {
|
||||
resp, err := it.Next()
|
||||
if err == iterator.Done {
|
||||
break
|
||||
}
|
||||
if err != nil {
|
||||
// TODO: Handle error.
|
||||
break
|
||||
}
|
||||
// TODO: Use resp.
|
||||
_ = resp
|
||||
|
||||
Reference in New Issue
Block a user