Skip to content

Commit

Permalink
feat!: remove unused convert
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc committed Apr 26, 2024
1 parent b19b0b8 commit 5651eb7
Show file tree
Hide file tree
Showing 24 changed files with 21 additions and 130 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import {
DEFAULT_COLLECTOR_URL,
} from '@opentelemetry/otlp-grpc-exporter-base';
import {
IExportLogsServiceRequest,
IExportLogsServiceResponse,
ProtobufLogsSerializer,
} from '@opentelemetry/otlp-transformer';
Expand All @@ -39,7 +38,6 @@ const USER_AGENT = {
export class OTLPLogExporter
extends OTLPGRPCExporterNodeBase<
ReadableLogRecord,
IExportLogsServiceRequest,
IExportLogsServiceResponse
>
implements LogRecordExporter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ import type {
LogRecordExporter,
} from '@opentelemetry/sdk-logs';
import type { OTLPExporterConfigBase } from '@opentelemetry/otlp-exporter-base';
import type {
IExportLogsServiceRequest,
IExportLogsServiceResponse,
} from '@opentelemetry/otlp-transformer';
import type { IExportLogsServiceResponse } from '@opentelemetry/otlp-transformer';
import { OTLPExporterBrowserBase } from '@opentelemetry/otlp-exporter-base';
import { baggageUtils, getEnv } from '@opentelemetry/core';
import { JsonLogsSerializer } from '@opentelemetry/otlp-transformer';
Expand All @@ -33,11 +30,7 @@ import { getDefaultUrl } from '../config';
* Collector Logs Exporter for Web
*/
export class OTLPLogExporter
extends OTLPExporterBrowserBase<
ReadableLogRecord,
IExportLogsServiceRequest,
IExportLogsServiceResponse
>
extends OTLPExporterBrowserBase<ReadableLogRecord, IExportLogsServiceResponse>
implements LogRecordExporter
{
constructor(config: OTLPExporterConfigBase = {}) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ import type {
LogRecordExporter,
} from '@opentelemetry/sdk-logs';
import type { OTLPExporterNodeConfigBase } from '@opentelemetry/otlp-exporter-base';
import type {
IExportLogsServiceRequest,
IExportLogsServiceResponse,
} from '@opentelemetry/otlp-transformer';
import type { IExportLogsServiceResponse } from '@opentelemetry/otlp-transformer';
import { getEnv, baggageUtils } from '@opentelemetry/core';
import {
OTLPExporterNodeBase,
Expand All @@ -41,11 +38,7 @@ const USER_AGENT = {
* Collector Logs Exporter for Node
*/
export class OTLPLogExporter
extends OTLPExporterNodeBase<
ReadableLogRecord,
IExportLogsServiceRequest,
IExportLogsServiceResponse
>
extends OTLPExporterNodeBase<ReadableLogRecord, IExportLogsServiceResponse>
implements LogRecordExporter
{
constructor(config: OTLPExporterNodeConfigBase = {}) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import {
OTLPExporterBrowserBase,
} from '@opentelemetry/otlp-exporter-base';
import {
IExportLogsServiceRequest,
IExportLogsServiceResponse,
ProtobufLogsSerializer,
} from '@opentelemetry/otlp-transformer';
Expand All @@ -36,15 +35,11 @@ const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURC
* Collector Trace Exporter for Web
*/
export class OTLPLogExporter
extends OTLPExporterBrowserBase<
ReadableLogRecord,
IExportLogsServiceRequest,
IExportLogsServiceResponse
>
extends OTLPExporterBrowserBase<ReadableLogRecord, IExportLogsServiceResponse>
implements LogRecordExporter
{
constructor(config: OTLPExporterConfigBase = {}) {
super(config, ProtobufLogsSerializer, 'x-application/protobuf');
super(config, ProtobufLogsSerializer, 'application/x-protobuf');
this._headers = Object.assign(
this._headers,
baggageUtils.parseKeyPairsIntoRecord(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import {
parseHeaders,
} from '@opentelemetry/otlp-exporter-base';
import {
IExportLogsServiceRequest,
IExportLogsServiceResponse,
ProtobufLogsSerializer,
} from '@opentelemetry/otlp-transformer';
Expand All @@ -42,11 +41,7 @@ const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURC
* Collector Trace Exporter for Node
*/
export class OTLPLogExporter
extends OTLPExporterNodeBase<
ReadableLogRecord,
IExportLogsServiceRequest,
IExportLogsServiceResponse
>
extends OTLPExporterNodeBase<ReadableLogRecord, IExportLogsServiceResponse>
implements LogRecordExporter
{
constructor(config: OTLPExporterConfigBase = {}) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import {
DEFAULT_COLLECTOR_URL,
} from '@opentelemetry/otlp-grpc-exporter-base';
import {
IExportTraceServiceRequest,
IExportTraceServiceResponse,
ProtobufTraceSerializer,
} from '@opentelemetry/otlp-transformer';
Expand All @@ -37,11 +36,7 @@ const USER_AGENT = {
* OTLP Trace Exporter for Node
*/
export class OTLPTraceExporter
extends OTLPGRPCExporterNodeBase<
ReadableSpan,
IExportTraceServiceRequest,
IExportTraceServiceResponse
>
extends OTLPGRPCExporterNodeBase<ReadableSpan, IExportTraceServiceResponse>
implements SpanExporter
{
constructor(config: OTLPGRPCExporterConfigNode = {}) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import {
OTLPExporterBrowserBase,
} from '@opentelemetry/otlp-exporter-base';
import {
IExportTraceServiceRequest,
IExportTraceServiceResponse,
JsonTraceSerializer,
} from '@opentelemetry/otlp-transformer';
Expand All @@ -35,11 +34,7 @@ const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURC
* Collector Trace Exporter for Web
*/
export class OTLPTraceExporter
extends OTLPExporterBrowserBase<
ReadableSpan,
IExportTraceServiceRequest,
IExportTraceServiceResponse
>
extends OTLPExporterBrowserBase<ReadableSpan, IExportTraceServiceResponse>
implements SpanExporter
{
constructor(config: OTLPExporterConfigBase = {}) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
appendRootPathToUrlIfNeeded,
} from '@opentelemetry/otlp-exporter-base';
import {
IExportTraceServiceRequest,
IExportTraceServiceResponse,
} from '@opentelemetry/otlp-transformer';
import { VERSION } from '../../version';
Expand All @@ -42,11 +41,7 @@ const USER_AGENT = {
* Collector Trace Exporter for Node
*/
export class OTLPTraceExporter
extends OTLPExporterNodeBase<
ReadableSpan,
IExportTraceServiceRequest,
IExportTraceServiceResponse
>
extends OTLPExporterNodeBase<ReadableSpan, IExportTraceServiceResponse>
implements SpanExporter
{
constructor(config: OTLPExporterNodeConfigBase = {}) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import {
OTLPExporterBrowserBase,
} from '@opentelemetry/otlp-exporter-base';
import {
IExportTraceServiceRequest,
IExportTraceServiceResponse,
ProtobufTraceSerializer,
} from '@opentelemetry/otlp-transformer';
Expand All @@ -35,11 +34,7 @@ const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURC
* Collector Trace Exporter for Web
*/
export class OTLPTraceExporter
extends OTLPExporterBrowserBase<
ReadableSpan,
IExportTraceServiceRequest,
IExportTraceServiceResponse
>
extends OTLPExporterBrowserBase<ReadableSpan, IExportTraceServiceResponse>
implements SpanExporter
{
constructor(config: OTLPExporterConfigBase = {}) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import {
parseHeaders,
} from '@opentelemetry/otlp-exporter-base';
import {
IExportTraceServiceRequest,
IExportTraceServiceResponse,
ProtobufTraceSerializer,
} from '@opentelemetry/otlp-transformer';
Expand All @@ -40,11 +39,7 @@ const USER_AGENT = {
* Collector Trace Exporter for Node with protobuf
*/
export class OTLPTraceExporter
extends OTLPExporterNodeBase<
ReadableSpan,
IExportTraceServiceRequest,
IExportTraceServiceResponse
>
extends OTLPExporterNodeBase<ReadableSpan, IExportTraceServiceResponse>
implements SpanExporter
{
constructor(config: OTLPExporterNodeConfigBase = {}) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import {
} from '@opentelemetry/otlp-grpc-exporter-base';
import { baggageUtils, getEnv } from '@opentelemetry/core';
import {
IExportMetricsServiceRequest,
IExportMetricsServiceResponse,
ProtobufMetricsSerializer,
} from '@opentelemetry/otlp-transformer';
Expand All @@ -40,7 +39,6 @@ const USER_AGENT = {

class OTLPMetricExporterProxy extends OTLPGRPCExporterNodeBase<
ResourceMetrics,
IExportMetricsServiceRequest,
IExportMetricsServiceResponse
> {
constructor(config?: OTLPGRPCExporterConfigNode & OTLPMetricExporterOptions) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import {
OTLPMetricExporterOptions,
} from './OTLPMetricExporterOptions';
import { OTLPExporterBase } from '@opentelemetry/otlp-exporter-base';
import { IExportMetricsServiceRequest } from '@opentelemetry/otlp-transformer';
import { diag } from '@opentelemetry/api';

export const CumulativeTemporalitySelector: AggregationTemporalitySelector =
Expand Down Expand Up @@ -119,11 +118,7 @@ function chooseAggregationSelector(
}

export class OTLPMetricExporterBase<
T extends OTLPExporterBase<
OTLPMetricExporterOptions,
ResourceMetrics,
IExportMetricsServiceRequest
>,
T extends OTLPExporterBase<OTLPMetricExporterOptions, ResourceMetrics>,
> implements PushMetricExporter
{
public _otlpExporter: T;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import {
appendRootPathToUrlIfNeeded,
} from '@opentelemetry/otlp-exporter-base';
import {
IExportMetricsServiceRequest,
IExportMetricsServiceResponse,
JsonMetricsSerializer,
} from '@opentelemetry/otlp-transformer';
Expand All @@ -35,7 +34,6 @@ const DEFAULT_COLLECTOR_URL = `http://localhost:4318/${DEFAULT_COLLECTOR_RESOURC

class OTLPExporterBrowserProxy extends OTLPExporterBrowserBase<
ResourceMetrics,
IExportMetricsServiceRequest,
IExportMetricsServiceResponse
> {
constructor(config?: OTLPMetricExporterOptions & OTLPExporterConfigBase) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
parseHeaders,
} from '@opentelemetry/otlp-exporter-base';
import {
IExportMetricsServiceRequest,
IExportMetricsServiceResponse,
JsonMetricsSerializer,
} from '@opentelemetry/otlp-transformer';
Expand All @@ -40,7 +39,6 @@ const USER_AGENT = {

class OTLPExporterNodeProxy extends OTLPExporterNodeBase<
ResourceMetrics,
IExportMetricsServiceRequest,
IExportMetricsServiceResponse
> {
constructor(config?: OTLPExporterNodeConfigBase & OTLPMetricExporterOptions) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,12 @@ import {
OTLPExporterBase,
OTLPExporterConfigBase,
} from '@opentelemetry/otlp-exporter-base';
import { IExportMetricsServiceRequest } from '@opentelemetry/otlp-transformer';

type CollectorExporterConfig = OTLPExporterConfigBase;

class OTLPMetricExporter extends OTLPExporterBase<
CollectorExporterConfig,
ResourceMetrics,
IExportMetricsServiceRequest
ResourceMetrics
> {
onInit() {}

Expand All @@ -47,10 +45,6 @@ class OTLPMetricExporter extends OTLPExporterBase<
getDefaultUrl(config: CollectorExporterConfig) {
return config.url || '';
}

convert(metrics: ResourceMetrics[]): IExportMetricsServiceRequest {
return { resourceMetrics: [] };
}
}

describe('OTLPMetricExporter - common', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import {
OTLPExporterNodeBase,
} from '@opentelemetry/otlp-exporter-base';
import {
IExportMetricsServiceRequest,
IExportMetricsServiceResponse,
ProtobufMetricsSerializer,
} from '@opentelemetry/otlp-transformer';
Expand All @@ -40,7 +39,6 @@ const USER_AGENT = {

class OTLPMetricExporterNodeProxy extends OTLPExporterNodeBase<
ResourceMetrics,
IExportMetricsServiceRequest,
IExportMetricsServiceResponse
> {
constructor(config?: OTLPExporterNodeConfigBase & OTLPMetricExporterOptions) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ import { configureExporterTimeout } from './util';
export abstract class OTLPExporterBase<
T extends OTLPExporterConfigBase,
ExportItem,
ServiceRequest,
> {
public readonly url: string;
public readonly hostname: string | undefined;
Expand Down Expand Up @@ -143,5 +142,4 @@ export abstract class OTLPExporterBase<
onError: (error: OTLPExporterError) => void
): void;
abstract getDefaultUrl(config: T): string;
abstract convert(objects: ExportItem[]): ServiceRequest;
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@ import { ISerializer } from '@opentelemetry/otlp-transformer';
*/
export abstract class OTLPExporterBrowserBase<
ExportItem,
ServiceRequest,
ServiceResponse,
> extends OTLPExporterBase<OTLPExporterConfigBase, ExportItem, ServiceRequest> {
> extends OTLPExporterBase<OTLPExporterConfigBase, ExportItem> {
protected _headers: Record<string, string>;
private _useXHR: boolean = false;
private _contentType: string;
Expand Down Expand Up @@ -68,12 +67,6 @@ export abstract class OTLPExporterBrowserBase<

onShutdown(): void {}

override convert(_objects: ExportItem[]): ServiceRequest {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore nothing to do
return {};
}

send(
items: ExportItem[],
onSuccess: () => void,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,8 @@ import { ISerializer } from '@opentelemetry/otlp-transformer';
*/
export abstract class OTLPExporterNodeBase<
ExportItem,
ServiceRequest,
ServiceResponse,
> extends OTLPExporterBase<
OTLPExporterNodeConfigBase,
ExportItem,
ServiceRequest
> {
> extends OTLPExporterBase<OTLPExporterNodeConfigBase, ExportItem> {
DEFAULT_HEADERS: Record<string, string> = {};
headers: Record<string, string>;
agent: http.Agent | https.Agent | undefined;
Expand Down Expand Up @@ -68,11 +63,6 @@ export abstract class OTLPExporterNodeBase<

onInit(_config: OTLPExporterNodeConfigBase): void {}

override convert(_objects: ExportItem[]): ServiceRequest {
// TODO(pichlermarc): needs to be removed from base in a follow-up
return {} as ServiceRequest;
}

send(
objects: ExportItem[],
onSuccess: () => void,
Expand Down
Loading

0 comments on commit 5651eb7

Please sign in to comment.