Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(trace-otlp-http-exporter): add compression env vars #2796

Merged
merged 7 commits into from
Mar 2, 2022
Merged

feat(trace-otlp-http-exporter): add compression env vars #2796

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
240aacd
feat(otlp-http-exporter): add compression env vars
svetlanabrennan Feb 16, 2022
c05de1b
Merge branch 'main' into add-compression-otlp
svetlanabrennan Feb 18, 2022
e8f08be
Merge branch 'main' into add-compression-otlp
svetlanabrennan Feb 22, 2022
cd0a878
feat(otlp-http-exporter): add configure compression function
svetlanabrennan Feb 22, 2022
b6df5b0
Update packages/exporter-trace-otlp-http/src/platform/node/util.ts
svetlanabrennan Feb 23, 2022
2df264a
Merge branch 'main' into add-compression-otlp
vmarchaud Feb 24, 2022
e7325c5
Merge branch 'main' into add-compression-otlp
svetlanabrennan Mar 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/exporter-trace-otlp-http/src/platform/node/OTLPExporterNodeBase.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export abstract class OTLPExporterNodeBase<
DEFAULT_HEADERS: Record<string, string> = {};
headers: Record<string, string>;
agent: http.Agent | https.Agent | undefined;
compression: CompressionAlgorithm;
compression: CompressionAlgorithm | string;

constructor(config: OTLPExporterNodeConfigBase = {}) {
super(config);
Expand All @@ -53,7 +53,9 @@ export abstract class OTLPExporterNodeBase<
baggageUtils.parseKeyPairsIntoRecord(getEnv().OTEL_EXPORTER_OTLP_HEADERS)
);
this.agent = createHttpAgent(config);
this.compression = config.compression || CompressionAlgorithm.NONE;
this.compression =
config.compression || process.env.OTEL_EXPORTER_OTLP_TRACES_COMPRESSION ||
process.env.OTEL_EXPORTER_OTLP_COMPRESSION || CompressionAlgorithm.NONE;
}

onInit(_config: OTLPExporterNodeConfigBase): void {}
Expand Down
14 changes: 14 additions & 0 deletions packages/exporter-trace-otlp-http/test/node/CollectorTraceExporter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,20 @@ describe('OTLPTraceExporter - node with json over http', () => {
envSource.OTEL_EXPORTER_OTLP_TRACES_HEADERS = '';
envSource.OTEL_EXPORTER_OTLP_HEADERS = '';
});
it('should use compression defined via env', () => {
envSource.OTEL_EXPORTER_OTLP_COMPRESSION = 'gzip';
const collectorExporter = new OTLPTraceExporter();
assert.strictEqual(collectorExporter.compression, 'gzip');
envSource.OTEL_EXPORTER_OTLP_COMPRESSION = '';
});
it('should override global compression config with signal compression defined via env', () => {
envSource.OTEL_EXPORTER_OTLP_COMPRESSION = 'foo';
envSource.OTEL_EXPORTER_OTLP_TRACES_COMPRESSION = 'gzip';
const collectorExporter = new OTLPTraceExporter();
assert.strictEqual(collectorExporter.compression, 'gzip');
envSource.OTEL_EXPORTER_OTLP_COMPRESSION = '';
envSource.OTEL_EXPORTER_OTLP_TRACES_COMPRESSION = '';
});
});

describe('export', () => {
Expand Down
6 changes: 6 additions & 0 deletions packages/opentelemetry-core/src/utils/environment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ export type ENVIRONMENT = {
OTEL_TRACES_EXPORTER?: string;
OTEL_TRACES_SAMPLER_ARG?: string;
OTEL_TRACES_SAMPLER?: string;
OTEL_EXPORTER_OTLP_COMPRESSION?: string,
OTEL_EXPORTER_OTLP_TRACES_COMPRESSION?: string,
OTEL_EXPORTER_OTLP_METRICS_COMPRESSION?: string
} & ENVIRONMENT_NUMBERS &
ENVIRONMENT_LISTS;

Expand Down Expand Up @@ -135,6 +138,9 @@ export const DEFAULT_ENVIRONMENT: Required<ENVIRONMENT> = {
OTEL_TRACES_EXPORTER: 'none',
OTEL_TRACES_SAMPLER: TracesSamplerValues.ParentBasedAlwaysOn,
OTEL_TRACES_SAMPLER_ARG: '',
OTEL_EXPORTER_OTLP_COMPRESSION: '',
OTEL_EXPORTER_OTLP_TRACES_COMPRESSION: '',
OTEL_EXPORTER_OTLP_METRICS_COMPRESSION: ''
};

/**
Expand Down