Use factory overload of putIfAbsent to avoid unnecessary MetadataState allocation

piochelepiotr · claude · piochelepiotr · commit bdbdf30d74e3 · 2026-04-01T15:08:55.000-06:00
Co-Authored-By: Claude Opus 4.6 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java
@@ -159,7 +159,7 @@ public static void captureGroup(
       if (Config.get().isDataStreamsEnabled()) {
         MetadataState state =
             InstrumentationContext.get(Metadata.class, MetadataState.class)
-                .putIfAbsent(metadata, new MetadataState());
+                .putIfAbsent(metadata, MetadataState::new);
         KafkaConfigHelper.storePendingConsumerConfig(
             state,
             normalizedConsumerGroup,
@@ -212,7 +212,7 @@ public static void captureGroup(
       if (Config.get().isDataStreamsEnabled()) {
         MetadataState state =
             InstrumentationContext.get(Metadata.class, MetadataState.class)
-                .putIfAbsent(metadata, new MetadataState());
+                .putIfAbsent(metadata, MetadataState::new);
         KafkaConfigHelper.storePendingConsumerConfig(
             state,
             normalizedConsumerGroup,
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java
@@ -270,7 +270,7 @@ public static void captureConfiguration(
       if (Config.get().isDataStreamsEnabled()) {
         MetadataState state =
             InstrumentationContext.get(Metadata.class, MetadataState.class)
-                .putIfAbsent(metadata, new MetadataState());
+                .putIfAbsent(metadata, MetadataState::new);
         KafkaConfigHelper.storePendingProducerConfig(
             state, KafkaConfigHelper.extractProducerConfig(producerConfig));
       }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/MetadataInstrumentation.java
@@ -90,7 +90,7 @@ public static void onEnter(
         String clusterId = newCluster.clusterResource().clusterId();
         MetadataState state =
             InstrumentationContext.get(Metadata.class, MetadataState.class)
-                .putIfAbsent(metadata, new MetadataState());
+                .putIfAbsent(metadata, MetadataState::new);
         state.clusterId = clusterId;
         KafkaConfigHelper.reportPendingConfig(state, clusterId);
       }
@@ -111,7 +111,7 @@ public static void onEnter(
         String clusterId = response.clusterId();
         MetadataState state =
             InstrumentationContext.get(Metadata.class, MetadataState.class)
-                .putIfAbsent(metadata, new MetadataState());
+                .putIfAbsent(metadata, MetadataState::new);
         state.clusterId = clusterId;
         KafkaConfigHelper.reportPendingConfig(state, clusterId);
       }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ConstructorAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ConstructorAdvice.java
@@ -59,7 +59,7 @@ public static void captureGroup(
     if (Config.get().isDataStreamsEnabled()) {
       MetadataState state =
           InstrumentationContext.get(Metadata.class, MetadataState.class)
-              .putIfAbsent(metadata, new MetadataState());
+              .putIfAbsent(metadata, MetadataState::new);
       KafkaConfigHelper.storePendingConsumerConfig(
           state, normalizedConsumerGroup, KafkaConfigHelper.extractConsumerConfig(consumerConfig));
     }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/LegacyConstructorAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/LegacyConstructorAdvice.java
@@ -52,7 +52,7 @@ public static void captureGroup(
     if (Config.get().isDataStreamsEnabled()) {
       MetadataState state =
           InstrumentationContext.get(Metadata.class, MetadataState.class)
-              .putIfAbsent(metadata, new MetadataState());
+              .putIfAbsent(metadata, MetadataState::new);
       KafkaConfigHelper.storePendingConsumerConfig(
           state, normalizedConsumerGroup, KafkaConfigHelper.extractConsumerConfig(consumerConfig));
     }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/MetadataUpdate22AndAfterAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/MetadataUpdate22AndAfterAdvice.java
@@ -16,7 +16,7 @@ public static void onEnter(
       String clusterId = response.clusterId();
       MetadataState state =
           InstrumentationContext.get(Metadata.class, MetadataState.class)
-              .putIfAbsent(metadata, new MetadataState());
+              .putIfAbsent(metadata, MetadataState::new);
       state.clusterId = clusterId;
       KafkaConfigHelper.reportPendingConfig(state, clusterId);
     }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/MetadataUpdateBefore22Advice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/MetadataUpdateBefore22Advice.java
@@ -16,7 +16,7 @@ public static void onEnter(
       String clusterId = newCluster.clusterResource().clusterId();
       MetadataState state =
           InstrumentationContext.get(Metadata.class, MetadataState.class)
-              .putIfAbsent(metadata, new MetadataState());
+              .putIfAbsent(metadata, MetadataState::new);
       state.clusterId = clusterId;
       KafkaConfigHelper.reportPendingConfig(state, clusterId);
     }
diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerConstructorAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerConstructorAdvice.java
@@ -17,7 +17,7 @@ public static void captureConfiguration(
     if (Config.get().isDataStreamsEnabled()) {
       MetadataState state =
           InstrumentationContext.get(Metadata.class, MetadataState.class)
-              .putIfAbsent(metadata, new MetadataState());
+              .putIfAbsent(metadata, MetadataState::new);
       KafkaConfigHelper.storePendingProducerConfig(
           state, KafkaConfigHelper.extractProducerConfig(producerConfig));
     }

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ public static void captureConfiguration(`
`270`	`270`	`if (Config.get().isDataStreamsEnabled()) {`
`271`	`271`	`MetadataState state =`
`272`	`272`	`InstrumentationContext.get(Metadata.class, MetadataState.class)`
`273`		`- .putIfAbsent(metadata, new MetadataState());`
	`273`	`+ .putIfAbsent(metadata, MetadataState::new);`
`274`	`274`	`KafkaConfigHelper.storePendingProducerConfig(`
`275`	`275`	`state, KafkaConfigHelper.extractProducerConfig(producerConfig));`
`276`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public static void captureGroup(`
`59`	`59`	`if (Config.get().isDataStreamsEnabled()) {`
`60`	`60`	`MetadataState state =`
`61`	`61`	`InstrumentationContext.get(Metadata.class, MetadataState.class)`
`62`		`- .putIfAbsent(metadata, new MetadataState());`
	`62`	`+ .putIfAbsent(metadata, MetadataState::new);`
`63`	`63`	`KafkaConfigHelper.storePendingConsumerConfig(`
`64`	`64`	`state, normalizedConsumerGroup, KafkaConfigHelper.extractConsumerConfig(consumerConfig));`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public static void captureGroup(`
`52`	`52`	`if (Config.get().isDataStreamsEnabled()) {`
`53`	`53`	`MetadataState state =`
`54`	`54`	`InstrumentationContext.get(Metadata.class, MetadataState.class)`
`55`		`- .putIfAbsent(metadata, new MetadataState());`
	`55`	`+ .putIfAbsent(metadata, MetadataState::new);`
`56`	`56`	`KafkaConfigHelper.storePendingConsumerConfig(`
`57`	`57`	`state, normalizedConsumerGroup, KafkaConfigHelper.extractConsumerConfig(consumerConfig));`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public static void onEnter(`
`16`	`16`	`String clusterId = response.clusterId();`
`17`	`17`	`MetadataState state =`
`18`	`18`	`InstrumentationContext.get(Metadata.class, MetadataState.class)`
`19`		`- .putIfAbsent(metadata, new MetadataState());`
	`19`	`+ .putIfAbsent(metadata, MetadataState::new);`
`20`	`20`	`state.clusterId = clusterId;`
`21`	`21`	`KafkaConfigHelper.reportPendingConfig(state, clusterId);`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public static void captureConfiguration(`
`17`	`17`	`if (Config.get().isDataStreamsEnabled()) {`
`18`	`18`	`MetadataState state =`
`19`	`19`	`InstrumentationContext.get(Metadata.class, MetadataState.class)`
`20`		`- .putIfAbsent(metadata, new MetadataState());`
	`20`	`+ .putIfAbsent(metadata, MetadataState::new);`
`21`	`21`	`KafkaConfigHelper.storePendingProducerConfig(`
`22`	`22`	`state, KafkaConfigHelper.extractProducerConfig(producerConfig));`
`23`	`23`	`}`