Skip to content

Commit 4ef1cff

Browse files
committed
rename UDP Exporter to AwsXrayUdpSpanExporter
1 parent adf2273 commit 4ef1cff

File tree

14 files changed

+42
-42
lines changed

14 files changed

+42
-42
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: ./.github/actions/set_up
1919
with:
2020
node_version: "20"
21-
package_name: "@aws/aws-otel-otlp-udp-exporter"
21+
package_name: "@aws/aws-distro-opentelemetry-exporter-xray-udp"
2222
os: ubuntu-latest
2323
run_unit_tests: true
2424

@@ -27,7 +27,7 @@ jobs:
2727
id: staging_tarball_build
2828
shell: bash
2929
run: |
30-
cd exporters/aws-otel-otlp-udp-exporter
30+
cd exporters/aws-distro-opentelemetry-exporter-xray-udp
3131
npm pack
3232
3333
- name: Download and run X-Ray Daemon
@@ -42,7 +42,7 @@ jobs:
4242
run: |
4343
cd sample-applications/integ-test-http-server
4444
npm install
45-
npm install ../../exporters/aws-otel-otlp-udp-exporter/aws-aws-otel-otlp-udp-exporter-*.tgz
45+
npm install ../../exporters/aws-distro-opentelemetry-exporter-xray-udp/aws-aws-distro-opentelemetry-exporter-xray-udp-*.tgz
4646
4747
- name: Run Sample App in Background
4848
run: |
@@ -76,7 +76,7 @@ jobs:
7676
# TODO: Uncomment when we make the first release
7777
# # Publish OTLP UDP Exporter to npm
7878
# - name: Publish to npm
79-
# working-directory: exporters/aws-otel-otlp-udp-exporter
79+
# working-directory: exporters/aws-distro-opentelemetry-exporter-xray-udp
8080
# env:
8181
# NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
8282
# NPM_CONFIG_PROVENANCE: true
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# AWS Distro for OpenTelemetry (ADOT) OTLP UDP Exporter
2+
3+
Install this package into your NodeJS project with:
4+
5+
```shell
6+
npm install --save @aws/aws-distro-opentelemetry-exporter-xray-udp
7+
```
8+
9+
## Usage
10+
11+
```js
12+
import { AwsXrayUdpSpanExporter } from './aws-xray-udp-span-exporter';
13+
import { SpanExporter } from '@opentelemetry/sdk-trace-base';
14+
15+
// ...
16+
17+
let AwsXrayUdpSpanExporter: SpanExporter = new AwsXrayUdpSpanExporter('127.0.0.1:2000');
18+
```

exporters/aws-otel-otlp-udp-exporter/package.json renamed to exporters/aws-distro-opentelemetry-exporter-xray-udp/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"name": "@aws/aws-otel-otlp-udp-exporter",
2+
"name": "@aws/aws-distro-opentelemetry-exporter-xray-udp",
33
"version": "0.0.1",
44
"description": "This package provides an OTLP UDP Exporter for OpenTelemetry.",
55
"author": {
66
"name": "Amazon Web Services",
77
"url": "http://aws.amazon.com"
88
},
9-
"homepage": "https://github.com/aws-observability/aws-otel-js-instrumentation/tree/main/exporters/aws-otel-otlp-udp-exporter#readme",
9+
"homepage": "https://github.com/aws-observability/aws-otel-js-instrumentation/tree/main/exporters/aws-distro-opentelemetry-exporter-xray-udp#readme",
1010
"license": "Apache-2.0",
1111
"engines": {
1212
"node": ">=14"
@@ -22,7 +22,7 @@
2222
"compile": "tsc -p .",
2323
"lint": "eslint . --ext .ts",
2424
"lint:fix": "eslint . --ext .ts --fix",
25-
"precompile": "tsc --version && lerna run version:update --scope @aws/aws-otel-otlp-udp-exporter --include-dependencies",
25+
"precompile": "tsc --version && lerna run version:update --scope @aws/aws-distro-opentelemetry-exporter-xray-udp --include-dependencies",
2626
"prewatch": "npm run precompile",
2727
"prepublishOnly": "npm run compile",
2828
"tdd": "yarn test -- --watch-extensions ts --watch",

exporters/aws-otel-otlp-udp-exporter/src/otlp-udp-exporter.ts renamed to exporters/aws-distro-opentelemetry-exporter-xray-udp/src/aws-xray-udp-span-exporter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export class UdpExporter {
5454
}
5555
}
5656

57-
export class OTLPUdpSpanExporter implements SpanExporter {
57+
export class AwsXrayUdpSpanExporter implements SpanExporter {
5858
private _udpExporter: UdpExporter;
5959
private _signalPrefix: string;
6060
private _endpoint: string;
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
export { OTLPUdpSpanExporter } from './otlp-udp-exporter';
4+
export { AwsXrayUdpSpanExporter } from './aws-xray-udp-span-exporter';

exporters/aws-otel-otlp-udp-exporter/test/otlp-udp-exporter.test.ts renamed to exporters/aws-distro-opentelemetry-exporter-xray-udp/test/otlp-udp-exporter.test.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { diag, SpanContext, SpanKind } from '@opentelemetry/api';
55
import { ExportResultCode } from '@opentelemetry/core';
66
import { Resource } from '@opentelemetry/resources';
77
import { ProtobufTraceSerializer } from '@opentelemetry/otlp-transformer';
8-
import { OTLPUdpSpanExporter, UdpExporter } from '../src/otlp-udp-exporter';
8+
import { AwsXrayUdpSpanExporter, UdpExporter } from '../src/aws-xray-udp-span-exporter';
99
import { ReadableSpan } from '@opentelemetry/sdk-trace-base';
1010
import * as sinon from 'sinon';
1111
import expect from 'expect';
@@ -74,8 +74,8 @@ describe('UdpExporterTest', () => {
7474
});
7575
});
7676

77-
describe('OTLPUdpSpanExporterTest', () => {
78-
let otlpUdpSpanExporter: OTLPUdpSpanExporter;
77+
describe('AwsXrayUdpSpanExporterTest', () => {
78+
let AwsXrayUdpSpanExporter: AwsXrayUdpSpanExporter;
7979
let udpExporterMock: { sendData: any; shutdown: any };
8080
let diagErrorSpy: sinon.SinonSpy<[message: string, ...args: unknown[]], void>;
8181
const endpoint = '127.0.0.1:3000';
@@ -123,8 +123,8 @@ describe('OTLPUdpSpanExporterTest', () => {
123123
// Stub the diag.error method
124124
diagErrorSpy = sinon.spy(diag, 'error');
125125

126-
// Create an instance of OTLPUdpSpanExporter
127-
otlpUdpSpanExporter = new OTLPUdpSpanExporter(endpoint, prefix);
126+
// Create an instance of AwsXrayUdpSpanExporter
127+
AwsXrayUdpSpanExporter = new AwsXrayUdpSpanExporter(endpoint, prefix);
128128
});
129129

130130
afterEach(() => {
@@ -137,7 +137,7 @@ describe('OTLPUdpSpanExporterTest', () => {
137137
// Stub ProtobufTraceSerializer.serializeRequest
138138
sinon.stub(ProtobufTraceSerializer, 'serializeRequest').returns(serializedData);
139139

140-
otlpUdpSpanExporter.export(spans, callback);
140+
AwsXrayUdpSpanExporter.export(spans, callback);
141141

142142
expect(udpExporterMock.sendData.calledOnceWith(serializedData, 'T1')).toBe(true);
143143
expect(callback.calledOnceWith({ code: ExportResultCode.SUCCESS })).toBe(true);
@@ -149,7 +149,7 @@ describe('OTLPUdpSpanExporterTest', () => {
149149
sinon.stub(ProtobufTraceSerializer, 'serializeRequest').returns(undefined);
150150
const callback = sinon.stub();
151151

152-
otlpUdpSpanExporter.export(spans, callback);
152+
AwsXrayUdpSpanExporter.export(spans, callback);
153153

154154
expect(callback.notCalled).toBe(true);
155155
expect(udpExporterMock.sendData.notCalled).toBe(true);
@@ -162,26 +162,26 @@ describe('OTLPUdpSpanExporterTest', () => {
162162

163163
const callback = sinon.stub();
164164

165-
otlpUdpSpanExporter.export(spans, callback);
165+
AwsXrayUdpSpanExporter.export(spans, callback);
166166

167167
expect(diagErrorSpy.calledOnceWith('Error exporting spans: %s', sinon.match.instanceOf(Error))).toBe(true);
168168
expect(callback.calledOnceWith({ code: ExportResultCode.FAILED })).toBe(true);
169169
});
170170

171171
it('should forceFlush without throwing', async () => {
172-
expect(otlpUdpSpanExporter.forceFlush()).resolves.not.toThrow();
172+
expect(AwsXrayUdpSpanExporter.forceFlush()).resolves.not.toThrow();
173173
});
174174

175175
it('should shutdown the UDP exporter successfully', async () => {
176-
await otlpUdpSpanExporter.shutdown();
176+
await AwsXrayUdpSpanExporter.shutdown();
177177
expect(udpExporterMock.shutdown.calledOnce).toBe(true);
178178
});
179179

180180
it('should use expected Environment Variables to configure endpoint', () => {
181181
process.env.AWS_LAMBDA_FUNCTION_NAME = 'testFunctionName';
182182
process.env.AWS_XRAY_DAEMON_ADDRESS = 'someaddress:1234';
183183

184-
const exporter = new OTLPUdpSpanExporter(undefined);
184+
const exporter = new AwsXrayUdpSpanExporter(undefined);
185185
expect(exporter['_endpoint']).toBe('someaddress:1234');
186186
expect(exporter['_udpExporter']['_host']).toBe('someaddress');
187187
expect(exporter['_udpExporter']['_port']).toBe(1234);

0 commit comments

Comments
 (0)