More merge fixes

Author: jack-berg

sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/internal/state/CallbackRegistrationTest.java

@@ -227,7 +227,7 @@ void invokeCallback_RestoresContextClassLoader() {
 
     // Simulate invocation on a thread with null context class loader (like DaemonThreadFactory)
     Thread.currentThread().setContextClassLoader(null);
-    callbackRegistration.invokeCallback(registeredReader, 0, 1);
+    callbackRegistration.invokeCallback(registeredReader);
 
     // Callback should have seen the registration-time classloader
     assertThat(observedClassLoader.get()).isSameAs(registrationClassLoader);
@@ -255,7 +255,7 @@ void invokeCallback_RestoresContextClassLoaderOnException() {
 
     // Simulate invocation on a thread with null context class loader
     Thread.currentThread().setContextClassLoader(null);
-    callbackRegistration.invokeCallback(registeredReader, 0, 1);
+    callbackRegistration.invokeCallback(registeredReader);
 
     // Context classloader should still be restored even after exception
     assertThat(Thread.currentThread().getContextClassLoader()).isNull();