Merge branch 'main' into bucket-bounds

bridge/opencensus/metric.go

@@ -40,7 +40,7 @@ type exporter struct {
 // NewMetricExporter returns an OpenCensus exporter that exports to an
 // OpenTelemetry exporter.
 func NewMetricExporter(base metric.Exporter, res *resource.Resource) metricexport.Exporter {
-	return &exporter{base: base}
+	return &exporter{base: base, res: res}
 }
 
 // ExportMetrics implements the OpenCensus metric Exporter interface by sending

sdk/metric/provider.go

@@ -19,16 +19,13 @@ import (
 
 	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/sdk/instrumentation"
-	"go.opentelemetry.io/otel/sdk/resource"
 )
 
 // MeterProvider handles the creation and coordination of Meters. All Meters
 // created by a MeterProvider will be associated with the same Resource, have
 // the same Views applied to them, and have their produced metric telemetry
 // passed to the configured Readers.
 type MeterProvider struct {
-	res *resource.Resource
-
 	meters meterRegistry
 
 	forceFlush, shutdown func(context.Context) error
@@ -51,8 +48,6 @@ func NewMeterProvider(options ...Option) *MeterProvider {
 	registry := newPipelines(conf.res, conf.readers)
 
 	return &MeterProvider{
-		res: conf.res,
-
 		meters: meterRegistry{
 			pipes: registry,
 		},

website_docs/exporting_data.md

@@ -64,7 +64,7 @@ resources := resource.New(context.Background(),
 
 ## OTLP Exporter
 
-OpenTelemetry Protocol (OTLP) export is available in the `go.opentelemetry.io/otel/exporters/otlp/otlptrace` and `go.opentelemetry.io/otel/exporters/otlp/otlpmetrics` packages.
+OpenTelemetry Protocol (OTLP) export is available in the `go.opentelemetry.io/otel/exporters/otlp/otlptrace` and `go.opentelemetry.io/otel/exporters/otlp/otlpmetric` packages.
 
 Please find more documentation on [GitHub](https://github.com/open-telemetry/opentelemetry-go/tree/main/exporters/otlp)