Add client properties in connection

Copyright, licence, version, etc.

Author: acogoluegnes

src/main/java/com/rabbitmq/client/amqp/impl/AmqpConnection.java

@@ -18,15 +18,16 @@
 package com.rabbitmq.client.amqp.impl;
 
 import static com.rabbitmq.client.amqp.Resource.State.*;
-import static java.util.Collections.singletonMap;
 
 import com.rabbitmq.client.amqp.*;
 import com.rabbitmq.client.amqp.ObservationCollector;
 import com.rabbitmq.client.amqp.impl.Utils.StopWatch;
 import com.rabbitmq.client.amqp.metrics.MetricsCollector;
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
@@ -184,8 +185,12 @@ private org.apache.qpid.protonj2.client.Connection connect(
     connectionOptions.idleTimeout(
         connectionSettings.idleTimeout().toMillis(), TimeUnit.MILLISECONDS);
     connectionOptions.disconnectedHandler(disconnectHandler);
-    if (name != null) {
-      connectionOptions.properties(singletonMap("connection_name", name));
+    if (name == null) {
+      connectionOptions.properties(ClientProperties.DEFAULT_CLIENT_PROPERTIES);
+    } else {
+      Map<String, Object> props = new LinkedHashMap<>(ClientProperties.DEFAULT_CLIENT_PROPERTIES);
+      props.put("connection_name", name);
+      connectionOptions.properties(Map.copyOf(props));
     }
     if (connectionSettings.tlsEnabled()) {
       DefaultConnectionSettings.DefaultTlsSettings<?> tlsSettings =

src/main/java/com/rabbitmq/client/amqp/impl/ClientProperties.java

@@ -0,0 +1,100 @@
+// Copyright (c) 2024 Broadcom. All Rights Reserved.
+// The term "Broadcom" refers to Broadcom Inc. and/or its subsidiaries.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// If you have any questions regarding licensing, please contact us at
+// [email protected].
+package com.rabbitmq.client.amqp.impl;
+
+import java.io.InputStream;
+import java.util.Map;
+import java.util.Properties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+final class ClientProperties {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(ClientProperties.class);
+
+  // We store the version property in an unusual way because relocating the package can rewrite the
+  // key in the property
+  // file, which results in spurious warnings being emitted at start-up.
+  // see https://github.com/rabbitmq/rabbitmq-java-client/issues/436
+  private static final char[] VERSION_PROPERTY =
+      new char[] {
+        'c', 'o', 'm', '.', 'r', 'a', 'b', 'b', 'i', 't', 'm', 'q', '.', 'c', 'l', 'i', 'e', 'n',
+        't', '.', 'a', 'm', 'q', 'p', '.', 'v', 'e', 'r', 's', 'i', 'o', 'n'
+      };
+
+  public static final String VERSION = getVersion();
+
+  public static final Map<String, Object> DEFAULT_CLIENT_PROPERTIES =
+      Map.of(
+          "product", "RabbitMQ",
+          "version", ClientProperties.VERSION,
+          "platform", "Java",
+          "copyright", "Copyright (c) 2024 Broadcom Inc. and/or its subsidiaries.",
+          "information",
+              "Licensed under the Apache License version 2. See https://www.rabbitmq.com/.");
+
+  private static String getVersion() {
+    String version;
+    try {
+      version = getVersionFromPropertyFile();
+    } catch (Exception e1) {
+      LOGGER.warn("Couldn't get version from property file", e1);
+      try {
+        version = getVersionFromPackage();
+      } catch (Exception e2) {
+        LOGGER.warn("Couldn't get version with Package#getImplementationVersion", e1);
+        version = getDefaultVersion();
+      }
+    }
+    return version;
+  }
+
+  private static String getVersionFromPropertyFile() throws Exception {
+    InputStream inputStream =
+        ClientProperties.class
+            .getClassLoader()
+            .getResourceAsStream("rabbitmq-amqp-1-0-client.properties");
+    Properties version = new Properties();
+    try {
+      version.load(inputStream);
+    } finally {
+      if (inputStream != null) {
+        inputStream.close();
+      }
+    }
+    String propertyName = new String(VERSION_PROPERTY);
+    String versionProperty = version.getProperty(propertyName);
+    if (versionProperty == null) {
+      throw new IllegalStateException("Couldn't find version property in property file");
+    }
+    return versionProperty;
+  }
+
+  private static String getVersionFromPackage() {
+    if (ClientProperties.class.getPackage().getImplementationVersion() == null) {
+      throw new IllegalStateException("Couldn't get version with Package#getImplementationVersion");
+    }
+    return ClientProperties.class.getPackage().getImplementationVersion();
+  }
+
+  private static String getDefaultVersion() {
+    return "0.0.0";
+  }
+
+  private ClientProperties() {}
+}

src/main/resources/rabbitmq-amqp-1-0-client.properties

@@ -0,0 +1 @@
+com.rabbitmq.client.amqp.version = ${project.version}

src/test/java/com/rabbitmq/client/amqp/impl/AmqpTestInfrastructureExtension.java

@@ -61,7 +61,8 @@ public void beforeEach(ExtensionContext context) throws Exception {
     Field connectionField = field(context.getTestClass().get(), "connection");
     if (connectionField != null) {
       connectionField.setAccessible(true);
-      Connection connection = env.connectionBuilder().build();
+      Connection connection =
+          ((AmqpConnectionBuilder) env.connectionBuilder()).name(TestUtils.name(context)).build();
       connectionField.set(context.getTestInstance().get(), connection);
       store(context).put("connection", connection);
     }

src/test/java/com/rabbitmq/client/amqp/impl/TestUtils.java

@@ -267,7 +267,7 @@ public static String name(TestInfo info) {
     return name(info.getTestClass().get(), info.getTestMethod().get());
   }
 
-  private static String name(ExtensionContext context) {
+  static String name(ExtensionContext context) {
     return name(context.getTestInstance().get().getClass(), context.getTestMethod().get());
   }