GoogleCloudPlatform · rafaelwestphal · Oct 15, 2025 · Oct 16, 2025 · Oct 16, 2025 · Oct 17, 2025
diff --git a/confgenerator/agentmetrics.go b/confgenerator/agentmetrics.go
@@ -15,6 +15,7 @@
 package confgenerator
 
 import (
+	"context"
 	"fmt"
 	"path/filepath"
 	"time"
@@ -56,9 +57,9 @@ var grpcToHTTPStatus = map[string]string{
 	"DEADLINE_EXCEEDED":   "504",
 }
 
-func (r AgentSelfMetrics) AddSelfMetricsPipelines(receiverPipelines map[string]otel.ReceiverPipeline, pipelines map[string]otel.Pipeline) {
+func (r AgentSelfMetrics) AddSelfMetricsPipelines(receiverPipelines map[string]otel.ReceiverPipeline, pipelines map[string]otel.Pipeline, ctx context.Context) {
 	// Receiver pipelines names should have 1 underscore to avoid collision with user configurations.
-	receiverPipelines["agent_prometheus"] = r.PrometheusMetricsPipeline()
+	receiverPipelines["agent_prometheus"] = r.PrometheusMetricsPipeline(ctx)
 
 	// Pipeline names should have no underscores to avoid collision with user configurations.
 	pipelines["otel"] = otel.Pipeline{
@@ -79,15 +80,15 @@ func (r AgentSelfMetrics) AddSelfMetricsPipelines(receiverPipelines map[string]o
 		Processors:           r.LoggingMetricsPipelineProcessors(),
 	}
 
-	receiverPipelines["ops_agent"] = r.OpsAgentPipeline()
+	receiverPipelines["ops_agent"] = r.OpsAgentPipeline(ctx)
 	pipelines["opsagent"] = otel.Pipeline{
 		Type:                 "metrics",
 		ReceiverPipelineName: "ops_agent",
 	}
 }
 
-func (r AgentSelfMetrics) PrometheusMetricsPipeline() otel.ReceiverPipeline {
-	return otel.ReceiverPipeline{
+func (r AgentSelfMetrics) PrometheusMetricsPipeline(ctx context.Context) otel.ReceiverPipeline {
+	return ConvertGCMSystemExporterToOtlpExporter(otel.ReceiverPipeline{
 		Receiver: otel.Component{
 			Type: "prometheus",
 			Config: map[string]interface{}{
@@ -128,7 +129,7 @@ func (r AgentSelfMetrics) PrometheusMetricsPipeline() otel.ReceiverPipeline {
 				),
 			},
 		},
-	}
+	}, ctx)
 }
 
 func (r AgentSelfMetrics) OtelPipelineProcessors() []otel.Component {
@@ -218,20 +219,14 @@ func (r AgentSelfMetrics) LoggingMetricsPipelineProcessors() []otel.Component {
 		// Format fluentbit and otel logging metrics before aggregation.
 		otel.MetricsTransform(
 			otel.RenameMetric("fluentbit_stackdriver_retried_records_total", "fluentbit_log_entry_retry_count",
-				// change data type from double -> int64
-				otel.ToggleScalarDataType,
 				otel.RenameLabel("status", "response_code"),
 				otel.AggregateLabels("sum", "response_code"),
 			),
 			otel.DuplicateMetric("otelcol_exporter_send_failed_log_records", "otel_log_entry_retry_count",
-				// change data type from double -> int64
-				otel.ToggleScalarDataType,
 				otel.AddLabel("response_code", "400"),
 				otel.AggregateLabels("sum", "response_code"),
 			),
 			otel.RenameMetric("fluentbit_stackdriver_requests_total", "fluentbit_request_count",
-				// change data type from double -> int64
-				otel.ToggleScalarDataType,
 				otel.RenameLabel("status", "response_code"),
 				otel.AggregateLabels("sum", "response_code"),
 			),
@@ -243,19 +238,16 @@ func (r AgentSelfMetrics) LoggingMetricsPipelineProcessors() []otel.Component {
 			),
 			otel.RenameMetric("fluentbit_stackdriver_proc_records_total", "fluentbit_log_entry_count",
 				// change data type from double -> int64
-				otel.ToggleScalarDataType,
 				otel.RenameLabel("status", "response_code"),
 				otel.AggregateLabels("sum", "response_code"),
 			),
 			otel.RenameMetric("otelcol_exporter_sent_log_records", "otel_log_entry_count",
 				// change data type from double -> int64
-				otel.ToggleScalarDataType,
 				otel.AddLabel("response_code", "200"),
 				otel.AggregateLabels("sum", "response_code"),
 			),
 			otel.RenameMetric("otelcol_exporter_send_failed_log_records", "otel_log_entry_count",
 				// change data type from double -> int64
-				otel.ToggleScalarDataType,
 				otel.AddLabel("response_code", "400"),
 				otel.AggregateLabels("sum", "response_code"),
 			),
@@ -297,24 +289,39 @@ func (r AgentSelfMetrics) LoggingMetricsPipelineProcessors() []otel.Component {
 		// DeltaToCumulative keeps in memory information of previous delta points
 		// to generate a valid cumulative monotonic metric.
 		otel.DeltaToCumulative(),
+		otel.MetricStartTime(),
+		otel.MetricsTransform(
+			otel.UpdateMetric("agent/log_entry_retry_count",
+				// change data type from double -> int64
+				otel.ToggleScalarDataType,
+			),
+			otel.UpdateMetric("agent/request_count",
+				// change data type from double -> int64
+				otel.ToggleScalarDataType,
+			),
+			otel.UpdateMetric("agent/log_entry_count",
+				// change data type from double -> int64
+				otel.ToggleScalarDataType,
+			),
+		),
 		// The processor "interval" outputs the last point in each 1 minute interval.
 		otel.Interval("1m"),
 		otel.MetricsTransform(otel.AddPrefix("agent.googleapis.com")),
 	}
 }
 
-func (r AgentSelfMetrics) OpsAgentPipeline() otel.ReceiverPipeline {
-	receiver_config := map[string]any{
+func (r AgentSelfMetrics) OpsAgentPipeline(ctx context.Context) otel.ReceiverPipeline {
+	receiverConfig := map[string]any{
 		"include": []string{
 			filepath.Join(r.OtelRuntimeDir, "enabled_receivers_otlp.json"),
 			filepath.Join(r.OtelRuntimeDir, "feature_tracking_otlp.json")},
 		"replay_file":   true,
 		"poll_interval": time.Duration(60 * time.Second).String(),
 	}
-	return otel.ReceiverPipeline{
+	return ConvertGCMSystemExporterToOtlpExporter(otel.ReceiverPipeline{
 		Receiver: otel.Component{
 			Type:   "otlpjsonfile",
-			Config: receiver_config,
+			Config: receiverConfig,
 		},
 		ExporterTypes: map[string]otel.ExporterType{
 			"metrics": otel.System,
@@ -324,7 +331,7 @@ func (r AgentSelfMetrics) OpsAgentPipeline() otel.ReceiverPipeline {
 				otel.Transform("metric", "datapoint", []ottl.Statement{"set(time, Now())"}),
 			},
 		},
-	}
+	}, ctx)
 }
 
 // intentionally not registered as a component because this is not created by users
diff --git a/confgenerator/confgenerator.go b/confgenerator/confgenerator.go
@@ -57,32 +57,40 @@ func googleCloudExporter(userAgent string, instrumentationLabels bool, serviceRe
 	}
 }
 
-func ConvertPrometheusExporterToOtlpExporter(receiver otel.ReceiverPipeline, ctx context.Context) otel.ReceiverPipeline {
-	return ConvertToOtlpExporter(receiver, ctx, true)
+func ConvertPrometheusExporterToOtlpExporter(pipeline otel.ReceiverPipeline, ctx context.Context) otel.ReceiverPipeline {
+	return ConvertToOtlpExporter(pipeline, ctx, true, false)
 }
 
-func ConvertGCMOtelExporterToOtlpExporter(receiver otel.ReceiverPipeline, ctx context.Context) otel.ReceiverPipeline {
-	return ConvertToOtlpExporter(receiver, ctx, false)
+func ConvertGCMOtelExporterToOtlpExporter(pipeline otel.ReceiverPipeline, ctx context.Context) otel.ReceiverPipeline {
+	return ConvertToOtlpExporter(pipeline, ctx, false, false)
 }
 
-func ConvertToOtlpExporter(receiver otel.ReceiverPipeline, ctx context.Context, isPrometheus bool) otel.ReceiverPipeline {
+func ConvertGCMSystemExporterToOtlpExporter(pipeline otel.ReceiverPipeline, ctx context.Context) otel.ReceiverPipeline {
+	return ConvertToOtlpExporter(pipeline, ctx, false, true)
+}
+
+func ConvertToOtlpExporter(pipeline otel.ReceiverPipeline, ctx context.Context, isPrometheus bool, isSystem bool) otel.ReceiverPipeline {
 	expOtlpExporter := experimentsFromContext(ctx)["otlp_exporter"]
 	resource, _ := platform.FromContext(ctx).GetResource()
 	if !expOtlpExporter {
-		return receiver
+		return pipeline
 	}
-	_, err := receiver.ExporterTypes["metrics"]
+	_, err := pipeline.ExporterTypes["metrics"]
 	if !err {
-		return receiver
+		return pipeline
 	}
-	receiver.ExporterTypes["metrics"] = otel.OTLP
+	pipeline.ExporterTypes["metrics"] = otel.OTLP
 
-	receiver.Processors["metrics"] = append(receiver.Processors["metrics"], otel.GCPProjectID(resource.ProjectName()))
+	pipeline.Processors["metrics"] = append(pipeline.Processors["metrics"], otel.GCPProjectID(resource.ProjectName()))
+	if isSystem {
+		pipeline.Processors["metrics"] = append(pipeline.Processors["metrics"], otel.MetricStartTime())
+		pipeline.Processors["metrics"] = append(pipeline.Processors["metrics"], otel.MetricsRemoveInstrumentationLibraryLabelsAttributes())
+	}
 	if isPrometheus {
-		receiver.Processors["metrics"] = append(receiver.Processors["metrics"], otel.MetricUnknownCounter())
-		receiver.Processors["metrics"] = append(receiver.Processors["metrics"], otel.MetricStartTime())
+		pipeline.Processors["metrics"] = append(pipeline.Processors["metrics"], otel.MetricUnknownCounter())
+		pipeline.Processors["metrics"] = append(pipeline.Processors["metrics"], otel.MetricStartTime())
 	}
-	return receiver
+	return pipeline
 }
 
 func otlpExporter(userAgent string) otel.Component {
@@ -127,6 +135,7 @@ func (uc *UnifiedConfig) GenerateOtelConfig(ctx context.Context, outDir string)
 	userAgent, _ := p.UserAgent("Google-Cloud-Ops-Agent-Metrics")
 	metricVersionLabel, _ := p.VersionLabel("google-cloud-ops-agent-metrics")
 	loggingVersionLabel, _ := p.VersionLabel("google-cloud-ops-agent-logging")
+	expOtlpExporter := experimentsFromContext(ctx)["otlp_exporter"]
 
 	receiverPipelines, pipelines, err := uc.generateOtelPipelines(ctx)
 	if err != nil {
@@ -141,9 +150,8 @@ func (uc *UnifiedConfig) GenerateOtelConfig(ctx context.Context, outDir string)
 		OtelRuntimeDir:      outDir,
 		OtelLogging:         uc.Logging.Service.OTelLogging,
 	}
-	agentSelfMetrics.AddSelfMetricsPipelines(receiverPipelines, pipelines)
+	agentSelfMetrics.AddSelfMetricsPipelines(receiverPipelines, pipelines, ctx)
 
-	expOtlpExporter := experimentsFromContext(ctx)["otlp_exporter"]
 	extensions := map[string]interface{}{}
 	if expOtlpExporter {
 		extensions["googleclientauth"] = map[string]interface{}{}

diff --git a/confgenerator/otel/processors.go b/confgenerator/otel/processors.go
@@ -291,6 +291,13 @@ func MetricsRemoveServiceAttributes() Component {
 	}
 }
 
+func MetricsRemoveInstrumentationLibraryLabelsAttributes() Component {
+	return TransformationMetrics(
+		SetScopeName(""),
+		SetScopeVersion(""),
+	)
+}
+
 func CopyHostIDToInstanceID() Component {
 	return Component{
 		Type: "transform",

diff --git a/...stdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/otel.yaml b/...stdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/otel.yaml
@@ -66,8 +66,10 @@ processors:
         - otelcol_process_memory_rss
         - grpc.client.attempt.duration_count
         - googlecloudmonitoring/point_count
-  interval/loggingmetrics_7:
+  interval/loggingmetrics_9:
     interval: 1m
+  metricstarttime/loggingmetrics_7:
+    strategy: subtract_initial_point
   metricstransform/fluentbit_1:
     transforms:
     - action: update
@@ -384,13 +386,18 @@ processors:
       include: ^(.*)$$
       match_type: regexp
       new_name: agent.googleapis.com/$${1}
+  metricstransform/loggingmetrics_10:
+    transforms:
+    - action: update
+      include: ^(.*)$$
+      match_type: regexp
+      new_name: agent.googleapis.com/$${1}
   metricstransform/loggingmetrics_3:
     transforms:
     - action: update
       include: fluentbit_stackdriver_retried_records_total
       new_name: fluentbit_log_entry_retry_count
       operations:
-      - action: toggle_scalar_data_type
       - action: update_label
         label: status
         new_label: response_code
@@ -402,7 +409,6 @@ processors:
       include: otelcol_exporter_send_failed_log_records
       new_name: otel_log_entry_retry_count
       operations:
-      - action: toggle_scalar_data_type
       - action: add_label
         new_label: response_code
         new_value: "400"
@@ -414,7 +420,6 @@ processors:
       include: fluentbit_stackdriver_requests_total
       new_name: fluentbit_request_count
       operations:
-      - action: toggle_scalar_data_type
       - action: update_label
         label: status
         new_label: response_code
@@ -474,7 +479,6 @@ processors:
       include: fluentbit_stackdriver_proc_records_total
       new_name: fluentbit_log_entry_count
       operations:
-      - action: toggle_scalar_data_type
       - action: update_label
         label: status
         new_label: response_code
@@ -486,7 +490,6 @@ processors:
       include: otelcol_exporter_sent_log_records
       new_name: otel_log_entry_count
       operations:
-      - action: toggle_scalar_data_type
       - action: add_label
         new_label: response_code
         new_value: "200"
@@ -498,7 +501,6 @@ processors:
       include: otelcol_exporter_send_failed_log_records
       new_name: otel_log_entry_count
       operations:
-      - action: toggle_scalar_data_type
       - action: add_label
         new_label: response_code
         new_value: "400"
@@ -519,9 +521,17 @@ processors:
   metricstransform/loggingmetrics_8:
     transforms:
     - action: update
-      include: ^(.*)$$
-      match_type: regexp
-      new_name: agent.googleapis.com/$${1}
+      include: agent/log_entry_retry_count
+      operations:
+      - action: toggle_scalar_data_type
+    - action: update
+      include: agent/request_count
+      operations:
+      - action: toggle_scalar_data_type
+    - action: update
+      include: agent/log_entry_count
+      operations:
+      - action: toggle_scalar_data_type
   metricstransform/otel_3:
     transforms:
     - action: update
@@ -692,8 +702,10 @@ service:
       - cumulativetodelta/loggingmetrics_4
       - transform/loggingmetrics_5
       - deltatocumulative/loggingmetrics_6
-      - interval/loggingmetrics_7
+      - metricstarttime/loggingmetrics_7
       - metricstransform/loggingmetrics_8
+      - interval/loggingmetrics_9
+      - metricstransform/loggingmetrics_10
       - resourcedetection/_global_0
       receivers:
       - prometheus/agent_prometheus