Skip to content

Commit 7ed67f9

Browse files
authored
test(otlp-grpc-exporter-base): do not use hard-coded version in tests, touch up changelog entries (#5069)
1 parent a1442fe commit 7ed67f9

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

experimental/CHANGELOG.md

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,21 @@ All notable changes to experimental packages in this project will be documented
77

88
### :boom: Breaking Change
99

10+
* feat(exporter-*-otlp-*)!: rewrite exporter config logic for testability [#4971](https://github.com/open-telemetry/opentelemetry-js/pull/4971) @pichlermarc
11+
* (user-facing) `getDefaultUrl` was intended for internal use has been removed from all exporters
12+
* (user-facing) `getUrlFromConfig` was intended for internal use and has been removed from all exporters
13+
* (user-facing) `hostname` was intended for internal use and has been removed from all exporters
14+
* (user-facing) `url` was intended for internal use and has been removed from all exporters
15+
* (user-facing) `timeoutMillis` was intended for internal use and has been removed from all exporters
16+
* (user-facing) `onInit` was intended for internal use and has been removed from all exporters
17+
* feat(otlp-exporter-base)!: do not export functions that are intended for internal use [#4971](https://github.com/open-telemetry/opentelemetry-js/pull/4971) @pichlermarc
18+
* Drops the following functions and types that were intended for internal use from the package exports:
19+
* `parseHeaders`
20+
* `appendResourcePathToUrl`
21+
* `appendResourcePathToUrlIfNeeded`
22+
* `configureExporterTimeout`
23+
* `invalidTimeout`
24+
1025
### :rocket: (Enhancement)
1126

1227
* feat(api-logs): Add delegating no-op logger provider [#4861](https://github.com/open-telemetry/opentelemetry-js/pull/4861) @hectorhdzg
@@ -22,13 +37,6 @@ All notable changes to experimental packages in this project will be documented
2237
* fix(sdk-events): remove devDependencies to old `@opentelemetry/[email protected]`, `@opentelemetry/[email protected]` packages [#5013](https://github.com/open-telemetry/opentelemetry-js/pull/5013) @pichlermarc
2338
* fix(sdk-logs): remove devDependencies to old `@opentelemetry/[email protected]` [#5013](https://github.com/open-telemetry/opentelemetry-js/pull/5013) @pichlermarc
2439
* fix(sdk-logs): align LogRecord#setAttribute type with types from `@opentelemetry/[email protected]` [#5013](https://github.com/open-telemetry/opentelemetry-js/pull/5013) @pichlermarc
25-
* feat(exporter-*-otlp-*)!: rewrite exporter config logic for testability [#4971](https://github.com/open-telemetry/opentelemetry-js/pull/4971) @pichlermarc
26-
* (user-facing) `getDefaultUrl` was intended for internal use has been removed from all exporters
27-
* (user-facing) `getUrlFromConfig` was intended for internal use and has been removed from all exporters
28-
* (user-facing) `hostname` was intended for internal use and has been removed from all exporters
29-
* (user-facing) `url` was intended for internal use and has been removed from all exporters
30-
* (user-facing) `timeoutMillis` was intended for internal use and has been removed from all exporters
31-
* (user-facing) `onInit` was intended for internal use and has been removed from all exporters
3240
* fix(exporter-*-otlp-*): fixes a bug where signal-specific environment variables would not be applied and the trace-specific one was used instead [#4971](https://github.com/open-telemetry/opentelemetry-js/pull/4971) @pichlermarc
3341
* Fixes:
3442
* `OTEL_EXPORTER_OTLP_METRICS_COMPRESSION`
@@ -39,13 +47,6 @@ All notable changes to experimental packages in this project will be documented
3947
* `OTEL_EXPORTER_OTLP_LOGS_CLIENT_KEY`
4048
* `OTEL_EXPORTER_OTLP_METRICS_INSECURE`
4149
* `OTEL_EXPORTER_OTLP_LOGS_INSECURE`
42-
* feat(otlp-exporter-base)!: do not export functions that are intended for internal use [#4971](https://github.com/open-telemetry/opentelemetry-js/pull/4971) @pichlermarc
43-
* Drops the following functions and types that were intended for internal use from the package exports:
44-
* `parseHeaders`
45-
* `appendResourcePathToUrl`
46-
* `appendResourcePathToUrlIfNeeded`
47-
* `configureExporterTimeout`
48-
* `invalidTimeout`
4950
* fix(sdk-node): use warn instead of error on unknown OTEL_NODE_RESOURCE_DETECTORS values [#5034](https://github.com/open-telemetry/opentelemetry-js/pull/5034)
5051
* fix(exporter-logs-otlp-proto): Use correct config type in Node constructor
5152

experimental/packages/otlp-grpc-exporter-base/test/configuration/otlp-grpc-configuration.test.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
createSslCredentials,
2727
} from '../../src/grpc-exporter-transport';
2828
import * as fs from 'fs';
29+
import { VERSION } from '../../src/version';
2930

3031
describe('mergeOtlpGrpcConfigurationWithDefaults', function () {
3132
describe('metadata', function () {
@@ -56,7 +57,7 @@ describe('mergeOtlpGrpcConfigurationWithDefaults', function () {
5657
foo: 'foo-user', // does not use fallback if the user has set something
5758
bar: 'bar-fallback', // uses fallback if there is no value set
5859
baz: 'baz-user', // does not drop user-set metadata if there is no fallback for it
59-
'user-agent': 'OTel-OTLP-Exporter-JavaScript/0.53.0',
60+
'user-agent': 'OTel-OTLP-Exporter-JavaScript/' + VERSION,
6061
});
6162
});
6263

@@ -81,7 +82,7 @@ describe('mergeOtlpGrpcConfigurationWithDefaults', function () {
8182
);
8283

8384
assert.deepStrictEqual(config.metadata().getMap(), {
84-
'user-agent': 'OTel-OTLP-Exporter-JavaScript/0.53.0',
85+
'user-agent': 'OTel-OTLP-Exporter-JavaScript/' + VERSION,
8586
});
8687
});
8788

@@ -94,7 +95,7 @@ describe('mergeOtlpGrpcConfigurationWithDefaults', function () {
9495
);
9596

9697
assert.deepStrictEqual(config.metadata().getMap(), {
97-
'user-agent': 'OTel-OTLP-Exporter-JavaScript/0.53.0',
98+
'user-agent': 'OTel-OTLP-Exporter-JavaScript/' + VERSION,
9899
});
99100
});
100101
});

0 commit comments

Comments
 (0)