Making the final name change

Author: Jeel Mehta

.github/workflows/release-udp-exporter.yml

@@ -25,7 +25,7 @@ jobs:
           cache: 'gradle'    # Add gradle caching
 
       - name: Build, Test and Publish UDP exporter
-        working-directory: exporters/aws-opentelemetry-xray-lambda-exporter
+        working-directory: exporters/aws-opentelemetry-xray-udp-span-exporter
         run: |
           gradle build 
           gradle publishToMavenLocal

exporters/aws-opentelemetry-xray-lambda-exporter/build.gradle.kts exporters/aws-opentelemetry-xray-udp-span-exporter/build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
   id("maven-publish")
 }
 
-group = "software.amazon.distro.opentelemetry.exporter.xray.lambda"
+group = "software.amazon.distro.opentelemetry.exporter.xray.udp.trace"
 version = "0.1.0"
 
 dependencies {
@@ -94,7 +94,7 @@ publishing {
     create<MavenPublication>("mavenJava") {
       from(components["java"])
       groupId = project.group.toString()
-      artifactId = "aws-opentelemetry-xray-lambda-exporter"
+      artifactId = "aws-opentelemetry-xray-udp-span-exporter"
       version = project.version.toString()
     }
   }

exporters/aws-opentelemetry-xray-lambda-exporter/settings.gradle.kts exporters/aws-opentelemetry-xray-udp-span-exporter/settings.gradle.kts

@@ -1,4 +1,4 @@
-rootProject.name = "aws-opentelemetry-xray-lambda-exporter"
+rootProject.name = "aws-opentelemetry-xray-udp-span-exporter"
 
 dependencyResolutionManagement {
   repositories {

exporters/aws-opentelemetry-xray-lambda-exporter/src/main/java/software/amazon/distro/opentelemetry/exporter/xray/lambda/AwsXrayLambdaExporter.java exporters/aws-opentelemetry-xray-udp-span-exporter/src/main/java/software/amazon/distro/opentelemetry/exporter/xray/udp/trace/AwsXrayUdpSpanExporter.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.distro.opentelemetry.exporter.xray.lambda;
+package software.amazon.distro.opentelemetry.exporter.xray.udp.trace;
 
 import io.opentelemetry.exporter.internal.otlp.traces.TraceRequestMarshaler;
 import io.opentelemetry.sdk.common.CompletableResultCode;
@@ -37,16 +37,16 @@
  * specific information.
  */
 @Immutable
-public class AwsXrayLambdaExporter implements SpanExporter {
+public class AwsXrayUdpSpanExporter implements SpanExporter {
 
-  private static final Logger logger = Logger.getLogger(AwsXrayLambdaExporter.class.getName());
+  private static final Logger logger = Logger.getLogger(AwsXrayUdpSpanExporter.class.getName());
 
   private final AtomicBoolean isShutdown = new AtomicBoolean();
 
   private final UdpSender sender;
   private final String payloadPrefix;
 
-  AwsXrayLambdaExporter(UdpSender sender, String payloadPrefix) {
+  AwsXrayUdpSpanExporter(UdpSender sender, String payloadPrefix) {
     this.sender = sender;
     this.payloadPrefix = payloadPrefix;
   }
@@ -94,5 +94,4 @@ UdpSender getSender() {
   String getPayloadPrefix() {
     return payloadPrefix;
   }
-}
-
+}

exporters/aws-opentelemetry-xray-lambda-exporter/src/main/java/software/amazon/distro/opentelemetry/exporter/xray/lambda/AwsXrayLambdaExporterBuilder.java exporters/aws-opentelemetry-xray-udp-span-exporter/src/main/java/software/amazon/distro/opentelemetry/exporter/xray/udp/trace/AwsXrayUdpSpanExporterBuilder.java

@@ -13,13 +13,13 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.distro.opentelemetry.exporter.xray.lambda;
+package software.amazon.distro.opentelemetry.exporter.xray.udp.trace;
 
 import static java.util.Objects.requireNonNull;
 
 import java.util.Map;
 
-public final class AwsXrayLambdaExporterBuilder {
+public final class AwsXrayUdpSpanExporterBuilder {
 
   private static final String DEFAULT_HOST = "127.0.0.1";
   private static final int DEFAULT_PORT = 2000;
@@ -41,7 +41,7 @@ public final class AwsXrayLambdaExporterBuilder {
   private static final String AWS_LAMBDA_FUNCTION_NAME_CONFIG = "AWS_LAMBDA_FUNCTION_NAME";
   private static final String AWS_XRAY_DAEMON_ADDRESS_CONFIG = "AWS_XRAY_DAEMON_ADDRESS";
 
-  public AwsXrayLambdaExporterBuilder setEndpoint(String endpoint) {
+  public AwsXrayUdpSpanExporterBuilder setEndpoint(String endpoint) {
     requireNonNull(endpoint, "endpoint must not be null");
     try {
       this.sender = createSenderFromEndpoint(endpoint);
@@ -51,7 +51,7 @@ public AwsXrayLambdaExporterBuilder setEndpoint(String endpoint) {
     return this;
   }
 
-  public AwsXrayLambdaExporterBuilder setPayloadSampleDecision(TracePayloadSampleDecision decision) {
+  public AwsXrayUdpSpanExporterBuilder setPayloadSampleDecision(TracePayloadSampleDecision decision) {
     this.tracePayloadPrefix =
         decision == TracePayloadSampleDecision.SAMPLED
             ? FORMAT_OTEL_SAMPLED_TRACES_BINARY_PREFIX
@@ -67,7 +67,7 @@ private UdpSender createSenderFromEndpoint(String endpoint) {
     }
 
   // For testing purposes
-  AwsXrayLambdaExporterBuilder withEnvironmentVariables(Map<String, String> env) {
+  AwsXrayUdpSpanExporterBuilder withEnvironmentVariables(Map<String, String> env) {
     this.environmentVariables = env;
     return this;
   }
@@ -77,7 +77,7 @@ Map<String, String> getEnvironmentVariables() {
     return environmentVariables;
   }
 
-  public AwsXrayLambdaExporter build() {
+  public AwsXrayUdpSpanExporter build() {
     if (sender == null) {
       String endpoint = null;
 
@@ -87,7 +87,7 @@ public AwsXrayLambdaExporter build() {
         if (endpoint != null && !endpoint.isEmpty()) {
           try {
             this.sender = createSenderFromEndpoint(endpoint);
-            return new AwsXrayLambdaExporter(
+            return new AwsXrayUdpSpanExporter(
                 this.sender, PROTOCOL_HEADER + PROTOCOL_DELIMITER + tracePayloadPrefix);
           } catch (Exception e) {
             // Fallback to defaults if parsing fails
@@ -99,7 +99,7 @@ public AwsXrayLambdaExporter build() {
       // Use defaults if not in Lambda or if daemon address is invalid/unavailable
       this.sender = new UdpSender(DEFAULT_HOST, DEFAULT_PORT);
     }
-    return new AwsXrayLambdaExporter(
+    return new AwsXrayUdpSpanExporter(
         this.sender, PROTOCOL_HEADER + PROTOCOL_DELIMITER + tracePayloadPrefix);
   }
 
@@ -109,7 +109,7 @@ private boolean isLambdaEnvironment() {
   }
 
   // Only for testing
-  AwsXrayLambdaExporterBuilder setSender(UdpSender sender) {
+  AwsXrayUdpSpanExporterBuilder setSender(UdpSender sender) {
     this.sender = sender;
     return this;
   }
@@ -118,5 +118,4 @@ AwsXrayLambdaExporterBuilder setSender(UdpSender sender) {
 enum TracePayloadSampleDecision {
   SAMPLED,
   UNSAMPLED
-}
-
+}

exporters/aws-opentelemetry-xray-lambda-exporter/src/main/java/software/amazon/distro/opentelemetry/exporter/xray/lambda/UdpSender.java exporters/aws-opentelemetry-xray-udp-span-exporter/src/main/java/software/amazon/distro/opentelemetry/exporter/xray/udp/trace/UdpSender.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.distro.opentelemetry.exporter.xray.lambda;
+package software.amazon.distro.opentelemetry.exporter.xray.udp.trace;
 
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import java.io.IOException;

exporters/aws-opentelemetry-xray-lambda-exporter/src/test/java/software/amazon/distro/opentelemetry/exporter/xray/lambda/AwsXrayLambdaExporterTest.java exporters/aws-opentelemetry-xray-udp-span-exporter/src/test/java/software/amazon/distro/opentelemetry/exporter/xray/udp/trace/AwsXrayUdpSpanExporterTest.java

@@ -13,7 +13,7 @@
  * permissions and limitations under the License.
  */
 
-package software.amazon.distro.opentelemetry.exporter.xray.lambda;
+package software.amazon.distro.opentelemetry.exporter.xray.udp.trace;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -32,11 +32,11 @@
 import java.util.Map;
 import org.junit.jupiter.api.Test;
 
-public class AwsXrayLambdaExporterTest {
+public class AwsXrayUdpSpanExporterTest {
 
   @Test
   public void testUdpExporterWithDefaults() {
-    AwsXrayLambdaExporter exporter = new AwsXrayLambdaExporterBuilder().build();
+    AwsXrayUdpSpanExporter exporter = new AwsXrayUdpSpanExporterBuilder().build();
     UdpSender sender = exporter.getSender();
     assertThat(sender.getEndpoint().getHostName())
         .isEqualTo("localhost"); // getHostName implicitly converts 127.0.0.1 to localhost
@@ -46,8 +46,8 @@ public void testUdpExporterWithDefaults() {
 
   @Test
   public void testUdpExporterWithCustomEndpointAndSample() {
-    AwsXrayLambdaExporter exporter =
-        new AwsXrayLambdaExporterBuilder()
+    AwsXrayUdpSpanExporter exporter =
+        new AwsXrayUdpSpanExporterBuilder()
             .setEndpoint("somehost:1000")
             .setPayloadSampleDecision(TracePayloadSampleDecision.UNSAMPLED)
             .build();
@@ -61,7 +61,7 @@ public void testUdpExporterWithCustomEndpointAndSample() {
   public void testUdpExporterWithInvalidEndpoint() {
     assertThatThrownBy(
             () -> {
-              new AwsXrayLambdaExporterBuilder().setEndpoint("invalidhost");
+              new AwsXrayUdpSpanExporterBuilder().setEndpoint("invalidhost");
             })
         .isInstanceOf(IllegalArgumentException.class)
         .hasMessage("Invalid endpoint, must be a valid URL: invalidhost");
@@ -75,16 +75,16 @@ public void shouldUseExpectedEnvironmentVariablesToConfigureEndpoint() {
     testEnv.put("AWS_XRAY_DAEMON_ADDRESS", "someaddress:1234");
 
     // Create builder with test environment
-    AwsXrayLambdaExporterBuilder builder =
-        new AwsXrayLambdaExporterBuilder().withEnvironmentVariables(testEnv);
+    AwsXrayUdpSpanExporterBuilder builder =
+        new AwsXrayUdpSpanExporterBuilder().withEnvironmentVariables(testEnv);
 
     // Verify that environment variables are set correctly
     assertThat(builder.getEnvironmentVariables())
         .containsEntry("AWS_LAMBDA_FUNCTION_NAME", "testFunctionName")
         .containsEntry("AWS_XRAY_DAEMON_ADDRESS", "someaddress:1234");
 
     // Build the exporter and verify the configuration
-    AwsXrayLambdaExporter exporter = builder.build();
+    AwsXrayUdpSpanExporter exporter = builder.build();
     UdpSender sender = exporter.getSender();
 
     assertThat(sender.getEndpoint().getHostName()).isEqualTo("someaddress");
@@ -98,7 +98,7 @@ public void testExportDefaultBehavior() {
     // mock SpanData
     SpanData spanData = buildSpanDataMock();
 
-    AwsXrayLambdaExporter exporter = new AwsXrayLambdaExporterBuilder().setSender(senderMock).build();
+    AwsXrayUdpSpanExporter exporter = new AwsXrayUdpSpanExporterBuilder().setSender(senderMock).build();
     exporter.export(Collections.singletonList(spanData));
 
     // assert that the senderMock.send is called once
@@ -122,8 +122,8 @@ public void testExportWithSampledFalse() {
     // mock SpanData
     SpanData spanData = buildSpanDataMock();
 
-    AwsXrayLambdaExporter exporter =
-        new AwsXrayLambdaExporterBuilder()
+    AwsXrayUdpSpanExporter exporter =
+        new AwsXrayUdpSpanExporterBuilder()
             .setSender(senderMock)
             .setPayloadSampleDecision(TracePayloadSampleDecision.UNSAMPLED)
             .build();
@@ -172,5 +172,4 @@ private SpanData buildSpanDataMock() {
 
     return mockSpanData;
   }
-}
-
+}

sample-apps/integ-test-app/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 dependencies {
   implementation("org.springframework.boot:spring-boot-starter-web")
-  implementation("software.amazon.distro.opentelemetry.exporter.xray.lambda:aws-opentelemetry-xray-lambda-exporter:0.1.0")
+  implementation("software.amazon.distro.opentelemetry.exporter.xray.udp.trace:aws-opentelemetry-xray-udp-span-exporter:0.1.0")
   implementation(platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.10.0"))
   implementation("io.opentelemetry:opentelemetry-api")
   implementation("io.opentelemetry:opentelemetry-sdk")

sample-apps/integ-test-app/src/main/java/com/amazon/sampleapp/ValidationApp.java

@@ -7,17 +7,17 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
-import software.amazon.distro.opentelemetry.exporter.xray.lambda.AwsXrayLambdaExporterBuilder;
-import software.amazon.distro.opentelemetry.exporter.xray.lambda.AwsXrayLambdaExporter;
+import software.amazon.distro.opentelemetry.exporter.xray.lambda.AwsXrayUdpSpanExporterBuilder;
+import software.amazon.distro.opentelemetry.exporter.xray.lambda.AwsXrayUdpSpanExporter;
 
 @SpringBootApplication
 public class ValidationApp {
 
   @Bean
   public SdkTracerProvider tracerProvider() {
     // Set up UDP exporter
-    AwsXrayLambdaExporter exporter =
-        new AwsXrayLambdaExporterBuilder().setEndpoint("localhost:2000").build();
+    AwsXrayUdpSpanExporter exporter =
+        new AwsXrayUdpSpanExporterBuilder().setEndpoint("localhost:2000").build();
 
     // Set up and return the tracer provider
     return SdkTracerProvider.builder()