PR comments

newrelic-agent/src/main/java/com/newrelic/agent/config/SuperAgentIntegrationConfig.java

@@ -30,7 +30,17 @@ public interface SuperAgentIntegrationConfig {
  */
  int getHealthReportingFrequency();
 
+ /**
+ * Return the fleet id assigned by the super agent
+ *
+ * @return the fleet id, if available
+ */
  String getFleetId();
 
+ /**
+ * Return the health client type ("file" or "noop" for example)
+ *
+ * @return the client type
+ */
  String getHealthClientType();
 }

newrelic-agent/src/main/java/com/newrelic/agent/config/SuperAgentIntegrationConfigImpl.java

@@ -1,3 +1,9 @@
+/*
+ *
+ * * Copyright 2024 New Relic Corporation. All rights reserved.
+ * * SPDX-License-Identifier: Apache-2.0
+ *
+ */
 package com.newrelic.agent.config;
 
 import com.newrelic.agent.Agent;
@@ -32,13 +38,13 @@ private SuperAgentIntegrationHealthConfig createHealthConfig() {
  Map<String, Object> healthProps = getProperty(SuperAgentIntegrationHealthConfig.ROOT, Collections.emptyMap());
  SuperAgentIntegrationHealthConfig superAgentIntegrationHealthConfig;
 
-  superAgentIntegrationHealthConfig = new SuperAgentIntegrationHealthConfig(healthProps, SYSTEM_PROPERTY_ROOT);
+ superAgentIntegrationHealthConfig = new SuperAgentIntegrationHealthConfig(healthProps, SYSTEM_PROPERTY_ROOT);
 
-  if (superAgentIntegrationHealthConfig.getHealthDeliveryLocation() == null) {
-  Agent.LOG.log(Level.WARNING, "Configured Super Agent health delivery location is not a valid URI; " +
-  "SuperAgent integration service will not be started");
-  superAgentIntegrationHealthConfig = null;
-  }
+ if (superAgentIntegrationHealthConfig.getHealthDeliveryLocation() == null) {
+ Agent.LOG.log(Level.WARNING, "Configured Super Agent health delivery location is not a valid URI; " +
+ "SuperAgent integration service will not be started");
+ superAgentIntegrationHealthConfig = null;
+ }
 
  return superAgentIntegrationHealthConfig;
  }

newrelic-agent/src/main/java/com/newrelic/agent/config/SuperAgentIntegrationHealthConfig.java

@@ -1,20 +1,23 @@
+/*
+ *
+ * * Copyright 2024 New Relic Corporation. All rights reserved.
+ * * SPDX-License-Identifier: Apache-2.0
+ *
+ */
 package com.newrelic.agent.config;
 
-import com.newrelic.agent.Agent;
 import org.apache.commons.lang3.StringUtils;
 
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.Map;
-import java.util.logging.Level;
 
 public class SuperAgentIntegrationHealthConfig extends BaseConfig {
  public static final String ROOT = "health";
  public static final String FREQUENCY = "frequency";
  public static final int FREQUENCY_DEFAULT = 5; // In seconds
  public static final String LOCATION = "delivery_location"; //URI Format; ex: file://opt/tmp/health.yml
 
- private final int frequency;;
+ private final int frequency;
  private URI deliveryLocation;
  private String healthClientType;
 

newrelic-agent/src/main/java/com/newrelic/agent/superagent/HealthDataChangeListener.java

@@ -1,3 +1,9 @@
+/*
+ *
+ * * Copyright 2024 New Relic Corporation. All rights reserved.
+ * * SPDX-License-Identifier: Apache-2.0
+ *
+ */
 package com.newrelic.agent.superagent;
 
 public interface HealthDataChangeListener {

newrelic-agent/src/main/java/com/newrelic/agent/superagent/HealthDataProducer.java

@@ -1,3 +1,9 @@
+/*
+ *
+ * * Copyright 2024 New Relic Corporation. All rights reserved.
+ * * SPDX-License-Identifier: Apache-2.0
+ *
+ */
 package com.newrelic.agent.superagent;
 
 public interface HealthDataProducer {

newrelic-agent/src/main/java/com/newrelic/agent/superagent/SuperAgentIntegrationService.java

@@ -45,7 +45,7 @@ public SuperAgentIntegrationService(SuperAgentIntegrationHealthClient client, Ag
  @Override
  protected void doStart() throws Exception {
  if (isEnabled()) {
- Agent.LOG.log(Level.INFO, "SuperAgentIntegrationService starting: Health file location: {0} Frequency: {1}  Scheme: {2}",
+ Agent.LOG.log(Level.INFO, "SuperAgentIntegrationService starting: Health file location: {0} Frequency: {1} Scheme: {2}",
  agentConfig.getSuperAgentIntegrationConfig().getHealthDeliveryLocation(),
  agentConfig.getSuperAgentIntegrationConfig().getHealthReportingFrequency(),
  agentConfig.getSuperAgentIntegrationConfig().getHealthClientType());

newrelic-agent/src/main/java/com/newrelic/agent/superagent/SuperAgentIntegrationUtils.java

@@ -31,7 +31,7 @@ public static void reportHealthyStatus(List<HealthDataChangeListener> healthData
  }
  }
 
- public static void  reportUnhealthyStatusPriorToServiceStart(AgentConfig config, AgentHealth.Status status) {
+ public static void reportUnhealthyStatusPriorToServiceStart(AgentConfig config, AgentHealth.Status status) {
  SuperAgentIntegrationConfig superAgentIntegrationConfig = config.getSuperAgentIntegrationConfig();
  if (superAgentIntegrationConfig.isEnabled()) {
  SuperAgentIntegrationHealthClient client = SuperAgentIntegrationClientFactory.createHealthClient(superAgentIntegrationConfig);

newrelic-agent/src/main/java/com/newrelic/agent/transport/DataSenderImpl.java

@@ -130,6 +130,7 @@ public class DataSenderImpl implements DataSender, HealthDataProducer {
  private volatile Map<String, String> requestMetadata;
  private volatile Map<String, String> metadata;
  private final List<HealthDataChangeListener> healthDataChangeListeners = new CopyOnWriteArrayList<>();
+ private final boolean isSuperAgentEnabled;
 
  public DataSenderImpl(
  DataSenderConfig config,
@@ -162,6 +163,7 @@ public DataSenderImpl(
  }
 
  this.httpClientWrapper = httpClientWrapper;
+ this.isSuperAgentEnabled = configService.getDefaultAgentConfig().getSuperAgentIntegrationConfig().isEnabled();
  }
 
  private void checkAuditMode() {
@@ -698,6 +700,12 @@ private void throwExceptionFromStatusCode(String method, ReadResult result, byte
  }
  }
 
+ private void reportUnhealthyStatusToSuperAgent(AgentHealth.Status status, String ... additionalInfo) {
+ if (isSuperAgentEnabled) {
+ SuperAgentIntegrationUtils.reportUnhealthyStatus(healthDataChangeListeners, status, additionalInfo);
+ }
+ }
+
  private String parseExceptionMessage(String responseBody) {
  try {
  JSONParser parser = new JSONParser();

newrelic-agent/src/test/java/com/newrelic/agent/AgentTest.java

@@ -1,3 +1,9 @@
+/*
+ *
+ * * Copyright 2024 New Relic Corporation. All rights reserved.
+ * * SPDX-License-Identifier: Apache-2.0
+ *
+ */
 package com.newrelic.agent;
 
 import com.newrelic.agent.config.AgentConfig;

newrelic-agent/src/test/java/com/newrelic/agent/superagent/SuperAgentHealthUnitTestClient.java

@@ -6,8 +6,7 @@
  */
 package com.newrelic.agent.superagent;
 
-public class
-SuperAgentHealthUnitTestClient implements SuperAgentIntegrationHealthClient {
+public class SuperAgentHealthUnitTestClient implements SuperAgentIntegrationHealthClient {
 
  private AgentHealth agentHealth;