Merge branch 'main' into rm-any-attr

CHANGELOG.md

@@ -17,6 +17,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ### Changed
 
 - Metric SDK/API implementation type `InstrumentKind` moves into `sdkapi` sub-package. (#2091)
+- The Metrics SDK export record no longer contains a Resource pointer, the SDK `"go.opentelemetry.io/otel/sdk/trace/export/metric".Exporter.Export()` function for push-based exporters now takes a single Resource argument, pull-based exporters use `"go.opentelemetry.io/otel/sdk/metric/controller/basic".Controller.Resource()`. (#2120)
 
 ### Deprecated
 
@@ -37,6 +38,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - The `fromEnv` detector no longer throws an error when `OTEL_RESOURCE_ATTRIBUTES` environment variable is not set or empty. (#2138)
 - Setting the global `ErrorHandler` with `"go.opentelemetry.io/otel".SetErrorHandler` multiple times is now supported. (#2160, #2140)
 - The `"go.opentelemetry.io/otel/attribute".Any` function now supports `int32` values. (#2169)
+- Multiple calls to `"go.opentelemetry.io/otel/sdk/metric/controller/basic".WithResource()` are handled correctly, and when no resources are provided `"go.opentelemetry.io/otel/sdk/resource".Default()` is used. (#2120)
 
 ### Security
 

bridge/opencensus/exporter.go

@@ -51,7 +51,11 @@ type exporter struct {
 
 // ExportMetrics implements the OpenCensus metric Exporter interface
 func (e *exporter) ExportMetrics(ctx context.Context, metrics []*metricdata.Metric) error {
-	return e.base.Export(ctx, &checkpointSet{metrics: metrics})
+	res := resource.Empty()
+	if len(metrics) != 0 {
+		res = convertResource(metrics[0].Resource)
+	}
+	return e.base.Export(ctx, res, &checkpointSet{metrics: metrics})
 }
 
 type checkpointSet struct {
@@ -69,7 +73,6 @@ func (d *checkpointSet) ForEach(exporter export.ExportKindSelector, f func(expor
 			otel.Handle(err)
 			continue
 		}
-		res := convertResource(m.Resource)
 		for _, ts := range m.TimeSeries {
 			if len(ts.Points) == 0 {
 				continue
@@ -87,7 +90,6 @@ func (d *checkpointSet) ForEach(exporter export.ExportKindSelector, f func(expor
 			if err := f(export.NewRecord(
 				&descriptor,
 				&ls,
-				res,
 				agg,
 				ts.StartTime,
 				agg.end(),
@@ -119,6 +121,7 @@ func convertLabels(keys []metricdata.LabelKey, values []metricdata.LabelValue) (
 }
 
 // convertResource converts an OpenCensus Resource to an OpenTelemetry Resource
+// Note: the ocresource.Resource Type field is not used.
 func convertResource(res *ocresource.Resource) *resource.Resource {
 	labels := []attribute.KeyValue{}
 	if res == nil {

bridge/opencensus/exporter_test.go

@@ -39,12 +39,14 @@ import (
 
 type fakeExporter struct {
 	export.Exporter
-	records []export.Record
-	err     error
+	records  []export.Record
+	resource *resource.Resource
+	err      error
 }
 
-func (f *fakeExporter) Export(ctx context.Context, cps exportmetric.CheckpointSet) error {
+func (f *fakeExporter) Export(ctx context.Context, res *resource.Resource, cps exportmetric.CheckpointSet) error {
 	return cps.ForEach(f, func(record exportmetric.Record) error {
+		f.resource = res
 		f.records = append(f.records, record)
 		return f.err
 	})
@@ -82,6 +84,7 @@ func TestExportMetrics(t *testing.T) {
 		input                []*metricdata.Metric
 		exportErr            error
 		expected             []export.Record
+		expectedResource     *resource.Resource
 		expectedHandledError error
 	}{
 		{
@@ -142,6 +145,12 @@ func TestExportMetrics(t *testing.T) {
 			desc: "success",
 			input: []*metricdata.Metric{
 				{
+					Resource: &ocresource.Resource{
+						Labels: map[string]string{
+							"R1": "V1",
+							"R2": "V2",
+						},
+					},
 					TimeSeries: []*metricdata.TimeSeries{
 						{
 							StartTime: now,
@@ -152,11 +161,14 @@ func TestExportMetrics(t *testing.T) {
 					},
 				},
 			},
+			expectedResource: resource.NewSchemaless(
+				attribute.String("R1", "V1"),
+				attribute.String("R2", "V2"),
+			),
 			expected: []export.Record{
 				export.NewRecord(
 					&basicDesc,
 					attribute.EmptySet(),
-					resource.NewSchemaless(),
 					&ocExactAggregator{
 						points: []aggregation.Point{
 							{
@@ -188,7 +200,6 @@ func TestExportMetrics(t *testing.T) {
 				export.NewRecord(
 					&basicDesc,
 					attribute.EmptySet(),
-					resource.NewSchemaless(),
 					&ocExactAggregator{
 						points: []aggregation.Point{
 							{
@@ -223,7 +234,6 @@ func TestExportMetrics(t *testing.T) {
 				export.NewRecord(
 					&basicDesc,
 					attribute.EmptySet(),
-					resource.NewSchemaless(),
 					&ocExactAggregator{
 						points: []aggregation.Point{
 							{
@@ -255,16 +265,16 @@ func TestExportMetrics(t *testing.T) {
 			if len(tc.expected) != len(output) {
 				t.Fatalf("ExportMetrics(%+v) = %d records, want %d records", tc.input, len(output), len(tc.expected))
 			}
+			if fakeExporter.resource.String() != tc.expectedResource.String() {
+				t.Errorf("ExportMetrics(%+v)[i].Resource() = %+v, want %+v", tc.input, fakeExporter.resource.String(), tc.expectedResource.String())
+			}
 			for i, expected := range tc.expected {
 				if output[i].StartTime() != expected.StartTime() {
 					t.Errorf("ExportMetrics(%+v)[i].StartTime() = %+v, want %+v", tc.input, output[i].StartTime(), expected.StartTime())
 				}
 				if output[i].EndTime() != expected.EndTime() {
 					t.Errorf("ExportMetrics(%+v)[i].EndTime() = %+v, want %+v", tc.input, output[i].EndTime(), expected.EndTime())
 				}
-				if output[i].Resource().String() != expected.Resource().String() {
-					t.Errorf("ExportMetrics(%+v)[i].Resource() = %+v, want %+v", tc.input, output[i].Resource().String(), expected.Resource().String())
-				}
 				if output[i].Descriptor().Name() != expected.Descriptor().Name() {
 					t.Errorf("ExportMetrics(%+v)[i].Descriptor() = %+v, want %+v", tc.input, output[i].Descriptor().Name(), expected.Descriptor().Name())
 				}

exporters/otlp/otlpmetric/exporter.go

@@ -23,6 +23,7 @@ import (
 	"go.opentelemetry.io/otel/metric"
 	metricsdk "go.opentelemetry.io/otel/sdk/export/metric"
 	"go.opentelemetry.io/otel/sdk/export/metric/aggregation"
+	"go.opentelemetry.io/otel/sdk/resource"
 )
 
 var (
@@ -42,8 +43,8 @@ type Exporter struct {
 }
 
 // Export exports a batch of metrics.
-func (e *Exporter) Export(ctx context.Context, checkpointSet metricsdk.CheckpointSet) error {
-	rms, err := metrictransform.CheckpointSet(ctx, e, checkpointSet, 1)
+func (e *Exporter) Export(ctx context.Context, res *resource.Resource, checkpointSet metricsdk.CheckpointSet) error {
+	rms, err := metrictransform.CheckpointSet(ctx, e, res, checkpointSet, 1)
 	if err != nil {
 		return err
 	}