fixing bug with parsing host with brackets

mhlidd · mhlidd · commit 6e11420939bb · 2025-01-15T12:48:25.000-05:00
diff --git a/communication/src/test/groovy/datadog/communication/ddagent/SharedCommunicationsObjectsSpecification.groovy b/communication/src/test/groovy/datadog/communication/ddagent/SharedCommunicationsObjectsSpecification.groovy
@@ -93,7 +93,7 @@ class SharedCommunicationsObjectsSpecification extends DDSpecification {
     sco.featuresDiscovery.is(agentFeaturesDiscovery)
   }
 
-  void 'supports ipv6 agent host'() {
+  void 'supports ipv6 agent host w/o brackets'() {
     given:
     injectSysConfig(AGENT_HOST, "2600:1f18:19c0:bd07:d55b::17")
     Config config = Mock()
@@ -107,15 +107,21 @@ class SharedCommunicationsObjectsSpecification extends DDSpecification {
     1 * config.agentTimeout >> 1
     1 * config.agentUnixDomainSocket >> null
     sco.agentUrl as String == 'http://[2600:1f18:19c0:bd07:d55b::17]:8126/'
-    sco.okHttpClient != null
-    sco.monitoring.is(Monitoring.DISABLED)
+  }
+
+  void 'supports ipv6 agent host w/ brackets'() {
+    given:
+    injectSysConfig(AGENT_HOST, "[2600:1f18:19c0:bd07:d55b::17]")
+    Config config = Mock()
 
     when:
-    sco.featuresDiscovery(config)
+    sco.createRemaining(config)
 
     then:
-    1 * config.traceAgentV05Enabled >> false
-    1 * config.tracerMetricsEnabled >> false
-    sco.featuresDiscovery != null
+    1 * config.getAgentUrl() >> 'http://[2600:1f18:19c0:bd07:d55b::17]:8126'
+    1 * config.agentNamedPipe >> null
+    1 * config.agentTimeout >> 1
+    1 * config.agentUnixDomainSocket >> null
+    sco.agentUrl as String == 'http://[2600:1f18:19c0:bd07:d55b::17]:8126/'
   }
 }
diff --git a/internal-api/src/main/java/datadog/trace/api/Config.java b/internal-api/src/main/java/datadog/trace/api/Config.java
@@ -695,7 +695,7 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
     if (agentHostFromEnvironment == null) {
       agentHost = DEFAULT_AGENT_HOST;
     } else if (agentHostFromEnvironment.charAt(0) == '[') {
-      agentHost = agentHostFromEnvironment.substring(1, agentHostFromEnvironment.length() - 2);
+      agentHost = agentHostFromEnvironment.substring(1, agentHostFromEnvironment.length() - 1);
     } else {
       agentHost = agentHostFromEnvironment;
     }

Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins`
`695`	`695`	`if (agentHostFromEnvironment == null) {`
`696`	`696`	`agentHost = DEFAULT_AGENT_HOST;`
`697`	`697`	`} else if (agentHostFromEnvironment.charAt(0) == '[') {`
`698`		`- agentHost = agentHostFromEnvironment.substring(1, agentHostFromEnvironment.length() - 2);`
	`698`	`+ agentHost = agentHostFromEnvironment.substring(1, agentHostFromEnvironment.length() - 1);`
`699`	`699`	`} else {`
`700`	`700`	`agentHost = agentHostFromEnvironment;`
`701`	`701`	`}`