Skip to content

Commit

Permalink
Merge branch 'main' into refactor/context-zone-peer-dep
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc authored Jun 13, 2024
2 parents 17c3610 + 4885468 commit ba80b87
Show file tree
Hide file tree
Showing 4 changed files with 69 additions and 8 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ For experimental package changes, see the [experimental CHANGELOG](experimental/
### :house: (Internal)

* refactor(context-zone-peer-dep): use explicit exports [#4785](https://github.com/open-telemetry/opentelemetry-js/pull/4787) @pichlermarc
* refactor(context-async-hooks): use explicit exports [#4785](https://github.com/open-telemetry/opentelemetry-js/pull/4786) @pichlermarc

## 1.25.0

Expand Down
1 change: 1 addition & 0 deletions experimental/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ All notable changes to experimental packages in this project will be documented
### :rocket: (Enhancement)

* refactor(instrumentation-fetch): move fetch to use SEMATRR [#4632](https://github.com/open-telemetry/opentelemetry-js/pull/4632)
* refactor(otlp-transformer): use explicit exports [#4785](https://github.com/open-telemetry/opentelemetry-js/pull/4785) @pichlermarc

### :bug: (Bug Fix)

Expand Down
71 changes: 65 additions & 6 deletions experimental/packages/otlp-transformer/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,71 @@
* limitations under the License.
*/

export * from './common/types';
export * from './common';
export * from './metrics/types';
export * from './resource/types';
export * from './trace/types';
export * from './logs/types';
export {
OtlpEncodingOptions,
IKeyValueList,
IKeyValue,
IInstrumentationScope,
IArrayValue,
LongBits,
IAnyValue,
Fixed64,
} from './common/types';
export {
SpanContextEncodeFunction,
toLongBits,
OptionalSpanContextEncodeFunction,
getOtlpEncoder,
Encoder,
HrTimeEncodeFunction,
encodeAsLongBits,
encodeAsString,
hrTimeToNanos,
} from './common';
export {
IExportMetricsPartialSuccess,
IValueAtQuantile,
ISummaryDataPoint,
ISummary,
ISum,
IScopeMetrics,
IResourceMetrics,
INumberDataPoint,
IHistogramDataPoint,
IHistogram,
IExponentialHistogramDataPoint,
IExponentialHistogram,
IMetric,
IGauge,
IExemplar,
EAggregationTemporality,
IExportMetricsServiceRequest,
IExportMetricsServiceResponse,
IBuckets,
} from './metrics/types';
export { IResource } from './resource/types';
export {
IExportTracePartialSuccess,
IStatus,
EStatusCode,
ILink,
IEvent,
IScopeSpans,
ISpan,
IResourceSpans,
ESpanKind,
IExportTraceServiceResponse,
IExportTraceServiceRequest,
} from './trace/types';
export {
IExportLogsServiceResponse,
IScopeLogs,
IExportLogsServiceRequest,
IResourceLogs,
ILogRecord,
IExportLogsPartialSuccess,
ESeverityNumber,
} from './logs/types';

export { createExportTraceServiceRequest } from './trace';
export { createExportMetricsServiceRequest } from './metrics';
Expand Down
4 changes: 2 additions & 2 deletions packages/opentelemetry-context-async-hooks/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
* limitations under the License.
*/

export * from './AsyncHooksContextManager';
export * from './AsyncLocalStorageContextManager';
export { AsyncHooksContextManager } from './AsyncHooksContextManager';
export { AsyncLocalStorageContextManager } from './AsyncLocalStorageContextManager';

0 comments on commit ba80b87

Please sign in to comment.