[UTR Logging] Added gcp.use_legacy_mapping resource attribute to disable LogEntry.otlp field.

confgenerator/confgenerator.go

@@ -269,7 +269,7 @@ func (uc *UnifiedConfig) GenerateOtelConfig(ctx context.Context, outDir, stateDi
 				ProcessorsByType: map[string][]otel.Component{
 					"logs": {
 						otel.GCPProjectID(resource.ProjectName()),
-						// otel.DisableOtlpRoundTrip(), // Disable it until b/491102815 is fixed.
+						otel.DisableOtlpRoundTrip(),
 						otel.PreserveInstrumentationScope(),
 						otel.CopyServiceResourceLabels(),
 					},

confgenerator/otel/processors.go

@@ -689,10 +689,10 @@ func MetricUnknownCounter() Component {
 	})
 }
 
-// This processor prevents telemetry.googleapis.com from populating the LogEntry.otlp field by setting the gcp.internal.omit_otlp resource attribute to true.
+// This processor prevents telemetry.googleapis.com from populating the LogEntry.otlp field by setting the gcp.use_legacy_mapping resource attribute to true.
 func DisableOtlpRoundTrip() Component {
 	return ResourceTransform(
-		map[string]string{"gcp.internal.omit_otlp": "true"}, false,
+		map[string]string{"gcp.use_legacy_mapping": "true"}, false,
 	)
 }
 

confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/linux-gpu/otel.yaml

@@ -825,6 +825,11 @@ processors:
     - action: insert
       key: gcp.project_id
       value: test-project
+  resource/otlp_grpc/otlp_logs_logs_1:
+    attributes:
+    - action: insert
+      key: gcp.use_legacy_mapping
+      value: "true"
   resource/otlp_grpc/otlp_metrics_metrics_0:
     attributes:
     - action: insert
@@ -1019,14 +1024,14 @@ processors:
       - copy_metric(Concat([metric.name, "unknowncounter"], ":")) where metric.metadata["prometheus.type"] == "unknown" and not HasSuffix(metric.name, ":unknowncounter")
       - convert_gauge_to_sum("cumulative", true) where HasSuffix(metric.name, ":unknowncounter")
       - set(metric.name, Substring(metric.name, 0, Len(metric.name)-Len(":unknowncounter"))) where HasSuffix(metric.name, ":unknowncounter")
-  transform/otlp_grpc/otlp_logs_logs_1:
+  transform/otlp_grpc/otlp_logs_logs_2:
     error_mode: ignore
     log_statements:
     - context: log
       statements:
       - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != ""
       - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != ""
-  transform/otlp_grpc/otlp_logs_logs_2:
+  transform/otlp_grpc/otlp_logs_logs_3:
     error_mode: ignore
     log_statements:
     - context: log
@@ -1198,8 +1203,9 @@ service:
       - transform/syslog_0
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - filelog/syslog
     logs/logs_file__pipeline_file__logs:
@@ -1209,8 +1215,9 @@ service:
       - transform/file__logs_0
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - filelog/file__logs
     logs/logs_otlp_otlp:
@@ -1220,8 +1227,9 @@ service:
       - transform/otlp_0
       - resourcedetection/_global_1
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - otlp/otlp
     logs/logs_syslog__custom_syslog__custom:
@@ -1232,8 +1240,9 @@ service:
       - transform/syslog__custom_1
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - syslog/syslog__custom
     metrics/default__pipeline_hostmetrics:

confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/linux/otel.yaml

@@ -796,6 +796,11 @@ processors:
     - action: insert
       key: gcp.project_id
       value: test-project
+  resource/otlp_grpc/otlp_logs_logs_1:
+    attributes:
+    - action: insert
+      key: gcp.use_legacy_mapping
+      value: "true"
   resource/otlp_grpc/otlp_metrics_metrics_0:
     attributes:
     - action: insert
@@ -975,14 +980,14 @@ processors:
       - copy_metric(Concat([metric.name, "unknowncounter"], ":")) where metric.metadata["prometheus.type"] == "unknown" and not HasSuffix(metric.name, ":unknowncounter")
       - convert_gauge_to_sum("cumulative", true) where HasSuffix(metric.name, ":unknowncounter")
       - set(metric.name, Substring(metric.name, 0, Len(metric.name)-Len(":unknowncounter"))) where HasSuffix(metric.name, ":unknowncounter")
-  transform/otlp_grpc/otlp_logs_logs_1:
+  transform/otlp_grpc/otlp_logs_logs_2:
     error_mode: ignore
     log_statements:
     - context: log
       statements:
       - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != ""
       - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != ""
-  transform/otlp_grpc/otlp_logs_logs_2:
+  transform/otlp_grpc/otlp_logs_logs_3:
     error_mode: ignore
     log_statements:
     - context: log
@@ -1152,8 +1157,9 @@ service:
       - transform/syslog_0
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - filelog/syslog
     logs/logs_file__pipeline_file__logs:
@@ -1163,8 +1169,9 @@ service:
       - transform/file__logs_0
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - filelog/file__logs
     logs/logs_otlp_otlp:
@@ -1174,8 +1181,9 @@ service:
       - transform/otlp_0
       - resourcedetection/_global_1
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - otlp/otlp
     logs/logs_syslog__custom_syslog__custom:
@@ -1186,8 +1194,9 @@ service:
       - transform/syslog__custom_1
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - syslog/syslog__custom
     metrics/default__pipeline_hostmetrics:

confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/windows-2012/otel.yaml

@@ -862,6 +862,11 @@ processors:
     - action: insert
       key: gcp.project_id
       value: test-project
+  resource/otlp_grpc/otlp_logs_logs_1:
+    attributes:
+    - action: insert
+      key: gcp.use_legacy_mapping
+      value: "true"
   resource/otlp_grpc/otlp_metrics_metrics_0:
     attributes:
     - action: insert
@@ -1083,14 +1088,14 @@ processors:
       - copy_metric(Concat([metric.name, "unknowncounter"], ":")) where metric.metadata["prometheus.type"] == "unknown" and not HasSuffix(metric.name, ":unknowncounter")
       - convert_gauge_to_sum("cumulative", true) where HasSuffix(metric.name, ":unknowncounter")
       - set(metric.name, Substring(metric.name, 0, Len(metric.name)-Len(":unknowncounter"))) where HasSuffix(metric.name, ":unknowncounter")
-  transform/otlp_grpc/otlp_logs_logs_1:
+  transform/otlp_grpc/otlp_logs_logs_2:
     error_mode: ignore
     log_statements:
     - context: log
       statements:
       - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != ""
       - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != ""
-  transform/otlp_grpc/otlp_logs_logs_2:
+  transform/otlp_grpc/otlp_logs_logs_3:
     error_mode: ignore
     log_statements:
     - context: log
@@ -1639,8 +1644,9 @@ service:
       - transform/windows__event__log_2
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - windowseventlog/windows__event__log
     logs/logs_default__pipeline_windows__event__log_1:
@@ -1652,8 +1658,9 @@ service:
       - transform/windows__event__log_1_2
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - windowseventlog/windows__event__log_1
     logs/logs_default__pipeline_windows__event__log_2:
@@ -1665,8 +1672,9 @@ service:
       - transform/windows__event__log_2_2
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - windowseventlog/windows__event__log_2
     logs/logs_file__pipeline_file__logs:
@@ -1676,8 +1684,9 @@ service:
       - transform/file__logs_0
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - filelog/file__logs
     logs/logs_otlp_otlp:
@@ -1687,8 +1696,9 @@ service:
       - transform/otlp_0
       - resourcedetection/_global_1
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - otlp/otlp
     logs/logs_syslog__custom_syslog__custom:
@@ -1699,8 +1709,9 @@ service:
       - transform/syslog__custom_1
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - syslog/syslog__custom
     metrics/default__pipeline_hostmetrics:

confgenerator/testdata/goldens/combined-receiver_otlp_otel_logging_otlpgrpc_exporter/golden/windows/otel.yaml

@@ -862,6 +862,11 @@ processors:
     - action: insert
       key: gcp.project_id
       value: test-project
+  resource/otlp_grpc/otlp_logs_logs_1:
+    attributes:
+    - action: insert
+      key: gcp.use_legacy_mapping
+      value: "true"
   resource/otlp_grpc/otlp_metrics_metrics_0:
     attributes:
     - action: insert
@@ -1083,14 +1088,14 @@ processors:
       - copy_metric(Concat([metric.name, "unknowncounter"], ":")) where metric.metadata["prometheus.type"] == "unknown" and not HasSuffix(metric.name, ":unknowncounter")
       - convert_gauge_to_sum("cumulative", true) where HasSuffix(metric.name, ":unknowncounter")
       - set(metric.name, Substring(metric.name, 0, Len(metric.name)-Len(":unknowncounter"))) where HasSuffix(metric.name, ":unknowncounter")
-  transform/otlp_grpc/otlp_logs_logs_1:
+  transform/otlp_grpc/otlp_logs_logs_2:
     error_mode: ignore
     log_statements:
     - context: log
       statements:
       - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != ""
       - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != ""
-  transform/otlp_grpc/otlp_logs_logs_2:
+  transform/otlp_grpc/otlp_logs_logs_3:
     error_mode: ignore
     log_statements:
     - context: log
@@ -1639,8 +1644,9 @@ service:
       - transform/windows__event__log_2
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - windowseventlog/windows__event__log
     logs/logs_default__pipeline_windows__event__log_1:
@@ -1652,8 +1658,9 @@ service:
       - transform/windows__event__log_1_2
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - windowseventlog/windows__event__log_1
     logs/logs_default__pipeline_windows__event__log_2:
@@ -1665,8 +1672,9 @@ service:
       - transform/windows__event__log_2_2
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - windowseventlog/windows__event__log_2
     logs/logs_file__pipeline_file__logs:
@@ -1676,8 +1684,9 @@ service:
       - transform/file__logs_0
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - filelog/file__logs
     logs/logs_otlp_otlp:
@@ -1687,8 +1696,9 @@ service:
       - transform/otlp_0
       - resourcedetection/_global_1
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - otlp/otlp
     logs/logs_syslog__custom_syslog__custom:
@@ -1699,8 +1709,9 @@ service:
       - transform/syslog__custom_1
       - resourcedetection/_global_0
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - syslog/syslog__custom
     metrics/default__pipeline_hostmetrics:

confgenerator/testdata/goldens/combined-receiver_otlp_otlpgrpc_exporter/golden/linux-gpu/otel.yaml

@@ -825,6 +825,11 @@ processors:
     - action: insert
       key: gcp.project_id
       value: test-project
+  resource/otlp_grpc/otlp_logs_logs_1:
+    attributes:
+    - action: insert
+      key: gcp.use_legacy_mapping
+      value: "true"
   resource/otlp_grpc/otlp_metrics_metrics_0:
     attributes:
     - action: insert
@@ -990,14 +995,14 @@ processors:
       - copy_metric(Concat([metric.name, "unknowncounter"], ":")) where metric.metadata["prometheus.type"] == "unknown" and not HasSuffix(metric.name, ":unknowncounter")
       - convert_gauge_to_sum("cumulative", true) where HasSuffix(metric.name, ":unknowncounter")
       - set(metric.name, Substring(metric.name, 0, Len(metric.name)-Len(":unknowncounter"))) where HasSuffix(metric.name, ":unknowncounter")
-  transform/otlp_grpc/otlp_logs_logs_1:
+  transform/otlp_grpc/otlp_logs_logs_2:
     error_mode: ignore
     log_statements:
     - context: log
       statements:
       - set(attributes["instrumentation_source"], instrumentation_scope.name) where instrumentation_scope.name != ""
       - set(attributes["instrumentation_version"], instrumentation_scope.version) where instrumentation_scope.version != ""
-  transform/otlp_grpc/otlp_logs_logs_2:
+  transform/otlp_grpc/otlp_logs_logs_3:
     error_mode: ignore
     log_statements:
     - context: log
@@ -1063,8 +1068,9 @@ service:
       - transform/otlp_0
       - resourcedetection/_global_1
       - resource/otlp_grpc/otlp_logs_logs_0
-      - transform/otlp_grpc/otlp_logs_logs_1
+      - resource/otlp_grpc/otlp_logs_logs_1
       - transform/otlp_grpc/otlp_logs_logs_2
+      - transform/otlp_grpc/otlp_logs_logs_3
       receivers:
       - otlp/otlp
     metrics/default__pipeline_hostmetrics: