Skip to content

Commit 47b8655

Browse files
author
Jeel Mehta
committed
Changing the file and directory names acoording to new naming conventions
1 parent 507f227 commit 47b8655

File tree

6 files changed

+29
-29
lines changed

6 files changed

+29
-29
lines changed

exporters/aws-otel-otlp-udp-exporter/build.gradle.kts renamed to exporters/aws-opentelemetry-xray-lambda-exporter/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ plugins {
1919
id("maven-publish")
2020
}
2121

22-
group = "software.amazon.opentelemetry.exporters.otlp.udp.trace"
22+
group = "software.amazon.distro.opentelemetry.exporter.xray.lambda"
2323
version = "0.1.0"
2424

2525
dependencies {
@@ -94,7 +94,7 @@ publishing {
9494
create<MavenPublication>("mavenJava") {
9595
from(components["java"])
9696
groupId = project.group.toString()
97-
artifactId = "aws-otel-otlp-udp-exporter"
97+
artifactId = "aws-opentelemetry-xray-lambda-exporter"
9898
version = project.version.toString()
9999
}
100100
}

exporters/aws-otel-otlp-udp-exporter/settings.gradle.kts renamed to exporters/aws-opentelemetry-xray-lambda-exporter/settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
rootProject.name = "aws-otel-otlp-udp-exporter"
1+
rootProject.name = "aws-opentelemetry-xray-lambda-exporter"
22

33
dependencyResolutionManagement {
44
repositories {
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
package software.amazon.opentelemetry.exporters.otlp.udp.trace;
16+
package software.amazon.distro.opentelemetry.exporter.xray.lambda;
1717

1818
import io.opentelemetry.exporter.internal.otlp.traces.TraceRequestMarshaler;
1919
import io.opentelemetry.sdk.common.CompletableResultCode;
@@ -37,16 +37,16 @@
3737
* specific information.
3838
*/
3939
@Immutable
40-
public class OtlpUdpSpanExporter implements SpanExporter {
40+
public class AwsXrayLambdaExporter implements SpanExporter {
4141

42-
private static final Logger logger = Logger.getLogger(OtlpUdpSpanExporter.class.getName());
42+
private static final Logger logger = Logger.getLogger(AwsXrayLambdaExporter.class.getName());
4343

4444
private final AtomicBoolean isShutdown = new AtomicBoolean();
4545

4646
private final UdpSender sender;
4747
private final String payloadPrefix;
4848

49-
OtlpUdpSpanExporter(UdpSender sender, String payloadPrefix) {
49+
AwsXrayLambdaExporter(UdpSender sender, String payloadPrefix) {
5050
this.sender = sender;
5151
this.payloadPrefix = payloadPrefix;
5252
}
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
package software.amazon.opentelemetry.exporters.otlp.udp.trace;
16+
package software.amazon.distro.opentelemetry.exporter.xray.lambda;
1717

1818
import static java.util.Objects.requireNonNull;
1919

2020
import java.util.Map;
2121

22-
public final class OtlpUdpSpanExporterBuilder {
22+
public final class AwsXrayLambdaExporterBuilder {
2323

2424
private static final String DEFAULT_HOST = "127.0.0.1";
2525
private static final int DEFAULT_PORT = 2000;
@@ -41,7 +41,7 @@ public final class OtlpUdpSpanExporterBuilder {
4141
private static final String AWS_LAMBDA_FUNCTION_NAME_CONFIG = "AWS_LAMBDA_FUNCTION_NAME";
4242
private static final String AWS_XRAY_DAEMON_ADDRESS_CONFIG = "AWS_XRAY_DAEMON_ADDRESS";
4343

44-
public OtlpUdpSpanExporterBuilder setEndpoint(String endpoint) {
44+
public AwsXrayLambdaExporterBuilder setEndpoint(String endpoint) {
4545
requireNonNull(endpoint, "endpoint must not be null");
4646
try {
4747
this.sender = createSenderFromEndpoint(endpoint);
@@ -51,7 +51,7 @@ public OtlpUdpSpanExporterBuilder setEndpoint(String endpoint) {
5151
return this;
5252
}
5353

54-
public OtlpUdpSpanExporterBuilder setPayloadSampleDecision(TracePayloadSampleDecision decision) {
54+
public AwsXrayLambdaExporterBuilder setPayloadSampleDecision(TracePayloadSampleDecision decision) {
5555
this.tracePayloadPrefix =
5656
decision == TracePayloadSampleDecision.SAMPLED
5757
? FORMAT_OTEL_SAMPLED_TRACES_BINARY_PREFIX
@@ -67,7 +67,7 @@ private UdpSender createSenderFromEndpoint(String endpoint) {
6767
}
6868

6969
// For testing purposes
70-
OtlpUdpSpanExporterBuilder withEnvironmentVariables(Map<String, String> env) {
70+
AwsXrayLambdaExporterBuilder withEnvironmentVariables(Map<String, String> env) {
7171
this.environmentVariables = env;
7272
return this;
7373
}
@@ -77,7 +77,7 @@ Map<String, String> getEnvironmentVariables() {
7777
return environmentVariables;
7878
}
7979

80-
public OtlpUdpSpanExporter build() {
80+
public AwsXrayLambdaExporter build() {
8181
if (sender == null) {
8282
String endpoint = null;
8383

@@ -87,7 +87,7 @@ public OtlpUdpSpanExporter build() {
8787
if (endpoint != null && !endpoint.isEmpty()) {
8888
try {
8989
this.sender = createSenderFromEndpoint(endpoint);
90-
return new OtlpUdpSpanExporter(
90+
return new AwsXrayLambdaExporter(
9191
this.sender, PROTOCOL_HEADER + PROTOCOL_DELIMITER + tracePayloadPrefix);
9292
} catch (Exception e) {
9393
// Fallback to defaults if parsing fails
@@ -99,7 +99,7 @@ public OtlpUdpSpanExporter build() {
9999
// Use defaults if not in Lambda or if daemon address is invalid/unavailable
100100
this.sender = new UdpSender(DEFAULT_HOST, DEFAULT_PORT);
101101
}
102-
return new OtlpUdpSpanExporter(
102+
return new AwsXrayLambdaExporter(
103103
this.sender, PROTOCOL_HEADER + PROTOCOL_DELIMITER + tracePayloadPrefix);
104104
}
105105

@@ -109,7 +109,7 @@ private boolean isLambdaEnvironment() {
109109
}
110110

111111
// Only for testing
112-
OtlpUdpSpanExporterBuilder setSender(UdpSender sender) {
112+
AwsXrayLambdaExporterBuilder setSender(UdpSender sender) {
113113
this.sender = sender;
114114
return this;
115115
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
package software.amazon.opentelemetry.exporters.otlp.udp.trace;
16+
package software.amazon.distro.opentelemetry.exporter.xray.lambda;
1717

1818
import io.opentelemetry.sdk.common.CompletableResultCode;
1919
import java.io.IOException;
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
package software.amazon.opentelemetry.exporters.otlp.udp.trace;
16+
package software.amazon.distro.opentelemetry.exporter.xray.lambda;
1717

1818
import static org.assertj.core.api.Assertions.assertThat;
1919
import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -32,11 +32,11 @@
3232
import java.util.Map;
3333
import org.junit.jupiter.api.Test;
3434

35-
public class UdpExporterTest {
35+
public class AwsXrayLambdaExporterTest {
3636

3737
@Test
3838
public void testUdpExporterWithDefaults() {
39-
OtlpUdpSpanExporter exporter = new OtlpUdpSpanExporterBuilder().build();
39+
AwsXrayLambdaExporter exporter = new AwsXrayLambdaExporterBuilder().build();
4040
UdpSender sender = exporter.getSender();
4141
assertThat(sender.getEndpoint().getHostName())
4242
.isEqualTo("localhost"); // getHostName implicitly converts 127.0.0.1 to localhost
@@ -46,8 +46,8 @@ public void testUdpExporterWithDefaults() {
4646

4747
@Test
4848
public void testUdpExporterWithCustomEndpointAndSample() {
49-
OtlpUdpSpanExporter exporter =
50-
new OtlpUdpSpanExporterBuilder()
49+
AwsXrayLambdaExporter exporter =
50+
new AwsXrayLambdaExporterBuilder()
5151
.setEndpoint("somehost:1000")
5252
.setPayloadSampleDecision(TracePayloadSampleDecision.UNSAMPLED)
5353
.build();
@@ -61,7 +61,7 @@ public void testUdpExporterWithCustomEndpointAndSample() {
6161
public void testUdpExporterWithInvalidEndpoint() {
6262
assertThatThrownBy(
6363
() -> {
64-
new OtlpUdpSpanExporterBuilder().setEndpoint("invalidhost");
64+
new AwsXrayLambdaExporterBuilder().setEndpoint("invalidhost");
6565
})
6666
.isInstanceOf(IllegalArgumentException.class)
6767
.hasMessage("Invalid endpoint, must be a valid URL: invalidhost");
@@ -75,16 +75,16 @@ public void shouldUseExpectedEnvironmentVariablesToConfigureEndpoint() {
7575
testEnv.put("AWS_XRAY_DAEMON_ADDRESS", "someaddress:1234");
7676

7777
// Create builder with test environment
78-
OtlpUdpSpanExporterBuilder builder =
79-
new OtlpUdpSpanExporterBuilder().withEnvironmentVariables(testEnv);
78+
AwsXrayLambdaExporterBuilder builder =
79+
new AwsXrayLambdaExporterBuilder().withEnvironmentVariables(testEnv);
8080

8181
// Verify that environment variables are set correctly
8282
assertThat(builder.getEnvironmentVariables())
8383
.containsEntry("AWS_LAMBDA_FUNCTION_NAME", "testFunctionName")
8484
.containsEntry("AWS_XRAY_DAEMON_ADDRESS", "someaddress:1234");
8585

8686
// Build the exporter and verify the configuration
87-
OtlpUdpSpanExporter exporter = builder.build();
87+
AwsXrayLambdaExporter exporter = builder.build();
8888
UdpSender sender = exporter.getSender();
8989

9090
assertThat(sender.getEndpoint().getHostName()).isEqualTo("someaddress");
@@ -98,7 +98,7 @@ public void testExportDefaultBehavior() {
9898
// mock SpanData
9999
SpanData spanData = buildSpanDataMock();
100100

101-
OtlpUdpSpanExporter exporter = new OtlpUdpSpanExporterBuilder().setSender(senderMock).build();
101+
AwsXrayLambdaExporter exporter = new AwsXrayLambdaExporterBuilder().setSender(senderMock).build();
102102
exporter.export(Collections.singletonList(spanData));
103103

104104
// assert that the senderMock.send is called once
@@ -122,8 +122,8 @@ public void testExportWithSampledFalse() {
122122
// mock SpanData
123123
SpanData spanData = buildSpanDataMock();
124124

125-
OtlpUdpSpanExporter exporter =
126-
new OtlpUdpSpanExporterBuilder()
125+
AwsXrayLambdaExporter exporter =
126+
new AwsXrayLambdaExporterBuilder()
127127
.setSender(senderMock)
128128
.setPayloadSampleDecision(TracePayloadSampleDecision.UNSAMPLED)
129129
.build();

0 commit comments

Comments
 (0)