Skip to content

Added node name as service name #645

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

Merged
merged 1 commit into from
Aug 13, 2024
Merged

Added node name as service name #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions integration/fabric/iou/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func CheckLocalMetrics(ii *integration.Infrastructure, user string, viewName str
Expect(metrics).NotTo(BeEmpty())

var sum float64
for _, m := range metrics[user+"_fsc_view_operations"].GetMetric() {
for _, m := range metrics["fsc_view_operations"].GetMetric() {
for _, labelPair := range m.Label {
if labelPair.GetName() == "view" && labelPair.GetValue() == viewName {
sum += m.Counter.GetValue()
Expand All @@ -84,11 +84,11 @@ func CheckLocalMetrics(ii *integration.Infrastructure, user string, viewName str
Expect(sum).NotTo(BeZero())
}

func CheckPrometheusMetrics(ii *integration.Infrastructure, user, viewName string) {
func CheckPrometheusMetrics(ii *integration.Infrastructure, viewName string) {
cli, err := ii.NWO.PrometheusAPI()
Expect(err).To(BeNil())
metric := model.Metric{
"__name__": model.LabelValue(user + "_fsc_view_operations"),
"__name__": model.LabelValue("fsc_view_operations"),
"view": model.LabelValue(viewName),
}
val, warnings, err := cli.Query(context.Background(), metric.String(), time.Now())
Expand Down
2 changes: 1 addition & 1 deletion integration/fabric/iou/iou_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (s *TestSuite) TestSucceeded() {
iou.CheckState(s.II, "lender", iouState, 5)

iou.CheckLocalMetrics(s.II, "borrower", "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/endorser/collectEndorsementsView")
iou.CheckPrometheusMetrics(s.II, "borrower", "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/endorser/collectEndorsementsView")
iou.CheckPrometheusMetrics(s.II, "github.com/hyperledger-labs/fabric-smart-client/platform/fabric/services/endorser/collectEndorsementsView")
}

func (s *TestSuite) TestSucceededWithReplicas() {
Expand Down
5 changes: 1 addition & 4 deletions platform/view/sdk/dig/sdk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,7 @@ func (p *SDK) Install() error {
if err != nil {
return nil, err
}
enhanced := tracing.NewTracerProviderWithBackingProvider(base, metricsProvider)
nodeName := configService.GetString("fsc.id")
named := tracing.NewProviderWithNodeName(enhanced, nodeName)
return tracing2.NewWrappedTracerProvider(named), nil
return tracing2.NewWrappedTracerProvider(tracing.NewTracerProviderWithBackingProvider(base, metricsProvider)), nil
}),
p.C.Provide(view3.NewMetrics),
p.C.Provide(view3.NewAccessControlChecker, dig.As(new(view3.PolicyChecker))),
Expand Down
12 changes: 8 additions & 4 deletions platform/view/sdk/tracing/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,14 @@ func NewTracerProvider(confService driver.ConfigService) (trace.TracerProvider,
if err := confService.UnmarshalKey("fsc.tracing", &c); err != nil {
return nil, err
}
return NewTracerProviderFromConfig(c)
return newTracerProviderFromConfig(c, confService.GetString("fsc.id"))
}

func NewTracerProviderFromConfig(c Config) (trace.TracerProvider, error) {
return newTracerProviderFromConfig(c, ServiceName)
}

func newTracerProviderFromConfig(c Config, serviceName string) (trace.TracerProvider, error) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it okay if service name is empty?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it can, but I haven't tried it. The code doesn't allow this though.

var exporter sdktrace.SpanExporter
var err error
switch c.Provider {
Expand All @@ -90,7 +94,7 @@ func NewTracerProviderFromConfig(c Config) (trace.TracerProvider, error) {
return nil, errors.WithMessagef(err, "failed to initialize span exporter")
}
logger.Infof("Initializing tracing provider with sampling: %v", c.Sampling)
return providerWithExporter(context.Background(), exporter, c.Sampling)
return providerWithExporter(context.Background(), exporter, c.Sampling, serviceName)
}

func fileExporter(c *FileConfig) (sdktrace.SpanExporter, error) {
Expand All @@ -112,11 +116,11 @@ func grpcExporter(c *OtplConfig) (sdktrace.SpanExporter, error) {
return otlptrace.New(context.Background(), otlptracegrpc.NewClient(otlptracegrpc.WithInsecure(), otlptracegrpc.WithEndpoint(c.Address)))
}

func providerWithExporter(ctx context.Context, exporter sdktrace.SpanExporter, sampling SamplingConfig) (*sdktrace.TracerProvider, error) {
func providerWithExporter(ctx context.Context, exporter sdktrace.SpanExporter, sampling SamplingConfig, serviceName string) (*sdktrace.TracerProvider, error) {
// Ensure default SDK resources and the required service name are set.
r, err := resource.New(ctx, resource.WithAttributes(
// the service name used to display traces in backends
semconv.ServiceNameKey.String(ServiceName),
semconv.ServiceNameKey.String(serviceName),
))
if err != nil {
return nil, errors.WithMessage(err, "failed creating resource")
Expand Down
Loading