feat: init dynamic modules work

Signed-off-by: Takeshi Yoneda <[email protected]>

Author: mathetake

cmd/dynamic_module/main.go

@@ -81,7 +81,7 @@ func (g *globalState) initializeEnv() error {
 		return fmt.Errorf("failed to create prometheus reader: %w", err)
 	}
 
-	meter, _, err := metrics.NewMetricsFromEnv(ctx, os.Stdout, promReader)
+	meter, _, err := metrics.NewMeterFromEnv(ctx, os.Stdout, promReader)
 	if err != nil {
 		return fmt.Errorf("failed to create metrics: %w", err)
 	}
@@ -103,12 +103,12 @@ func (g *globalState) initializeEnv() error {
 	g.env = &dynamicmodule.Env{
 		RootPrefix:                    os.Getenv("AI_GATEWAY_dynamicmodule_ROOT_PREFIX"),
 		EndpointPrefixes:              endpointPrefixes,
-		ChatCompletionMetricsFactory:  metrics.NewChatCompletionFactory(meter, metricsRequestHeaderAttributes),
-		MessagesMetricsFactory:        metrics.NewMessagesFactory(meter, metricsRequestHeaderAttributes),
-		CompletionMetricsFactory:      metrics.NewCompletionFactory(meter, metricsRequestHeaderAttributes),
-		EmbeddingsMetricsFactory:      metrics.NewEmbeddingsFactory(meter, metricsRequestHeaderAttributes),
-		ImageGenerationMetricsFactory: metrics.NewImageGenerationFactory(meter, metricsRequestHeaderAttributes),
-		RerankMetricsFactory:          metrics.NewRerankFactory(meter, metricsRequestHeaderAttributes),
+		ChatCompletionMetricsFactory:  metrics.NewMetricsFactory(meter, metricsRequestHeaderAttributes, metrics.GenAIOperationChat),
+		MessagesMetricsFactory:        metrics.NewMetricsFactory(meter, metricsRequestHeaderAttributes, metrics.GenAIOperationMessages),
+		CompletionMetricsFactory:      metrics.NewMetricsFactory(meter, metricsRequestHeaderAttributes, metrics.GenAIOperationCompletion),
+		EmbeddingsMetricsFactory:      metrics.NewMetricsFactory(meter, metricsRequestHeaderAttributes, metrics.GenAIOperationEmbedding),
+		ImageGenerationMetricsFactory: metrics.NewMetricsFactory(meter, metricsRequestHeaderAttributes, metrics.GenAIOperationImageGeneration),
+		RerankMetricsFactory:          metrics.NewMetricsFactory(meter, metricsRequestHeaderAttributes, metrics.GenAIOperationRerank),
 	}
 	return nil
 }

internal/dynamicmodule/dynamic_module.go

@@ -32,12 +32,12 @@ const (
 
 // Env holds the environment configuration for the dynamic module that is process-wide.
 type Env struct {
-	RootPrefix                    string
-	EndpointPrefixes              internalapi.EndpointPrefixes
-	ChatCompletionMetricsFactory  metrics.ChatCompletionMetricsFactory
-	MessagesMetricsFactory        metrics.MessagesMetricsFactory
-	CompletionMetricsFactory      metrics.CompletionMetricsFactory
-	EmbeddingsMetricsFactory      metrics.EmbeddingsMetricsFactory
-	ImageGenerationMetricsFactory metrics.ImageGenerationMetricsFactory
-	RerankMetricsFactory          metrics.RerankMetricsFactory
+	RootPrefix       string
+	EndpointPrefixes internalapi.EndpointPrefixes
+	ChatCompletionMetricsFactory,
+	MessagesMetricsFactory,
+	CompletionMetricsFactory,
+	EmbeddingsMetricsFactory,
+	ImageGenerationMetricsFactory,
+	RerankMetricsFactory metrics.Factory
 }

internal/dynamicmodule/upstream_filter.go

@@ -20,6 +20,7 @@ import (
 	"github.com/envoyproxy/ai-gateway/internal/filterapi"
 	"github.com/envoyproxy/ai-gateway/internal/headermutator"
 	"github.com/envoyproxy/ai-gateway/internal/internalapi"
+	"github.com/envoyproxy/ai-gateway/internal/metrics"
 	"github.com/envoyproxy/ai-gateway/internal/translator"
 )
 
@@ -36,7 +37,7 @@ type (
 
 		// -- per endpoint processor --
 		translator any
-		metrics    any
+		metrics    metrics.Metrics
 	}
 )
 
@@ -213,15 +214,15 @@ func (f *upstreamFilter) initializeTranslatorMetrics(b *filterapi.Backend) error
 		default:
 			return fmt.Errorf("unsupported API schema: backend=%s", out)
 		}
-		f.metrics = f.env.ChatCompletionMetricsFactory()
+		f.metrics = f.env.ChatCompletionMetricsFactory.NewMetrics()
 	case completionsEndpoint:
 		switch out.Name {
 		case filterapi.APISchemaOpenAI:
 			f.translator = translator.NewChatCompletionOpenAIToOpenAITranslator(out.Version, modelNameOverride)
 		default:
 			return fmt.Errorf("unsupported API schema: backend=%s", out)
 		}
-		f.metrics = f.env.CompletionMetricsFactory()
+		f.metrics = f.env.CompletionMetricsFactory.NewMetrics()
 	case embeddingsEndpoint:
 		switch out.Name {
 		case filterapi.APISchemaOpenAI:
@@ -231,31 +232,31 @@ func (f *upstreamFilter) initializeTranslatorMetrics(b *filterapi.Backend) error
 		default:
 			return fmt.Errorf("unsupported API schema: backend=%s", out)
 		}
-		f.metrics = f.env.CompletionMetricsFactory()
+		f.metrics = f.env.CompletionMetricsFactory.NewMetrics()
 	case imagesGenerationsEndpoint:
 		switch out.Name {
 		case filterapi.APISchemaOpenAI:
 			f.translator = translator.NewImageGenerationOpenAIToOpenAITranslator(out.Version, modelNameOverride)
 		default:
 			return fmt.Errorf("unsupported API schema: backend=%s", out)
 		}
-		f.metrics = f.env.CompletionMetricsFactory()
+		f.metrics = f.env.CompletionMetricsFactory.NewMetrics()
 	case rerankEndpoint:
 		switch out.Name {
 		case filterapi.APISchemaCohere:
 			f.translator = translator.NewRerankCohereToCohereTranslator(out.Version, modelNameOverride)
 		default:
 			return fmt.Errorf("unsupported API schema: backend=%s", out)
 		}
-		f.metrics = f.env.RerankMetricsFactory()
+		f.metrics = f.env.RerankMetricsFactory.NewMetrics()
 	case messagesEndpoint:
 		switch out.Name {
 		case filterapi.APISchemaAnthropic:
 			f.translator = translator.NewAnthropicToAnthropicTranslator(out.Version, modelNameOverride)
 		default:
 			return fmt.Errorf("unsupported API schema: backend=%s", out)
 		}
-		f.metrics = f.env.MessagesMetricsFactory()
+		f.metrics = f.env.MessagesMetricsFactory.NewMetrics()
 	default:
 		return fmt.Errorf("unsupported endpoint for per-route upstream filter: %v", f.rf.endpoint)
 	}

internal/tracing/tracing_test.go

@@ -25,7 +25,6 @@ import (
 	"github.com/envoyproxy/ai-gateway/internal/testing/testotel"
 	tracing "github.com/envoyproxy/ai-gateway/internal/tracing/api"
 	"github.com/envoyproxy/ai-gateway/internal/tracing/openinference"
-	openaisdk "github.com/openai/openai-go/v2"
 )
 
 // clearEnv clears any OTEL configuration that could exist in the environment.