Skip to content

Commit

Permalink
Merge branch 'master' into fix-setting-content-type
Browse files Browse the repository at this point in the history
  • Loading branch information
SimenB committed Apr 16, 2024
2 parents 378366e + 8921952 commit 2e1bff6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ project adheres to [Semantic Versioning](http://semver.org/).

### Changed

- Add `Registry.PROMETHEUS_CONTENT_TYPE` and `Registry.OPENMETRICS_CONTENT_TYPE` constants to the TypeScript types
- Correctly read and set `contentType` top level export

### Added
Expand Down
10 changes: 10 additions & 0 deletions index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,16 @@ export class Registry<RegistryContentType = PrometheusContentType> {
* @param registers The registers you want to merge together
*/
static merge(registers: Registry[]): Registry;

/**
* HTTP Prometheus Content-Type for metrics response headers.
*/
static PROMETHEUS_CONTENT_TYPE: PrometheusContentType;

/**
* HTTP OpenMetrics Content-Type for metrics response headers.
*/
static OPENMETRICS_CONTENT_TYPE: OpenMetricsContentType;
}
export type Collector = () => void;

Expand Down

0 comments on commit 2e1bff6

Please sign in to comment.