cmdutil: Add OTEL contrib runtime instrumentation (#213)

ypaq · web-flow · commit 9d4439fbbf9e · 2024-06-10T13:01:21.000-07:00
## Rationale We want the option to collect Golang runtime metrics out of the box with `heroku/x/cmdutil`. Here we introduce a new environment variable `OTEL_ENABLE_RUNTIME_METRICS` that when set to `true` will start the collection of runtime metrics and their reporting through the OTEL pipeline. ## Changes * Add dependency `go.opentelemetry.io/contrib/instrumentation/runtime@v0.45.0` * Add config `OTEL_ENABLE_RUNTIME_METRICS`, defaulting to `false` * Add option function to enable runtime metrics collection * Update semconv version to `go.opentelemetry.io/otel/semconv/v1.25.0` ## Meta [W-15906716](https://gus.lightning.force.com/a07EE00001sy18ZYAQ)
diff --git a/cmdutil/metrics/otel/config.go b/cmdutil/metrics/otel/config.go
@@ -9,10 +9,11 @@ import (
 // Config is a reusable configuration struct that contains the necessary
 // environment variables to setup an metrics.Provider
 type Config struct {
-	Enabled             bool     `env:"ENABLE_OTEL_COLLECTION"`
-	CollectorURL        *url.URL `env:"OTEL_COLLECTOR_URL"`
-	MetricsDestinations []string `env:"OTEL_METRICS_DESTINATIONS,default=honeycomb;argus"`
-	Honeycomb           honeycomb.Config
+	Enabled              bool     `env:"ENABLE_OTEL_COLLECTION"`
+	EnableRuntimeMetrics bool     `env:"OTEL_ENABLE_RUNTIME_METRICS,default=false"`
+	CollectorURL         *url.URL `env:"OTEL_COLLECTOR_URL"`
+	MetricsDestinations  []string `env:"OTEL_METRICS_DESTINATIONS,default=honeycomb;argus"`
+	Honeycomb            honeycomb.Config
 
 	// EndpointURL maps to the official opentelemetry environment variable for configuring the endpoint
 	EndpointURL *url.URL `env:"OTEL_EXPORTER_OTLP_ENDPOINT"`
diff --git a/cmdutil/metrics/otel/otel.go b/cmdutil/metrics/otel/otel.go
@@ -53,6 +53,9 @@ func MustProvider(ctx context.Context, logger logrus.FieldLogger, cfg Config, se
 
 		// ensure we use the http exporter
 		otel.WithHTTPEndpointExporter(endpoint.String()),
+
+		// optionally enable Golang runtime metrics collection
+		otel.WithRuntimeInstrumentation(cfg.EnableRuntimeMetrics),
 	}
 	allOpts = append(allOpts, opts...)
 
@@ -61,5 +64,9 @@ func MustProvider(ctx context.Context, logger logrus.FieldLogger, cfg Config, se
 		logger.Fatal(err)
 	}
 
+	if err := otelProvider.(*otel.Provider).Start(); err != nil {
+		logger.Fatal(err)
+	}
+
 	return otelProvider
 }
diff --git a/go-kit/metrics/provider/otel/options.go b/go-kit/metrics/provider/otel/options.go
@@ -52,6 +52,19 @@ func WithCollectPeriod(collectPeriod time.Duration) Option {
 	}
 }
 
+// DefaultTemporalitySelector uses delta temporality for all instrument kinds, except
+// UpDown counters it uses cumulative temporality.
+func DefaultTemporalitySelector(ik metric.InstrumentKind) metricdata.Temporality {
+	switch ik {
+	case
+		metric.InstrumentKindUpDownCounter,
+		metric.InstrumentKindObservableUpDownCounter:
+		return metricdata.CumulativeTemporality
+	default:
+		return metricdata.DeltaTemporality
+	}
+}
+
 func CumulativeTemporalitySelector(_ metric.InstrumentKind) metricdata.Temporality {
 	return metricdata.CumulativeTemporality
 }
@@ -60,6 +73,10 @@ func DeltaTemporalitySelector(_ metric.InstrumentKind) metricdata.Temporality {
 	return metricdata.DeltaTemporality
 }
 
+func WithDefaultTemporality() Option {
+	return WithTemporalitySelector(DefaultTemporalitySelector)
+}
+
 func WithCumulativeTemporality() Option {
 	return WithTemporalitySelector(CumulativeTemporalitySelector)
 }
@@ -177,3 +194,10 @@ func WithExporterFunc(fn exporterFactory) Option {
 		return nil
 	}
 }
+
+func WithRuntimeInstrumentation(b bool) Option {
+	return func(c *config) error {
+		c.enableRuntimeMetrics = b
+		return nil
+	}
+}
diff --git a/go-kit/metrics/provider/otel/provider.go b/go-kit/metrics/provider/otel/provider.go
@@ -6,6 +6,7 @@ import (
 	"sync"
 	"time"
 
+	"go.opentelemetry.io/contrib/instrumentation/runtime"
 	"go.opentelemetry.io/otel/sdk/metric"
 	"go.opentelemetry.io/otel/sdk/resource"
 
@@ -20,13 +21,14 @@ const (
 var DefaultReaderInterval = time.Minute
 
 type config struct {
-	ctx                 context.Context // used for init and shutdown of the otlp exporter and other bits of this Provider
-	serviceResource     *resource.Resource
-	prefix              string
-	collectPeriod       time.Duration
-	temporalitySelector metric.TemporalitySelector
-	aggregationSelector metric.AggregationSelector
-	exporterFactory     exporterFactory
+	ctx                  context.Context // used for init and shutdown of the otlp exporter and other bits of this Provider
+	serviceResource      *resource.Resource
+	prefix               string
+	collectPeriod        time.Duration
+	temporalitySelector  metric.TemporalitySelector
+	aggregationSelector  metric.AggregationSelector
+	exporterFactory      exporterFactory
+	enableRuntimeMetrics bool
 }
 
 // Provider initializes a global otlp meter provider that can collect metrics and
@@ -128,7 +130,14 @@ func New(ctx context.Context, serviceName string, opts ...Option) (xmetrics.Prov
 
 // Start starts the provider's controller and exporter.
 func (p *Provider) Start() error {
-	return nil
+	var err error
+	if p.cfg.enableRuntimeMetrics {
+		err = runtime.Start(
+			runtime.WithMeterProvider(p.meterProvider),
+			runtime.WithMinimumReadMemStatsInterval(p.cfg.collectPeriod),
+		)
+	}
+	return err
 }
 
 // Stop shuts down the provider's controller and exporter.
diff --git a/go-kit/metrics/provider/otel/resource.go b/go-kit/metrics/provider/otel/resource.go
@@ -6,7 +6,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/sdk/resource"
 
-	semconv "go.opentelemetry.io/otel/semconv/v1.21.0"
+	semconv "go.opentelemetry.io/otel/semconv/v1.25.0"
 )
 
 // Service level resource attributes
diff --git a/go.mod b/go.mod
@@ -40,15 +40,14 @@ require (
 	github.com/unrolled/secure v1.0.1
 	github.com/urfave/cli v1.21.0
 	go.opencensus.io v0.22.1
-	go.opentelemetry.io/otel v1.19.0
+	go.opentelemetry.io/otel v1.27.0
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0
-	go.opentelemetry.io/otel/metric v1.19.0
-	go.opentelemetry.io/otel/sdk v1.19.0
+	go.opentelemetry.io/otel/metric v1.27.0
 	golang.org/x/crypto v0.21.0
 	golang.org/x/sync v0.3.0
-	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/sys v0.20.0 // indirect
 	golang.org/x/time v0.0.0-20181108054448-85acf8d2951c
 	google.golang.org/grpc v1.59.0
 	google.golang.org/grpc/examples v0.0.0-20210916203835-567da6b86340
@@ -58,19 +57,21 @@ require (
 )
 
 require (
-	go.opentelemetry.io/otel/sdk/metric v1.19.0
+	go.opentelemetry.io/contrib/instrumentation/runtime v0.45.0
+	go.opentelemetry.io/otel/sdk v1.27.0
+	go.opentelemetry.io/otel/sdk/metric v1.27.0
 	golang.org/x/text v0.14.0
 )
 
 require (
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect
 	github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
-	go.opentelemetry.io/otel/trace v1.19.0 // indirect
+	go.opentelemetry.io/otel/trace v1.27.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/oauth2 v0.12.0 // indirect
diff --git a/go.sum b/go.sum
@@ -55,8 +55,8 @@ github.com/go-kit/kit v0.9.0 h1:wDJmvq38kDhkVxi50ni9ykkdUr1PKgqKOoi01fa0Mdk=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
@@ -101,8 +101,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gops v0.3.22 h1:lyvhDxfPLHAOR2xIYwjPhN387qHxyU21Sk9sz/GhmhQ=
 github.com/google/gops v0.3.22/go.mod h1:7diIdLsqpCihPSX3fQagksT/Ku/y4RL9LHTlKyEUDl8=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
@@ -191,8 +191,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
 github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
 github.com/unrolled/secure v1.0.1 h1:PZ79/VmnyIrDWRAUp9lWSwmckdf8H0v9djiqZxAb8Tc=
@@ -207,22 +207,24 @@ go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50=
 go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA=
-go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
-go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
+go.opentelemetry.io/contrib/instrumentation/runtime v0.45.0 h1:2JydY5UiDpqvj2p7sO9bgHuhTy4hgTZ0ymehdq/Ob0Q=
+go.opentelemetry.io/contrib/instrumentation/runtime v0.45.0/go.mod h1:ch3a5QxOqVWxas4CzjCFFOOQe+7HgAXC/N1oVxS9DK4=
+go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg=
+go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0 h1:ZtfnDL+tUrs1F0Pzfwbg2d59Gru9NCH3bgSHBM6LDwU=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0/go.mod h1:hG4Fj/y8TR/tlEDREo8tWstl9fO9gcFkn4xrx0Io8xU=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0 h1:NmnYCiR0qNufkldjVvyQfZTHSdzeHoZ41zggMsdMcLM=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0/go.mod h1:UVAO61+umUsHLtYb8KXXRoHtxUkdOPkYidzW3gipRLQ=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0 h1:wNMDy/LVGLj2h3p6zg4d0gypKfWKSWI14E1C4smOgl8=
 go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0/go.mod h1:YfbDdXAAkemWJK3H/DshvlrxqFB2rtW4rY6ky/3x/H0=
-go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
-go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
-go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
-go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
-go.opentelemetry.io/otel/sdk/metric v1.19.0 h1:EJoTO5qysMsYCa+w4UghwFV/ptQgqSL/8Ni+hx+8i1k=
-go.opentelemetry.io/otel/sdk/metric v1.19.0/go.mod h1:XjG0jQyFJrv2PbMvwND7LwCEhsJzCzV5210euduKcKY=
-go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
-go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
+go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik=
+go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak=
+go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI=
+go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A=
+go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI=
+go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw=
+go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw=
+go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4=
 go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
 go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
@@ -290,8 +292,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,9 @@ func MustProvider(ctx context.Context, logger logrus.FieldLogger, cfg Config, se`
`53`	`53`
`54`	`54`	`// ensure we use the http exporter`
`55`	`55`	`otel.WithHTTPEndpointExporter(endpoint.String()),`
	`56`	`+`
	`57`	`+ // optionally enable Golang runtime metrics collection`
	`58`	`+ otel.WithRuntimeInstrumentation(cfg.EnableRuntimeMetrics),`
`56`	`59`	`}`
`57`	`60`	`allOpts = append(allOpts, opts...)`
`58`	`61`
`@@ -61,5 +64,9 @@ func MustProvider(ctx context.Context, logger logrus.FieldLogger, cfg Config, se`
`61`	`64`	`logger.Fatal(err)`
`62`	`65`	`}`
`63`	`66`
	`67`	`+ if err := otelProvider.(*otel.Provider).Start(); err != nil {`
	`68`	`+ logger.Fatal(err)`
	`69`	`+ }`
	`70`	`+`
`64`	`71`	`return otelProvider`
`65`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,19 @@ func WithCollectPeriod(collectPeriod time.Duration) Option {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
	`55`	`+// DefaultTemporalitySelector uses delta temporality for all instrument kinds, except`
	`56`	`+// UpDown counters it uses cumulative temporality.`
	`57`	`+func DefaultTemporalitySelector(ik metric.InstrumentKind) metricdata.Temporality {`
	`58`	`+ switch ik {`
	`59`	`+ case`
	`60`	`+ metric.InstrumentKindUpDownCounter,`
	`61`	`+ metric.InstrumentKindObservableUpDownCounter:`
	`62`	`+ return metricdata.CumulativeTemporality`
	`63`	`+ default:`
	`64`	`+ return metricdata.DeltaTemporality`
	`65`	`+ }`
	`66`	`+}`
	`67`	`+`
`55`	`68`	`func CumulativeTemporalitySelector(_ metric.InstrumentKind) metricdata.Temporality {`
`56`	`69`	`return metricdata.CumulativeTemporality`
`57`	`70`	`}`
`@@ -60,6 +73,10 @@ func DeltaTemporalitySelector(_ metric.InstrumentKind) metricdata.Temporality {`
`60`	`73`	`return metricdata.DeltaTemporality`
`61`	`74`	`}`
`62`	`75`
	`76`	`+func WithDefaultTemporality() Option {`
	`77`	`+ return WithTemporalitySelector(DefaultTemporalitySelector)`
	`78`	`+}`
	`79`	`+`
`63`	`80`	`func WithCumulativeTemporality() Option {`
`64`	`81`	`return WithTemporalitySelector(CumulativeTemporalitySelector)`
`65`	`82`	`}`
`@@ -177,3 +194,10 @@ func WithExporterFunc(fn exporterFactory) Option {`
`177`	`194`	`return nil`
`178`	`195`	`}`
`179`	`196`	`}`
	`197`	`+`
	`198`	`+func WithRuntimeInstrumentation(b bool) Option {`
	`199`	`+ return func(c *config) error {`
	`200`	`+ c.enableRuntimeMetrics = b`
	`201`	`+ return nil`
	`202`	`+ }`
	`203`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"go.opentelemetry.io/otel/attribute"`
`7`	`7`	`"go.opentelemetry.io/otel/sdk/resource"`
`8`	`8`
`9`		`- semconv "go.opentelemetry.io/otel/semconv/v1.21.0"`
	`9`	`+ semconv "go.opentelemetry.io/otel/semconv/v1.25.0"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// Service level resource attributes`