Skip to content

Commit

Permalink
Add resource detectors to accounting service (#676)
Browse files Browse the repository at this point in the history
  • Loading branch information
svrnm authored Jan 10, 2023
1 parent 2d8ac56 commit ba1bf4c
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 0 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,3 +178,5 @@ significant modifications will be credited to OpenTelemetry Authors.
([#664](https://github.com/open-telemetry/opentelemetry-demo/pull/664))
* Update loadgenerator python base image and dependencies
([#669](https://github.com/open-telemetry/opentelemetry-demo/pull/669))
* Add resource detectors to accounting service
([#676](https://github.com/open-telemetry/opentelemetry-demo/pull/676))
1 change: 1 addition & 0 deletions docs/services/accountingservice.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ func initTracerProvider() (*sdktrace.TracerProvider, error) {
}
tp := sdktrace.NewTracerProvider(
sdktrace.WithBatcher(exporter),
sdktrace.WithResource(initResource()),
)
otel.SetTracerProvider(tp)
otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}))
Expand Down
22 changes: 22 additions & 0 deletions src/accountingservice/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,22 @@ import (
"os"
"os/signal"
"strings"
"sync"
"time"

"github.com/sirupsen/logrus"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
"go.opentelemetry.io/otel/propagation"
sdkresource "go.opentelemetry.io/otel/sdk/resource"
sdktrace "go.opentelemetry.io/otel/sdk/trace"

"github.com/open-telemetry/opentelemetry-demo/src/accountingservice/kafka"
)

var log *logrus.Logger
var resource *sdkresource.Resource
var initResourcesOnce sync.Once

func init() {
log = logrus.New()
Expand All @@ -47,6 +51,23 @@ func init() {
log.Out = os.Stdout
}

func initResource() *sdkresource.Resource {
initResourcesOnce.Do(func() {
extraResources, _ := sdkresource.New(
context.Background(),
sdkresource.WithOS(),
sdkresource.WithProcess(),
sdkresource.WithContainer(),
sdkresource.WithHost(),
)
resource, _ = sdkresource.Merge(
sdkresource.Default(),
extraResources,
)
})
return resource
}

func initTracerProvider() (*sdktrace.TracerProvider, error) {
ctx := context.Background()

Expand All @@ -56,6 +77,7 @@ func initTracerProvider() (*sdktrace.TracerProvider, error) {
}
tp := sdktrace.NewTracerProvider(
sdktrace.WithBatcher(exporter),
sdktrace.WithResource(initResource()),
)
otel.SetTracerProvider(tp)
otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}))
Expand Down

0 comments on commit ba1bf4c

Please sign in to comment.