@@ -24,14 +24,12 @@ import (
24
24
"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
25
25
"go.opentelemetry.io/otel/propagation"
26
26
"go.opentelemetry.io/otel/sdk/metric"
27
- "go.opentelemetry.io/otel/sdk/resource"
28
27
"go.opentelemetry.io/otel/sdk/trace"
29
- semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
30
28
)
31
29
32
30
// setupOTelSDK bootstraps the OpenTelemetry pipeline.
33
31
// If it does not return an error, make sure to call shutdown for proper cleanup.
34
- func setupOTelSDK (ctx context.Context , serviceName , serviceVersion string ) (shutdown func (context.Context ) error , err error ) {
32
+ func setupOTelSDK (ctx context.Context ) (shutdown func (context.Context ) error , err error ) {
35
33
var shutdownFuncs []func (context.Context ) error
36
34
37
35
// shutdown calls cleanup functions registered via shutdownFuncs.
@@ -51,19 +49,12 @@ func setupOTelSDK(ctx context.Context, serviceName, serviceVersion string) (shut
51
49
err = errors .Join (inErr , shutdown (ctx ))
52
50
}
53
51
54
- // Set up resource.
55
- res , err := newResource (serviceName , serviceVersion )
56
- if err != nil {
57
- handleErr (err )
58
- return
59
- }
60
-
61
52
// Set up propagator.
62
53
prop := newPropagator ()
63
54
otel .SetTextMapPropagator (prop )
64
55
65
56
// Set up trace provider.
66
- tracerProvider , err := newTraceProvider (res )
57
+ tracerProvider , err := newTraceProvider ()
67
58
if err != nil {
68
59
handleErr (err )
69
60
return
@@ -72,7 +63,7 @@ func setupOTelSDK(ctx context.Context, serviceName, serviceVersion string) (shut
72
63
otel .SetTracerProvider (tracerProvider )
73
64
74
65
// Set up meter provider.
75
- meterProvider , err := newMeterProvider (res )
66
+ meterProvider , err := newMeterProvider ()
76
67
if err != nil {
77
68
handleErr (err )
78
69
return
@@ -83,22 +74,14 @@ func setupOTelSDK(ctx context.Context, serviceName, serviceVersion string) (shut
83
74
return
84
75
}
85
76
86
- func newResource (serviceName , serviceVersion string ) (* resource.Resource , error ) {
87
- return resource .Merge (resource .Default (),
88
- resource .NewWithAttributes (semconv .SchemaURL ,
89
- semconv .ServiceName (serviceName ),
90
- semconv .ServiceVersion (serviceVersion ),
91
- ))
92
- }
93
-
94
77
func newPropagator () propagation.TextMapPropagator {
95
78
return propagation .NewCompositeTextMapPropagator (
96
79
propagation.TraceContext {},
97
80
propagation.Baggage {},
98
81
)
99
82
}
100
83
101
- func newTraceProvider (res * resource. Resource ) (* trace.TracerProvider , error ) {
84
+ func newTraceProvider () (* trace.TracerProvider , error ) {
102
85
traceExporter , err := stdouttrace .New (
103
86
stdouttrace .WithPrettyPrint ())
104
87
if err != nil {
@@ -109,19 +92,17 @@ func newTraceProvider(res *resource.Resource) (*trace.TracerProvider, error) {
109
92
trace .WithBatcher (traceExporter ,
110
93
// Default is 5s. Set to 1s for demonstrative purposes.
111
94
trace .WithBatchTimeout (time .Second )),
112
- trace .WithResource (res ),
113
95
)
114
96
return traceProvider , nil
115
97
}
116
98
117
- func newMeterProvider (res * resource. Resource ) (* metric.MeterProvider , error ) {
99
+ func newMeterProvider () (* metric.MeterProvider , error ) {
118
100
metricExporter , err := stdoutmetric .New ()
119
101
if err != nil {
120
102
return nil , err
121
103
}
122
104
123
105
meterProvider := metric .NewMeterProvider (
124
- metric .WithResource (res ),
125
106
metric .WithReader (metric .NewPeriodicReader (metricExporter ,
126
107
// Default is 1m. Set to 3s for demonstrative purposes.
127
108
metric .WithInterval (3 * time .Second ))),
0 commit comments