Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add resource detection to checkout service #662

Merged
merged 8 commits into from
Jan 7, 2023
Merged

Add resource detection to checkout service #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8f15c65
Add resource detection to checkout service
svrnm Dec 27, 2022
b2dfdb4
Add PR ID to changelog
svrnm Dec 27, 2022
2af30df
Add resources to metrics
svrnm Dec 28, 2022
28bd4fd
Merge branch 'main' into add-resource-detectors-to-checkout-service
julianocosta89 Jan 1, 2023
c6a1b78
Merge branch 'main' into add-resource-detectors-to-checkout-service
julianocosta89 Jan 2, 2023
0f4d882
Merge branch 'main' into add-resource-detectors-to-checkout-service
julianocosta89 Jan 4, 2023
6dd5eea
Merge branch 'main' into add-resource-detectors-to-checkout-service
cartersocha Jan 7, 2023
d02a784
Merge branch 'main' into add-resource-detectors-to-checkout-service
fatsheep9146 Jan 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,5 +166,7 @@ significant modifications will be credited to OpenTelemetry Authors.
([#648](https://github.com/open-telemetry/opentelemetry-demo/pull/648))
* Add Jaeger-SPM-Config
([#655](https://github.com/open-telemetry/opentelemetry-demo/pull/655))
* Add resource detectors to checkout service
([#662](https://github.com/open-telemetry/opentelemetry-demo/pull/662))
* Add resource detectors to cart service
([#663](https://github.com/open-telemetry/opentelemetry-demo/pull/663))
1 change: 1 addition & 0 deletions docs/services/checkoutservice.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ func initTracerProvider() *sdktrace.TracerProvider {
}
tp := sdktrace.NewTracerProvider(
sdktrace.WithBatcher(exporter),
sdktrace.WithResource(initResource()),
)
otel.SetTracerProvider(tp)
otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}))
Expand Down
27 changes: 26 additions & 1 deletion src/checkoutservice/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"net/http"
"os"
"strconv"
"sync"
"time"

"go.opentelemetry.io/otel/attribute"
Expand All @@ -41,6 +42,7 @@ import (
"go.opentelemetry.io/otel/metric/global"
"go.opentelemetry.io/otel/propagation"
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
sdkresource "go.opentelemetry.io/otel/sdk/resource"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
Expand All @@ -56,6 +58,8 @@ import (

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

func init() {
log = logrus.New()
Expand All @@ -71,6 +75,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 {
ctx := context.Background()

Expand All @@ -80,6 +101,7 @@ func initTracerProvider() *sdktrace.TracerProvider {
}
tp := sdktrace.NewTracerProvider(
sdktrace.WithBatcher(exporter),
sdktrace.WithResource(initResource()),
)
otel.SetTracerProvider(tp)
otel.SetTextMapPropagator(propagation.NewCompositeTextMapPropagator(propagation.TraceContext{}, propagation.Baggage{}))
Expand All @@ -94,7 +116,10 @@ func initMeterProvider() *sdkmetric.MeterProvider {
log.Fatalf("new otlp metric grpc exporter failed: %v", err)
}

mp := sdkmetric.NewMeterProvider(sdkmetric.WithReader(sdkmetric.NewPeriodicReader(exporter)))
mp := sdkmetric.NewMeterProvider(
sdkmetric.WithReader(sdkmetric.NewPeriodicReader(exporter)),
sdkmetric.WithResource(initResource()),
)
global.SetMeterProvider(mp)
return mp
}
Expand Down