Skip to content

Commit

Permalink
Renaming OTEL_RESOURCE_LABELS env var (#1042)
Browse files Browse the repository at this point in the history
* Renaming OTEL_RESOURCE_LABELS env var

As per the specification here open-telemetry/opentelemetry-specification#758

* update changelog
  • Loading branch information
alrex authored Aug 7, 2020
1 parent 799c178 commit f88f5e4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- The `go.opentelemetry.io/otel/bridge/opentracing` bridge package has been made into its own module.
This removes the package dependencies of this bridge from the rest of the OpenTelemetry based project. (#1038)
- Renamed `go.opentelemetry.io/otel/api/standard` package to `go.opentelemetry.io/otel/semconv` to avoid the ambiguous and generic name `standard` and better describe the package as containing OpenTelemetry semantic conventions. (#1016)
- The environment variable used for resource detection has been changed from `OTEL_RESOURCE_LABELS` to `OTEL_RESOURCE_ATTRIBUTES` (#1042)

### Removed

Expand Down
2 changes: 1 addition & 1 deletion sdk/resource/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// the Detect function to generate a Resource from the merged information.
//
// To load a user defined Resource from the environment variable
// OTEL_RESOURCE_LABELS the FromEnv Detector can be used. It will interpret
// OTEL_RESOURCE_ATTRIBUTES the FromEnv Detector can be used. It will interpret
// the value as a list of comma delimited key/value pairs
// (e.g. `<key1>=<value1>,<key2>=<value2>,...`).
package resource
2 changes: 1 addition & 1 deletion sdk/resource/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
)

// envVar is the environment variable name OpenTelemetry Resource information can be assigned to.
const envVar = "OTEL_RESOURCE_LABELS"
const envVar = "OTEL_RESOURCE_ATTRIBUTES"

var (
//errMissingValue is returned when a resource value is missing.
Expand Down

0 comments on commit f88f5e4

Please sign in to comment.