Geneva exporter: Support resource attributes in log exporter

src/OpenTelemetry.Exporter.Geneva/CHANGELOG.md

@@ -3,7 +3,8 @@
 ## Unreleased
 
 * Add ResourceFieldNames to filter resource attributes to send to Geneva
-  ([#3552](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3552))
+  ([#3552](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3552),
+   [#3646](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/3646))
 
 ## 1.14.0
 

src/OpenTelemetry.Exporter.Geneva/GenevaExporterOptions.cs

@@ -107,6 +107,8 @@ public IReadOnlyDictionary<string, string>? TableNameMappings
 
     /// <summary>
     /// Gets or sets prepopulated fields.
+    ///
+    /// Pre-populated fields are fields that are added as dedicated fields to every record, unless it would conflict with a log or trace field that is marked as a custom field.
     /// </summary>
     public IReadOnlyDictionary<string, object> PrepopulatedFields
     {

src/OpenTelemetry.Exporter.Geneva/GenevaLogExporter.cs

@@ -9,6 +9,7 @@
 using OpenTelemetry.Exporter.Geneva.Tld;
 using OpenTelemetry.Internal;
 using OpenTelemetry.Logs;
+using OpenTelemetry.Resources;
 
 namespace OpenTelemetry.Exporter.Geneva;
 
@@ -17,10 +18,10 @@ namespace OpenTelemetry.Exporter.Geneva;
 /// </summary>
 public class GenevaLogExporter : GenevaBaseExporter<LogRecord>
 {
+    internal readonly IDisposable Exporter;
     internal bool IsUsingUnixDomainSocket;
 
     private readonly ExportLogRecordFunc exportLogRecord;
-    private readonly IDisposable exporter;
 
     private bool isDisposed;
 
@@ -46,7 +47,7 @@ public GenevaLogExporter(GenevaExporterOptions options)
             var eventHeaderLogExporter = new EventHeaderLogExporter(options);
             this.IsUsingUnixDomainSocket = false;
             this.exportLogRecord = eventHeaderLogExporter.Export;
-            this.exporter = eventHeaderLogExporter;
+            this.Exporter = eventHeaderLogExporter;
             return;
 #else
             throw new ArgumentException("Exporting data in user_events is only supported for .NET 8 or later on Linux.");
@@ -90,17 +91,21 @@ public GenevaLogExporter(GenevaExporterOptions options)
 
         if (useMsgPackExporter)
         {
-            var msgPackLogExporter = new MsgPackLogExporter(options);
+            var msgPackLogExporter = new MsgPackLogExporter(options, () =>
+            {
+                // this is not equivalent to passing a method reference, because the ParentProvider could change after the constructor.
+                return this.ParentProvider?.GetResource() ?? Resource.Empty;
+            });
             this.IsUsingUnixDomainSocket = msgPackLogExporter.IsUsingUnixDomainSocket;
             this.exportLogRecord = msgPackLogExporter.Export;
-            this.exporter = msgPackLogExporter;
+            this.Exporter = msgPackLogExporter;
         }
         else
         {
             var tldLogExporter = new TldLogExporter(options);
             this.IsUsingUnixDomainSocket = false;
             this.exportLogRecord = tldLogExporter.Export;
-            this.exporter = tldLogExporter;
+            this.Exporter = tldLogExporter;
         }
     }
 
@@ -124,7 +129,7 @@ protected override void Dispose(bool disposing)
         {
             try
             {
-                this.exporter.Dispose();
+                this.Exporter.Dispose();
             }
             catch (Exception ex)
             {

src/OpenTelemetry.Exporter.Geneva/GenevaTraceExporter.cs

@@ -6,6 +6,7 @@
 using OpenTelemetry.Exporter.Geneva.MsgPack;
 using OpenTelemetry.Exporter.Geneva.Tld;
 using OpenTelemetry.Internal;
+using OpenTelemetry.Resources;
 
 namespace OpenTelemetry.Exporter.Geneva;
 
@@ -16,8 +17,9 @@ public class GenevaTraceExporter : GenevaBaseExporter<Activity>
 {
     internal readonly bool IsUsingUnixDomainSocket;
 
+    internal readonly IDisposable Exporter;
+
     private readonly ExportActivityFunc exportActivity;
-    private readonly IDisposable exporter;
 
     private bool isDisposed;
 
@@ -68,17 +70,21 @@ public GenevaTraceExporter(GenevaExporterOptions options)
 
         if (useMsgPackExporter)
         {
-            var msgPackTraceExporter = new MsgPackTraceExporter(options, this.ParentProvider.GetResource);
+            var msgPackTraceExporter = new MsgPackTraceExporter(options, () =>
+            {
+                // this is not equivalent to passing a method reference, because the ParentProvider could change after the constructor.
+                return this.ParentProvider?.GetResource() ?? Resource.Empty;
+            });
             this.IsUsingUnixDomainSocket = msgPackTraceExporter.IsUsingUnixDomainSocket;
             this.exportActivity = msgPackTraceExporter.Export;
-            this.exporter = msgPackTraceExporter;
+            this.Exporter = msgPackTraceExporter;
         }
         else
         {
             var tldTraceExporter = new TldTraceExporter(options);
             this.IsUsingUnixDomainSocket = false;
             this.exportActivity = tldTraceExporter.Export;
-            this.exporter = tldTraceExporter;
+            this.Exporter = tldTraceExporter;
         }
     }
 
@@ -102,7 +108,7 @@ protected override void Dispose(bool disposing)
         {
             try
             {
-                this.exporter.Dispose();
+                this.Exporter.Dispose();
             }
             catch (Exception ex)
             {