Merge branch 'main' into infoplat-2449-otelzap-logger-add-telemetry-log-level

Author: pavel-raykov

observability-lib/README.md

@@ -32,56 +32,60 @@ Godoc generated documentation is available [here](https://pkg.go.dev/github.com/
 ```go
 package main
 
-import "github.com/smartcontractkit/chainlink-common/observability-lib/grafana"
+import (
+	"fmt"
+	"github.com/grafana/grafana-foundation-sdk/go/common"
+	"github.com/smartcontractkit/chainlink-common/observability-lib/grafana"
+)
 
 func main() {
 	builder := grafana.NewBuilder(&grafana.BuilderOptions{
-	    Name:       "Dashboard Name",
-	    Tags:       []string{"tags1", "tags2"},
-	    Refresh:    "30s",
-	    TimeFrom:   "now-30m",
-	    TimeTo:     "now",
+		Name:     "Dashboard Name",
+		Tags:     []string{"tags1", "tags2"},
+		Refresh:  "30s",
+		TimeFrom: "now-30m",
+		TimeTo:   "now",
 	})
-	
+
 	builder.AddVars(grafana.NewQueryVariable(&grafana.QueryVariableOptions{
-	    VariableOption: &grafana.VariableOption{
-	        Label: "Environment",
-	        Name:  "env",
-	    },
-	    Datasource: "Prometheus",
-	    Query:      `label_values(up, env)`,
+		VariableOption: &grafana.VariableOption{
+			Label: "Environment",
+			Name:  "env",
+		},
+		Datasource: "Prometheus",
+		Query:      `label_values(up, env)`,
 	}))
-	
+
 	builder.AddRow("Summary")
-	
+
 	builder.AddPanel(grafana.NewStatPanel(&grafana.StatPanelOptions{
-	    PanelOptions: &grafana.PanelOptions{
-	        Datasource:  "Prometheus",
-	        Title:       "Uptime",
-	        Description: "instance uptime",
-	        Span:        12,
-	        Height:      4,
-	        Decimals:    2,
-	        Unit:        "s",
-	        Query: []grafana.Query{
-	            {
-	                Expr:   `uptime_seconds`,
-	                Legend: `{{ pod }}`,
-	            },
-	        },
-	    },
-	    ColorMode:   common.BigValueColorModeNone,
-	    TextMode:    common.BigValueTextModeValueAndName,
-	    Orientation: common.VizOrientationHorizontal,
+		PanelOptions: &grafana.PanelOptions{
+			Datasource:  "Prometheus",
+			Title:       grafana.Pointer("Uptime"),
+			Description: "instance uptime",
+			Span:        12,
+			Height:      4,
+			Decimals:    grafana.Pointer(2.),
+			Unit:        "s",
+			Query: []grafana.Query{
+				{
+					Expr:   `uptime_seconds`,
+					Legend: `{{ pod }}`,
+				},
+			},
+		},
+		ColorMode:   common.BigValueColorModeNone,
+		TextMode:    common.BigValueTextModeValueAndName,
+		Orientation: common.VizOrientationHorizontal,
 	}))
-	
+
 	db, err := builder.Build()
 	if err != nil {
-	    return nil, err
+		return
 	}
 	json, err := db.GenerateJSON()
 	if err != nil {
-	    return nil, err
+		return
 	}
 	fmt.Println(string(json))
 }

pkg/capabilities/capabilities.go

@@ -106,8 +106,11 @@ type RequestMetadata struct {
 	// Use DecodedWorkflowName if the human readable name needs to be exposed, such as for logging purposes.
 	DecodedWorkflowName string
 	// SpendLimits is expected to be an array of tuples of spend type and limit. i.e. CONSENSUS -> 100_000
-	SpendLimits []SpendLimit
-	WorkflowTag string
+	SpendLimits                   []SpendLimit
+	WorkflowTag                   string
+	WorkflowRegistryChainSelector string
+	WorkflowRegistryAddress       string
+	EngineVersion                 string
 }
 
 func (m *RequestMetadata) ContextWithCRE(ctx context.Context) context.Context {

pkg/capabilities/pb/capabilities.pb.go

@@ -48,6 +48,9 @@ message RequestMetadata {
   string decoded_workflow_name = 9;
   repeated SpendLimit spend_limits = 10;
   string workflow_tag = 11;
+  string workflow_registry_chain_selector = 12;
+  string workflow_registry_address = 13;
+  string engine_version = 14;
 }
 
 message CapabilityRequest {
@@ -169,6 +172,7 @@ message InitialiseRequest {
   uint32 oracle_factory_id = 8;
   uint32 gateway_connector_id = 9;
   uint32 keystore_id = 10;
+  uint32 org_resolver_id = 11;
 }
 
 message CapabilityInfosReply {

pkg/capabilities/pb/capabilities.proto

@@ -314,16 +314,19 @@ func TriggerRegistrationRequestToProto(req capabilities.TriggerRegistrationReque
 	return &TriggerRegistrationRequest{
 		TriggerId: req.TriggerID,
 		Metadata: &RequestMetadata{
-			WorkflowId:               md.WorkflowID,
-			WorkflowExecutionId:      md.WorkflowExecutionID,
-			WorkflowOwner:            md.WorkflowOwner,
-			WorkflowName:             md.WorkflowName,
-			WorkflowDonId:            md.WorkflowDonID,
-			WorkflowDonConfigVersion: md.WorkflowDonConfigVersion,
-			ReferenceId:              md.ReferenceID,
-			DecodedWorkflowName:      md.DecodedWorkflowName,
-			SpendLimits:              spendLimitsToProto(md.SpendLimits),
-			WorkflowTag:              md.WorkflowTag,
+			WorkflowId:                    md.WorkflowID,
+			WorkflowExecutionId:           md.WorkflowExecutionID,
+			WorkflowOwner:                 md.WorkflowOwner,
+			WorkflowName:                  md.WorkflowName,
+			WorkflowDonId:                 md.WorkflowDonID,
+			WorkflowDonConfigVersion:      md.WorkflowDonConfigVersion,
+			ReferenceId:                   md.ReferenceID,
+			DecodedWorkflowName:           md.DecodedWorkflowName,
+			SpendLimits:                   spendLimitsToProto(md.SpendLimits),
+			WorkflowTag:                   md.WorkflowTag,
+			WorkflowRegistryChainSelector: md.WorkflowRegistryChainSelector,
+			WorkflowRegistryAddress:       md.WorkflowRegistryAddress,
+			EngineVersion:                 md.EngineVersion,
 		},
 		Config:  values.ProtoMap(config),
 		Payload: req.Payload,
@@ -361,16 +364,19 @@ func TriggerRegistrationRequestFromProto(req *TriggerRegistrationRequest) (capab
 	return capabilities.TriggerRegistrationRequest{
 		TriggerID: req.TriggerId,
 		Metadata: capabilities.RequestMetadata{
-			WorkflowID:               md.WorkflowId,
-			WorkflowOwner:            md.WorkflowOwner,
-			WorkflowExecutionID:      md.WorkflowExecutionId,
-			WorkflowName:             md.WorkflowName,
-			WorkflowDonID:            md.WorkflowDonId,
-			WorkflowDonConfigVersion: md.WorkflowDonConfigVersion,
-			ReferenceID:              md.ReferenceId,
-			DecodedWorkflowName:      md.DecodedWorkflowName,
-			SpendLimits:              spendLimitsFromProto(md.SpendLimits),
-			WorkflowTag:              md.WorkflowTag,
+			WorkflowID:                    md.WorkflowId,
+			WorkflowOwner:                 md.WorkflowOwner,
+			WorkflowExecutionID:           md.WorkflowExecutionId,
+			WorkflowName:                  md.WorkflowName,
+			WorkflowDonID:                 md.WorkflowDonId,
+			WorkflowDonConfigVersion:      md.WorkflowDonConfigVersion,
+			ReferenceID:                   md.ReferenceId,
+			DecodedWorkflowName:           md.DecodedWorkflowName,
+			SpendLimits:                   spendLimitsFromProto(md.SpendLimits),
+			WorkflowTag:                   md.WorkflowTag,
+			WorkflowRegistryChainSelector: md.WorkflowRegistryChainSelector,
+			WorkflowRegistryAddress:       md.WorkflowRegistryAddress,
+			EngineVersion:                 md.EngineVersion,
 		},
 		Config:  config,
 		Payload: req.Payload,

pkg/capabilities/pb/capabilities_helpers.go

@@ -16,6 +16,7 @@ import (
 	keystoreservice "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/keystore"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/keyvalue"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/oraclefactory"
+	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/orgresolver"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/pipeline"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/core/services/telemetry"
 	"github.com/smartcontractkit/chainlink-common/pkg/loop/internal/goplugin"
@@ -156,6 +157,15 @@ func (c *StandardCapabilitiesClient) Initialise(ctx context.Context, dependencie
 	}
 	resources = append(resources, gatewayConnectorRes)
 
+	orgResolverID, orgResolverRes, err := c.ServeNew("OrgResolver", func(s *grpc.Server) {
+		pb.RegisterOrgResolverServer(s, orgresolver.NewServer(dependencies.OrgResolver))
+	})
+	if err != nil {
+		c.CloseAll(resources...)
+		return fmt.Errorf("failed to serve org resolver: %w", err)
+	}
+	resources = append(resources, orgResolverRes)
+
 	_, err = c.StandardCapabilitiesClient.Initialise(ctx, &capabilitiespb.InitialiseRequest{
 		Config:             config,
 		ErrorLogId:         errorLogID,
@@ -167,6 +177,7 @@ func (c *StandardCapabilitiesClient) Initialise(ctx context.Context, dependencie
 		OracleFactoryId:    oracleFactoryID,
 		GatewayConnectorId: gatewayConnectorID,
 		KeystoreId:         keyStoreID,
+		OrgResolverId:      orgResolverID,
 	})
 
 	if err != nil {
@@ -310,6 +321,14 @@ func (s *standardCapabilitiesServer) Initialise(ctx context.Context, request *ca
 	resources = append(resources, net.Resource{Closer: gatewayConnectorConn, Name: "GatewayConnector"})
 	gatewayConnector := gateway.NewGatewayConnectorClient(gatewayConnectorConn, s.BrokerExt)
 
+	orgResolverConn, err := s.Dial(request.OrgResolverId)
+	if err != nil {
+		s.CloseAll(resources...)
+		return nil, net.ErrConnDial{Name: "OrgResolver", ID: request.OrgResolverId, Err: err}
+	}
+	resources = append(resources, net.Resource{Closer: orgResolverConn, Name: "OrgResolver"})
+	orgResolver := orgresolver.NewClient(s.Logger, orgResolverConn)
+
 	dependencies := core.StandardCapabilitiesDependencies{
 		Config:             request.Config,
 		TelemetryService:   telemetry,
@@ -321,6 +340,7 @@ func (s *standardCapabilitiesServer) Initialise(ctx context.Context, request *ca
 		OracleFactory:      oracleFactory,
 		GatewayConnector:   gatewayConnector,
 		P2PKeystore:        keyStore,
+		OrgResolver:        orgResolver,
 	}
 
 	if err = s.impl.Initialise(ctx, dependencies); err != nil {