Merge branch 'main' into ogt/extra-data-codec-registry-interface-v3

Author: amit-momin

pkg/capabilities/capabilities.go

@@ -11,6 +11,7 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/anypb"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/contexts"
 	"github.com/smartcontractkit/chainlink-protos/cre/go/values"
 )
 
@@ -108,13 +109,27 @@ type RequestMetadata struct {
 	WorkflowTag string
 }
 
+func (m *RequestMetadata) ContextWithCRE(ctx context.Context) context.Context {
+	return contexts.WithCRE(ctx, contexts.CRE{
+		Owner:    m.WorkflowOwner,
+		Workflow: m.WorkflowID,
+	})
+}
+
 type RegistrationMetadata struct {
 	WorkflowID    string
 	WorkflowOwner string
 	// The step reference ID of the workflow
 	ReferenceID string
 }
 
+func (m *RegistrationMetadata) ContextWithCRE(ctx context.Context) context.Context {
+	return contexts.WithCRE(ctx, contexts.CRE{
+		Owner:    m.WorkflowOwner,
+		Workflow: m.WorkflowID,
+	})
+}
+
 // CapabilityRequest is a struct for the Execute request of a capability.
 type CapabilityRequest struct {
 	Metadata RequestMetadata

pkg/capabilities/v2/chain-capabilities/consensus/ocr3/types/generate.go

@@ -0,0 +1,3 @@
+package types
+
+//go:generate protoc --go_out=. --go_opt=paths=source_relative -I. ocr3_chain_capabilities_config_types.proto

pkg/capabilities/v2/chain-capabilities/consensus/ocr3/types/ocr3_chain_capabilities_config_types.pb.go

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+option go_package = "capabilities/v2/chain-capabilities/consensus/ocr3/types";
+
+package chain_capabilities_ocr3_config_types;
+
+message ReportingPluginConfig {
+  // These fields are shadowing the `ReportingPluginLimits` fields.
+  // See: https://github.com/smartcontractkit/libocr/blob/master/offchainreporting2plus/ocr3types/plugin.go#L296
+  uint32 maxQueryLengthBytes = 1;
+  uint32 maxObservationLengthBytes = 2;
+  uint32 maxOutcomeLengthBytes = 3;
+  uint32 maxReportLengthBytes = 4;
+  uint32 maxReportCount = 5;
+
+  uint32 maxBatchSize = 6;
+}

pkg/capabilities/v2/chain-capabilities/consensus/ocr3/types/ocr3_chain_capabilities_config_types.proto

@@ -10,6 +10,10 @@ import (
 var _ credentials.PerRPCCredentials = basicAuthCredentials{}
 var _ credentials.PerRPCCredentials = tokenAuthCredentials{}
 
+type HeaderProvider interface {
+	Headers(ctx context.Context) (map[string]string, error)
+}
+
 // Basic-Auth authentication for Chip Ingress
 type basicAuthCredentials struct {
 	authHeader map[string]string
@@ -42,11 +46,11 @@ type tokenAuthCredentials struct {
 }
 
 // implement PerRPCCredentials interface
-func (c tokenAuthCredentials) GetRequestMetadata(_ context.Context, _ ...string) (map[string]string, error) {
+func (c tokenAuthCredentials) GetRequestMetadata(ctx context.Context, _ ...string) (map[string]string, error) {
 	if c.authTokenProvider == nil {
 		return nil, nil
 	}
-	return c.authTokenProvider.GetHeaders(), nil
+	return c.authTokenProvider.Headers(ctx)
 }
 
 func (c tokenAuthCredentials) RequireTransportSecurity() bool {

pkg/chipingress/auth.go

@@ -49,14 +49,12 @@ func TestBasicAuth(t *testing.T) {
 	})
 }
 
-var authHeaderKey = "X-Auth-Token"
-
 type testHeaderProvider struct {
 	headers map[string]string
 }
 
-func (p *testHeaderProvider) GetHeaders() map[string]string {
-	return p.headers
+func (p *testHeaderProvider) Headers(ctx context.Context) (map[string]string, error) {
+	return p.headers, nil
 }
 
 func TestTokenAuth(t *testing.T) {

pkg/chipingress/auth_test.go

@@ -20,9 +20,6 @@ import (
 )
 
 // HeaderProvider defines an interface for providing headers
-type HeaderProvider interface {
-	GetHeaders() map[string]string
-}
 
 type Client interface {
 	pb.ChipIngressClient
@@ -51,8 +48,10 @@ func newClientConfig(host string) *clientConfig {
 		headerProvider:    nil,
 		perRPCCredentials: nil,
 		host:              host,
+		// Default to insecure connection
+		insecureConnection:   true,
+		transportCredentials: insecure.NewCredentials(),
 	}
-	WithInsecureConnection()(cfg) // Default to insecure connection
 	return cfg
 }
 
@@ -168,7 +167,13 @@ func newHeaderInterceptor(provider HeaderProvider) grpc.UnaryClientInterceptor {
 	return func(ctx context.Context, method string, req, reply interface{}, cc *grpc.ClientConn, invoker grpc.UnaryInvoker, opts ...grpc.CallOption) error {
 		// Add dynamic headers from provider if available
 		if provider != nil {
-			for k, v := range provider.GetHeaders() {
+
+			headers, err := provider.Headers(ctx)
+			if err != nil {
+				return fmt.Errorf("failed to get headers: %w", err)
+			}
+
+			for k, v := range headers {
 				ctx = metadata.AppendToOutgoingContext(ctx, k, v)
 			}
 		}

pkg/chipingress/client.go

@@ -584,8 +584,8 @@ type mockHeaderProvider struct {
 	headers map[string]string
 }
 
-func (m *mockHeaderProvider) GetHeaders() map[string]string {
-	return m.headers
+func (m *mockHeaderProvider) Headers(ctx context.Context) (map[string]string, error) {
+	return m.headers, nil
 }
 
 func TestWithTLS(t *testing.T) {

pkg/chipingress/client_test.go

@@ -32,6 +32,14 @@ var (
 	}
 )
 
+// SizeOf returns the cumulative len of the byte slice arguments as a Size.
+func SizeOf[B ~[]byte](bs ...B) (s Size) {
+	for _, b := range bs {
+		s += Size(len(b))
+	}
+	return
+}
+
 func (b Size) MarshalText() ([]byte, error) {
 	if b >= TByte {
 		d := decimal.NewFromInt(int64(b)).Div(decimal.NewFromInt(int64(TByte)))

pkg/config/bytes.go

@@ -19,7 +19,6 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
-	"google.golang.org/grpc/encoding/gzip"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/beholder"
 	"github.com/smartcontractkit/chainlink-common/pkg/config/build"
@@ -150,7 +149,6 @@ func (config TracingConfig) NewSpanExporter() (sdktrace.SpanExporter, error) {
 	traceExporter, err := otlptracegrpc.New(ctx,
 		otlptracegrpc.WithGRPCConn(conn),
 		otlptracegrpc.WithHeaders(config.AuthHeaders),
-		otlptracegrpc.WithCompressor(gzip.Name),
 	)
 	if err != nil {
 		return nil, err