placing ServiceNameHeaderUtils in javaagent-core

thugrock7 · thugrock7 · commit e80b6e5a059f · 2025-08-25T12:07:10.000+05:30
diff --git a/instrumentation/apache-httpclient-4.0/build.gradle.kts b/instrumentation/apache-httpclient-4.0/build.gradle.kts
@@ -41,7 +41,6 @@ val versions: Map<String, String> by extra
 
 dependencies {
     api(project(":instrumentation:java-streams"))
-    api(project(":otel-extensions"))
 
     library("org.apache.httpcomponents:httpclient:4.0")
     testImplementation(project(":testing-common"))
diff --git a/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/ApacheHttpClientUtils.java b/instrumentation/apache-httpclient-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/apachehttpclient/v4_0/ApacheHttpClientUtils.java
@@ -40,7 +40,7 @@
 import org.hypertrace.agent.core.instrumentation.buffer.BoundedByteArrayOutputStream;
 import org.hypertrace.agent.core.instrumentation.utils.ContentTypeCharsetUtils;
 import org.hypertrace.agent.core.instrumentation.utils.ContentTypeUtils;
-import org.hypertrace.agent.otel.extensions.config.ServiceNameHeaderUtils;
+import org.hypertrace.agent.core.instrumentation.utils.ServiceNameHeaderUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/instrumentation/grpc-1.6/build.gradle.kts b/instrumentation/grpc-1.6/build.gradle.kts
@@ -59,7 +59,6 @@ val grpcVersion = "1.6.0"
 
 dependencies {
     api("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6:${versions["opentelemetry_java_agent"]}")
-    api(project(":otel-extensions"))
     implementation(project(":instrumentation:grpc-common"))
     implementation(project(":shaded-protobuf-java-util", "shadow"))
 
diff --git a/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/client/GrpcClientInterceptor.java b/instrumentation/grpc-1.6/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/grpc/v1_6/client/GrpcClientInterceptor.java
@@ -30,7 +30,7 @@
 import io.opentelemetry.javaagent.instrumentation.hypertrace.grpc.v1_6.GrpcSpanDecorator;
 import org.hypertrace.agent.core.config.InstrumentationConfig;
 import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
-import org.hypertrace.agent.otel.extensions.config.ServiceNameHeaderUtils;
+import org.hypertrace.agent.core.instrumentation.utils.ServiceNameHeaderUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/instrumentation/netty/netty-4.0/build.gradle.kts b/instrumentation/netty/netty-4.0/build.gradle.kts
@@ -46,7 +46,6 @@ val versions: Map<String, String> by extra
 val nettyVersion = "4.0.38.Final"
 
 dependencies {
-    api(project(":otel-extensions"))
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4.0:${versions["opentelemetry_java_agent"]}")
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4-common:${versions["opentelemetry_java_agent"]}")
     implementation("io.opentelemetry.instrumentation:opentelemetry-netty-4-common:${versions["opentelemetry_java_agent"]}")
diff --git a/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/client/HttpClientRequestTracingHandler.java b/instrumentation/netty/netty-4.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_0/client/HttpClientRequestTracingHandler.java
@@ -40,7 +40,7 @@
 import org.hypertrace.agent.core.instrumentation.utils.ContentLengthUtils;
 import org.hypertrace.agent.core.instrumentation.utils.ContentTypeCharsetUtils;
 import org.hypertrace.agent.core.instrumentation.utils.ContentTypeUtils;
-import org.hypertrace.agent.otel.extensions.config.ServiceNameHeaderUtils;
+import org.hypertrace.agent.core.instrumentation.utils.ServiceNameHeaderUtils;
 
 public class HttpClientRequestTracingHandler extends ChannelOutboundHandlerAdapter {
 
diff --git a/instrumentation/netty/netty-4.1/build.gradle.kts b/instrumentation/netty/netty-4.1/build.gradle.kts
@@ -44,7 +44,6 @@ afterEvaluate{
 val versions: Map<String, String> by extra
 
 dependencies {
-    api(project(":otel-extensions"))
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-netty-4-common:${versions["opentelemetry_java_agent"]}")
     implementation("io.opentelemetry.instrumentation:opentelemetry-netty-common:${versions["opentelemetry_java_agent"]}")
     implementation("io.opentelemetry.instrumentation:opentelemetry-netty-4-common:${versions["opentelemetry_java_agent"]}")
diff --git a/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientRequestTracingHandler.java b/instrumentation/netty/netty-4.1/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/netty/v4_1/client/HttpClientRequestTracingHandler.java
@@ -40,7 +40,7 @@
 import org.hypertrace.agent.core.instrumentation.utils.ContentLengthUtils;
 import org.hypertrace.agent.core.instrumentation.utils.ContentTypeCharsetUtils;
 import org.hypertrace.agent.core.instrumentation.utils.ContentTypeUtils;
-import org.hypertrace.agent.otel.extensions.config.ServiceNameHeaderUtils;
+import org.hypertrace.agent.core.instrumentation.utils.ServiceNameHeaderUtils;
 
 public class HttpClientRequestTracingHandler extends ChannelOutboundHandlerAdapter {
 
diff --git a/instrumentation/okhttp/okhttp-3.0/build.gradle.kts b/instrumentation/okhttp/okhttp-3.0/build.gradle.kts
@@ -26,7 +26,6 @@ afterEvaluate{
 val versions: Map<String, String> by extra
 
 dependencies {
-    api(project(":otel-extensions"))
     compileOnly("com.squareup.okhttp3:okhttp:3.0.0")
     testImplementation(project(":testing-common"))
 }
diff --git a/instrumentation/okhttp/okhttp-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/okhttp/v3_0/OkHttpTracingInterceptor.java b/instrumentation/okhttp/okhttp-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/okhttp/v3_0/OkHttpTracingInterceptor.java
@@ -36,7 +36,7 @@
 import org.hypertrace.agent.core.config.InstrumentationConfig;
 import org.hypertrace.agent.core.instrumentation.HypertraceSemanticAttributes;
 import org.hypertrace.agent.core.instrumentation.utils.ContentTypeUtils;
-import org.hypertrace.agent.otel.extensions.config.ServiceNameHeaderUtils;
+import org.hypertrace.agent.core.instrumentation.utils.ServiceNameHeaderUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/instrumentation/vertx/vertx-web-3.0/build.gradle.kts b/instrumentation/vertx/vertx-web-3.0/build.gradle.kts
@@ -27,7 +27,6 @@ val versions: Map<String, String> by extra
 val nettyVersion = "4.0.28.Final"
 
 dependencies {
-    api(project(":otel-extensions"))
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-vertx-web-3.0:${versions["opentelemetry_java_agent"]}")
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-vertx-http-client-3.0:${versions["opentelemetry_java_agent"]}")
     implementation("io.opentelemetry.javaagent.instrumentation:opentelemetry-javaagent-vertx-http-client-common:${versions["opentelemetry_java_agent"]}")
diff --git a/instrumentation/vertx/vertx-web-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/vertx/HttpRequestInstrumentation.java b/instrumentation/vertx/vertx-web-3.0/src/main/java/io/opentelemetry/javaagent/instrumentation/hypertrace/vertx/HttpRequestInstrumentation.java
@@ -43,7 +43,7 @@
 import org.hypertrace.agent.core.instrumentation.buffer.BoundedBuffersFactory;
 import org.hypertrace.agent.core.instrumentation.buffer.BoundedCharArrayWriter;
 import org.hypertrace.agent.core.instrumentation.utils.ContentTypeUtils;
-import org.hypertrace.agent.otel.extensions.config.ServiceNameHeaderUtils;
+import org.hypertrace.agent.core.instrumentation.utils.ServiceNameHeaderUtils;
 
 public class HttpRequestInstrumentation implements TypeInstrumentation {
 
diff --git a/javaagent-core/src/main/java/org/hypertrace/agent/core/config/InstrumentationConfig.java b/javaagent-core/src/main/java/org/hypertrace/agent/core/config/InstrumentationConfig.java
@@ -27,6 +27,9 @@ public interface InstrumentationConfig {
   /** Maximum capture body size in bytes. */
   int maxBodySizeBytes();
 
+  /** Service name. */
+  String getServiceName();
+
   /** Data capture for HTTP headers. */
   Message httpHeaders();
 
diff --git a/javaagent-core/src/main/java/org/hypertrace/agent/core/instrumentation/utils/ServiceNameHeaderUtils.java b/javaagent-core/src/main/java/org/hypertrace/agent/core/instrumentation/utils/ServiceNameHeaderUtils.java
@@ -14,13 +14,17 @@
  * limitations under the License.
  */
 
-package org.hypertrace.agent.otel.extensions.config;
+package org.hypertrace.agent.core.instrumentation.utils;
+
+import org.hypertrace.agent.core.config.InstrumentationConfig;
 
 /** Utility class for adding service name header to outgoing requests (exit calls). */
 public class ServiceNameHeaderUtils {
 
   private static final String SERVICE_NAME_HEADER = "ta-client-servicename";
 
+  private static final String serviceName = InstrumentationConfig.ConfigProvider.get().getServiceName();
+
   private ServiceNameHeaderUtils() {}
 
   public static String getClientServiceKey() {
@@ -33,6 +37,6 @@ public static String getClientServiceKey() {
    * @return the service name configured in the agent
    */
   public static String getClientServiceName() {
-    return HypertraceConfig.get().getServiceName().getValue();
+    return serviceName;
   }
 }
diff --git a/otel-extensions/src/main/java/org/hypertrace/agent/otel/extensions/config/InstrumentationConfigImpl.java b/otel-extensions/src/main/java/org/hypertrace/agent/otel/extensions/config/InstrumentationConfigImpl.java
@@ -46,6 +46,11 @@ public int maxBodySizeBytes() {
     return agentConfig.getDataCapture().getBodyMaxSizeBytes().getValue();
   }
 
+  @Override
+  public String getServiceName() {
+    return agentConfig.getServiceName().getValue();
+  }
+
   @Override
   public Message httpHeaders() {
     return this.httpHeaders;

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ afterEvaluate{`
`26`	`26`	`val versions: Map<String, String> by extra`
`27`	`27`
`28`	`28`	`dependencies {`
`29`		`- api(project(":otel-extensions"))`
`30`	`29`	`compileOnly("com.squareup.okhttp3:okhttp:3.0.0")`
`31`	`30`	`testImplementation(project(":testing-common"))`
`32`	`31`	`}`