diff --git a/integration/fabric/iou/commands.go b/integration/fabric/iou/commands.go index 697436164..b27d6d65f 100644 --- a/integration/fabric/iou/commands.go +++ b/integration/fabric/iou/commands.go @@ -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() @@ -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()) diff --git a/integration/fabric/iou/iou_test.go b/integration/fabric/iou/iou_test.go index 9ace50dab..4cec5c6ed 100644 --- a/integration/fabric/iou/iou_test.go +++ b/integration/fabric/iou/iou_test.go @@ -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() { diff --git a/platform/view/sdk/dig/sdk.go b/platform/view/sdk/dig/sdk.go index a3f28a6f3..c81e5a981 100644 --- a/platform/view/sdk/dig/sdk.go +++ b/platform/view/sdk/dig/sdk.go @@ -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))), diff --git a/platform/view/sdk/tracing/provider.go b/platform/view/sdk/tracing/provider.go index 2c1899c76..d92a2a1f7 100755 --- a/platform/view/sdk/tracing/provider.go +++ b/platform/view/sdk/tracing/provider.go @@ -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) { var exporter sdktrace.SpanExporter var err error switch c.Provider { @@ -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) { @@ -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")