Skip to content

Commit 8727607

Browse files
Add ability to also discover PubSub
1 parent 6e9ab65 commit 8727607

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

pkg/gcp/services.go

+16
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ type discoveryOption struct {
4747
namespace string
4848
pod string
4949
gkeAutoDiscoverMetaData bool
50+
discoverPubSub bool
5051
}
5152

5253
func WithKubernetes(clusterName, namespace, pod, containerName string) discoveryOption {
@@ -58,6 +59,12 @@ func WithKubernetes(clusterName, namespace, pod, containerName string) discovery
5859
}
5960
}
6061

62+
func WithPubSub() discoveryOption {
63+
return discoveryOption{
64+
discoverPubSub: true,
65+
}
66+
}
67+
6168
func WithGKEAutoDiscoverMetaData() discoveryOption {
6269
/*
6370
This option will try to auto discover available metadata from the Google Cloud metadata service and environment variables.
@@ -118,6 +125,7 @@ func DiscoverServices(project, serviceName string, tracerProviderOptions []sdktr
118125
ErrorReporting: errorClient,
119126
}
120127

128+
discoverPubSub := false
121129
var traceResource *resource.Resource
122130
for _, opt := range opts {
123131
if opt.gkeAutoDiscoverMetaData {
@@ -134,11 +142,19 @@ func DiscoverServices(project, serviceName string, tracerProviderOptions []sdktr
134142
traceResource = gke.TraceResourceFromMetaData(serviceName, metadata)
135143
} else if opt.pod != "" {
136144
s.MonitoredResource = gke.MonitoredResource(s.Logging, project, opt.clusterName, opt.namespace, opt.pod, opt.containerName)
145+
} else if opt.discoverPubSub {
146+
discoverPubSub = true
137147
}
138148
}
139149
if traceResource != nil {
140150
tracerProviderOptions = append(tracerProviderOptions, sdktrace.WithResource(traceResource))
141151
}
152+
if discoverPubSub {
153+
s.PubSub, err = pubsub.NewClient(context.Background(), project)
154+
if err != nil {
155+
return nil, err
156+
}
157+
}
142158

143159
s.TracerProvider = sdktrace.NewTracerProvider(append(tracerProviderOptions, sdktrace.WithBatcher(exporter))...)
144160

0 commit comments

Comments
 (0)