fix naming

Author: jaydeluca

instrumentation-docs/src/main/java/io/opentelemetry/instrumentation/docs/internal/TelemetryMerger.java

@@ -44,7 +44,7 @@ public static MergedTelemetryData merge(
       return convertManualTelemetryOnly(manualTelemetry);
     }
 
-    return mergeManualAndAutoGenerated(
+    return mergeManualAndEmitted(
         manualTelemetry, emittedMetrics, emittedSpans, instrumentationName);
   }
 
@@ -75,13 +75,13 @@ private static MergedTelemetryData convertManualTelemetryOnly(
    * Merges manual telemetry with emitted telemetry, deduplicating by name within the same 'when'
    * condition.
    */
-  private static MergedTelemetryData mergeManualAndAutoGenerated(
+  private static MergedTelemetryData mergeManualAndEmitted(
       List<ManualTelemetryEntry> manualTelemetry,
       Map<String, List<EmittedMetrics.Metric>> emittedMetrics,
       Map<String, List<EmittedSpans.Span>> emittedSpans,
       String instrumentationName) {
 
-    // Start with generated data (create mutable copies of the lists)
+    // Start with emitted data (create mutable copies of the lists)
     Map<String, List<EmittedMetrics.Metric>> mergedMetrics = new HashMap<>();
     for (Map.Entry<String, List<EmittedMetrics.Metric>> entry : emittedMetrics.entrySet()) {
       mergedMetrics.put(entry.getKey(), new ArrayList<>(entry.getValue()));

instrumentation-docs/src/test/java/io/opentelemetry/instrumentation/docs/TelemetryMergerTest.java

@@ -25,8 +25,8 @@ void testOverrideMode() {
     List<ManualTelemetryEntry> manualTelemetry = createManualTelemetry();
 
     // Emitted telemetry that should be ignored
-    Map<String, List<EmittedMetrics.Metric>> autoMetrics = createAutoGeneratedMetrics();
-    Map<String, List<EmittedSpans.Span>> autoSpans = createAutoGeneratedSpans();
+    Map<String, List<EmittedMetrics.Metric>> autoMetrics = createEmittedMetrics();
+    Map<String, List<EmittedSpans.Span>> autoSpans = createEmittedSpans();
 
     TelemetryMerger.MergedTelemetryData result =
         TelemetryMerger.merge(
@@ -53,8 +53,8 @@ void testOverrideMode() {
   void testMergeMode() {
     List<ManualTelemetryEntry> manualTelemetry = createManualTelemetry();
 
-    Map<String, List<EmittedMetrics.Metric>> autoMetrics = createAutoGeneratedMetrics();
-    Map<String, List<EmittedSpans.Span>> autoSpans = createAutoGeneratedSpans();
+    Map<String, List<EmittedMetrics.Metric>> autoMetrics = createEmittedMetrics();
+    Map<String, List<EmittedSpans.Span>> autoSpans = createEmittedSpans();
 
     TelemetryMerger.MergedTelemetryData result =
         TelemetryMerger.merge(
@@ -80,8 +80,8 @@ void testConflictResolution() {
     // Create manual telemetry with same name as emitted
     List<ManualTelemetryEntry> manualTelemetry = createConflictingManualTelemetry();
 
-    Map<String, List<EmittedMetrics.Metric>> autoMetrics = createAutoGeneratedMetrics();
-    Map<String, List<EmittedSpans.Span>> autoSpans = createAutoGeneratedSpans();
+    Map<String, List<EmittedMetrics.Metric>> autoMetrics = createEmittedMetrics();
+    Map<String, List<EmittedSpans.Span>> autoSpans = createEmittedSpans();
 
     // Test merge mode with conflicts
     TelemetryMerger.MergedTelemetryData result =
@@ -112,8 +112,8 @@ void testEmptyManualTelemetry() {
     // Empty manual telemetry
     List<ManualTelemetryEntry> manualTelemetry = new ArrayList<>();
 
-    Map<String, List<EmittedMetrics.Metric>> autoMetrics = createAutoGeneratedMetrics();
-    Map<String, List<EmittedSpans.Span>> autoSpans = createAutoGeneratedSpans();
+    Map<String, List<EmittedMetrics.Metric>> autoMetrics = createEmittedMetrics();
+    Map<String, List<EmittedSpans.Span>> autoSpans = createEmittedSpans();
 
     // Test merge mode with empty manual telemetry
     TelemetryMerger.MergedTelemetryData result =
@@ -243,7 +243,7 @@ private static List<ManualTelemetryEntry> createMultipleWhenManualTelemetry() {
     return manualTelemetry;
   }
 
-  private static Map<String, List<EmittedMetrics.Metric>> createAutoGeneratedMetrics() {
+  private static Map<String, List<EmittedMetrics.Metric>> createEmittedMetrics() {
     Map<String, List<EmittedMetrics.Metric>> autoMetrics = new HashMap<>();
 
     List<TelemetryAttribute> attrs = new ArrayList<>();
@@ -262,7 +262,7 @@ private static Map<String, List<EmittedMetrics.Metric>> createAutoGeneratedMetri
     return autoMetrics;
   }
 
-  private static Map<String, List<EmittedSpans.Span>> createAutoGeneratedSpans() {
+  private static Map<String, List<EmittedSpans.Span>> createEmittedSpans() {
     Map<String, List<EmittedSpans.Span>> autoSpans = new HashMap<>();
 
     EmittedSpans.Span span = new EmittedSpans.Span();