diff --git a/RELEASING.md b/RELEASING.md index a533cfa9ad..fd33577ce5 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -87,7 +87,7 @@ Finally, update the [website docs][] to refer to the newly released version. The following credentials are required for publishing (and automatically set in Github Actions): -* `GPG_PRIVATE_KEY` and `GPG_PASSWORD`: GPG private key and password for signing. +* `GPG_PRIVATE_KEY` and `GPG_PASSWORD`: GPG private key and password for signing. * `SONATYPE_USER` and `SONATYPE_KEY`: Sonatype username and password. * Each maintainer will have their own set of Sonotype credentials with permission to publish to the `io.opentelemetry` group prefix. @@ -99,7 +99,7 @@ The following credentials are required for publishing (and automatically set in User Token. Additionally, credentials are stored with maintainers via -the [OpenTelemetry 1Password](https://opentelemetry.1password.com/signin) account. The following +the [OpenTelemetry 1Password](https://opentelemetry.1password.com/signin) account. The following defines the mapping from Github Action secret keys to 1Password keys: | Github Actions Key | 1Password Key | diff --git a/sdk-extensions/metric-incubator/README.md b/sdk-extensions/metric-incubator/README.md index 36d750ae79..5a83aa503c 100644 --- a/sdk-extensions/metric-incubator/README.md +++ b/sdk-extensions/metric-incubator/README.md @@ -32,20 +32,17 @@ The equivalent view configuration would be: SdkMeterProvider.builder() .registerView( InstrumentSelector.builder() - .setInstrumentName("my-instrument") - .setInstrumentType(InstrumentType.COUNTER) - .setMeterSelector( - MeterSelector.builder() - .setName("my-meter") - .setVersion("1.0.0") - .setSchemaUrl("http://example.com") - .build()) + .setName("my-instrument") + .setType(InstrumentType.COUNTER) + .setMeterName("my-meter") + .setMeterVersion("1.0.0") + .setMeterSchemaUrl("http://example.com") .build(), View.builder() .setName("new-instrument") .setDescription("new-description") .setAggregation(Aggregation.histogram()) - .filterAttributes(key -> new HashSet<>(Arrays.asList("foo", "bar")).contains(key)) + .setAttributesFilter(key -> new HashSet<>(Arrays.asList("foo", "bar")).contains(key)) .build()); ``` @@ -76,8 +73,8 @@ Notes on usage: will result in the default from `InstrumentSelector` being used. - At least one view field is required, but including all is not required. Any omitted fields will result in the default from `View` being used. -- Advanced selection criteria, like regular expressions, is not yet supported. +- Instrument name selection supports the following wildcard characters: `*` matches 0 or more instances of any character; `?` matches exactly one instance of any character. No other advanced selection criteria is supported. -[javadoc-image]: https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-metric-incubator +[javadoc-image]: https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-sdk-extension-metric-incubator.svg [javadoc-url]: https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-sdk-extension-metric-incubator diff --git a/sdk-extensions/metric-incubator/src/main/java/io/opentelemetry/sdk/viewconfig/ViewConfig.java b/sdk-extensions/metric-incubator/src/main/java/io/opentelemetry/sdk/viewconfig/ViewConfig.java index a42fcf8cba..082f5ba950 100644 --- a/sdk-extensions/metric-incubator/src/main/java/io/opentelemetry/sdk/viewconfig/ViewConfig.java +++ b/sdk-extensions/metric-incubator/src/main/java/io/opentelemetry/sdk/viewconfig/ViewConfig.java @@ -54,20 +54,17 @@ import org.yaml.snakeyaml.Yaml; * SdkMeterProvider.builder() * .registerView( * InstrumentSelector.builder() - * .setInstrumentName("my-instrument") - * .setInstrumentType(InstrumentType.COUNTER) - * .setMeterSelector( - * MeterSelector.builder() - * .setName("my-meter") - * .setVersion("1.0.0") - * .setSchemaUrl("http://example.com") - * .build()) + * .setName("my-instrument") + * .setType(InstrumentType.COUNTER) + * .setMeterName("my-meter") + * .setMeterVersion("1.0.0") + * .setMeterSchemaUrl("http://example.com") * .build(), * View.builder() * .setName("new-instrument") * .setDescription("new-description") * .setAggregation(Aggregation.histogram()) - * .filterAttributes(key -> new HashSet<>(Arrays.asList("foo", "bar")).contains(key)) + * .setAttributesFilter(key -> new HashSet<>(Arrays.asList("foo", "bar")).contains(key)) * .build()); * } */