Skip to content

Commit 6f96e67

Browse files
authored
example/dice: Do not use semconv (open-telemetry#4849)
* example/dice: Do not use semconv * Update docs * Remove resource code and use defaults
1 parent c573785 commit 6f96e67

File tree

3 files changed

+11
-28
lines changed

3 files changed

+11
-28
lines changed

example/dice/doc.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
// Dice is the "Roll the dice" getting started example application.
15+
// Dice is the "Roll the dice" application.
16+
//
17+
// [Getting Started] uses this example to demonstrate OpenTelemetry Go.
18+
//
19+
// [Getting Started]: https://opentelemetry.io/docs/languages/net/automatic/getting-started/
1620
package main

example/dice/main.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ func run() (err error) {
3939
defer stop()
4040

4141
// Set up OpenTelemetry.
42-
serviceName := "dice"
43-
serviceVersion := "0.1.0"
44-
otelShutdown, err := setupOTelSDK(ctx, serviceName, serviceVersion)
42+
otelShutdown, err := setupOTelSDK(ctx)
4543
if err != nil {
4644
return
4745
}

example/dice/otel.go

+5-24
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,12 @@ import (
2424
"go.opentelemetry.io/otel/exporters/stdout/stdouttrace"
2525
"go.opentelemetry.io/otel/propagation"
2626
"go.opentelemetry.io/otel/sdk/metric"
27-
"go.opentelemetry.io/otel/sdk/resource"
2827
"go.opentelemetry.io/otel/sdk/trace"
29-
semconv "go.opentelemetry.io/otel/semconv/v1.24.0"
3028
)
3129

3230
// setupOTelSDK bootstraps the OpenTelemetry pipeline.
3331
// 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) {
3533
var shutdownFuncs []func(context.Context) error
3634

3735
// shutdown calls cleanup functions registered via shutdownFuncs.
@@ -51,19 +49,12 @@ func setupOTelSDK(ctx context.Context, serviceName, serviceVersion string) (shut
5149
err = errors.Join(inErr, shutdown(ctx))
5250
}
5351

54-
// Set up resource.
55-
res, err := newResource(serviceName, serviceVersion)
56-
if err != nil {
57-
handleErr(err)
58-
return
59-
}
60-
6152
// Set up propagator.
6253
prop := newPropagator()
6354
otel.SetTextMapPropagator(prop)
6455

6556
// Set up trace provider.
66-
tracerProvider, err := newTraceProvider(res)
57+
tracerProvider, err := newTraceProvider()
6758
if err != nil {
6859
handleErr(err)
6960
return
@@ -72,7 +63,7 @@ func setupOTelSDK(ctx context.Context, serviceName, serviceVersion string) (shut
7263
otel.SetTracerProvider(tracerProvider)
7364

7465
// Set up meter provider.
75-
meterProvider, err := newMeterProvider(res)
66+
meterProvider, err := newMeterProvider()
7667
if err != nil {
7768
handleErr(err)
7869
return
@@ -83,22 +74,14 @@ func setupOTelSDK(ctx context.Context, serviceName, serviceVersion string) (shut
8374
return
8475
}
8576

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-
9477
func newPropagator() propagation.TextMapPropagator {
9578
return propagation.NewCompositeTextMapPropagator(
9679
propagation.TraceContext{},
9780
propagation.Baggage{},
9881
)
9982
}
10083

101-
func newTraceProvider(res *resource.Resource) (*trace.TracerProvider, error) {
84+
func newTraceProvider() (*trace.TracerProvider, error) {
10285
traceExporter, err := stdouttrace.New(
10386
stdouttrace.WithPrettyPrint())
10487
if err != nil {
@@ -109,19 +92,17 @@ func newTraceProvider(res *resource.Resource) (*trace.TracerProvider, error) {
10992
trace.WithBatcher(traceExporter,
11093
// Default is 5s. Set to 1s for demonstrative purposes.
11194
trace.WithBatchTimeout(time.Second)),
112-
trace.WithResource(res),
11395
)
11496
return traceProvider, nil
11597
}
11698

117-
func newMeterProvider(res *resource.Resource) (*metric.MeterProvider, error) {
99+
func newMeterProvider() (*metric.MeterProvider, error) {
118100
metricExporter, err := stdoutmetric.New()
119101
if err != nil {
120102
return nil, err
121103
}
122104

123105
meterProvider := metric.NewMeterProvider(
124-
metric.WithResource(res),
125106
metric.WithReader(metric.NewPeriodicReader(metricExporter,
126107
// Default is 1m. Set to 3s for demonstrative purposes.
127108
metric.WithInterval(3*time.Second))),

0 commit comments

Comments
 (0)