Fix typos

.golangci.yml

@@ -64,12 +64,12 @@ issues:
     - path: _test\.go
       linters:
         - gosec
-    # Igonoring gosec G404: Use of weak random number generator (math/rand instead of crypto/rand)
+    # Ignoring gosec G404: Use of weak random number generator (math/rand instead of crypto/rand)
     # as we commonly use it in tests and examples.
     - text: "G404:"
       linters:
         - gosec
-    # Igonoring gosec G402: TLS MinVersion too low
+    # Ignoring gosec G402: TLS MinVersion too low
     # as the https://pkg.go.dev/crypto/tls#Config handles MinVersion default well.
     - text: "G402: TLS MinVersion too low."
       linters:

CHANGELOG.md

@@ -1904,7 +1904,7 @@ with major version 0.
 - Setting error status while recording error with Span from oteltest package. (#1729)
 - The concept of a remote and local Span stored in a context is unified to just the current Span.
   Because of this `"go.opentelemetry.io/otel/trace".RemoteSpanContextFromContext` is removed as it is no longer needed.
-  Instead, `"go.opentelemetry.io/otel/trace".SpanContextFromContex` can be used to return the current Span.
+  Instead, `"go.opentelemetry.io/otel/trace".SpanContextFromContext` can be used to return the current Span.
   If needed, that Span's `SpanContext.IsRemote()` can then be used to determine if it is remote or not. (#1731)
 - The `HasRemoteParent` field of the `"go.opentelemetry.io/otel/sdk/trace".SamplingParameters` is removed.
   This field is redundant to the information returned from the `Remote` method of the `SpanContext` held in the `ParentContext` field. (#1749)
@@ -2478,7 +2478,7 @@ This release migrates the default OpenTelemetry SDK into its own Go module, deco
 - Prometheus exporter will not apply stale updates or forget inactive metrics. (#903)
 - Add test for api.standard `HTTPClientAttributesFromHTTPRequest`. (#905)
 - Bump github.com/golangci/golangci-lint from 1.27.0 to 1.28.1 in /tools. (#901, #913)
-- Update otel-colector example to use the v0.5.0 collector. (#915)
+- Update otel-collector example to use the v0.5.0 collector. (#915)
 - The `grpctrace` instrumentation uses a span name conforming to the OpenTelemetry semantic conventions (does not contain a leading slash (`/`)). (#922)
 - The `grpctrace` instrumentation includes an `rpc.method` attribute now set to the gRPC method name. (#900, #922)
 - The `grpctrace` instrumentation `rpc.service` attribute now contains the package name if one exists.

bridge/opencensus/internal/tracer.go

@@ -37,7 +37,7 @@ func (o *Tracer) StartSpan(ctx context.Context, name string, s ...octrace.StartO
 // StartSpanWithRemoteParent starts a new child span of the span from the
 // given parent.
 func (o *Tracer) StartSpanWithRemoteParent(ctx context.Context, name string, parent octrace.SpanContext, s ...octrace.StartOption) (context.Context, *octrace.Span) {
-	// make sure span context is zero'd out so we use the remote parent
+	// make sure span context is zeroed out so we use the remote parent
 	ctx = trace.ContextWithSpan(ctx, nil)
 	ctx = trace.ContextWithRemoteSpanContext(ctx, oc2otel.SpanContext(parent))
 	return o.StartSpan(ctx, name, s...)

bridge/opencensus/internal/tracer_test.go

@@ -108,7 +108,7 @@ func TestTracerFromContext(t *testing.T) {
 	ctx, _ = tracer.Start(ctx, "test")
 
 	got := internal.NewTracer(tracer).FromContext(ctx).SpanContext()
-	// Do not test the convedsion, only that the propagtion.
+	// Do not test the conversion, only the propagation.
 	want := otel2oc.SpanContext(sc)
 	if got != want {
 		t.Errorf("tracer.FromContext returned wrong context: %#v", got)

bridge/opentracing/bridge_test.go

@@ -396,7 +396,7 @@ func TestBridgeTracer_StartSpan(t *testing.T) {
 			expectWarnings: []string(nil),
 		},
 		{
-			name: "with a non-defered wrapper tracer",
+			name: "with a non-deferred wrapper tracer",
 			before: func(t *testing.T, bridge *BridgeTracer) {
 				wTracer := &nonDeferWrapperTracer{
 					NewWrapperTracer(bridge, otel.Tracer("test")),

example/passthrough/handler/handler.go

@@ -27,7 +27,7 @@ type Handler struct {
 // to next.
 func New(next func(r *http.Request)) *Handler {
 	// Like most instrumentation packages, this handler defaults to using the
-	// global progatators and tracer providers.
+	// global propagators and tracer providers.
 	return &Handler{
 		propagators: otel.GetTextMapPropagator(),
 		tracer:      otel.Tracer("go.opentelemetry.io/otel/example/passthrough/handler"),

exporters/otlp/otlplog/otlploggrpc/config.go

@@ -448,7 +448,7 @@ func convDuration(s string) (time.Duration, error) {
 	return time.Duration(d) * time.Millisecond, nil
 }
 
-// loadEnvTLS returns a resolver that loads a *tls.Config from files defeind by
+// loadEnvTLS returns a resolver that loads a *tls.Config from files defined by
 // the OTLP TLS environment variables. This will load both the rootCAs and
 // certificates used for mTLS.
 //

exporters/otlp/otlplog/otlploggrpc/config_test.go

@@ -191,7 +191,7 @@ func TestNewConfig(t *testing.T) {
 			},
 		},
 		{
-			name: "LogEnpointEnvironmentVariablesDefaultPath",
+			name: "LogEndpointEnvironmentVariablesDefaultPath",
 			envars: map[string]string{
 				"OTEL_EXPORTER_OTLP_LOGS_ENDPOINT": "http://env.endpoint",
 			},
@@ -224,7 +224,7 @@ func TestNewConfig(t *testing.T) {
 			},
 		},
 		{
-			name: "OTLPEnpointEnvironmentVariablesDefaultPath",
+			name: "OTLPEndpointEnvironmentVariablesDefaultPath",
 			envars: map[string]string{
 				"OTEL_EXPORTER_OTLP_ENDPOINT": "http://env.endpoint",
 			},

exporters/otlp/otlplog/otlploggrpc/internal/transform/log.go

@@ -66,7 +66,7 @@ func resourceLogsMap(dst *map[attribute.Distinct]*lpb.ResourceLogs, records []lo
 	}
 }
 
-// ScopeLogs returns a slice of OTLP ScopeLogs generated from recoreds.
+// ScopeLogs returns a slice of OTLP ScopeLogs generated from records.
 func ScopeLogs(records []log.Record) []*lpb.ScopeLogs {
 	scopeMap := scopeLogsMapPool.Get().(map[instrumentation.Scope]*lpb.ScopeLogs)
 	defer func() {

exporters/otlp/otlplog/otlploghttp/client_test.go

@@ -224,7 +224,7 @@ type httpCollector struct {
 // default OTLP log endpoint path ("/v1/logs"). If the endpoint contains a
 // prefix of "https" the server will generate weak self-signed TLS certificates
 // and use them to server data. If the endpoint contains a path, that path will
-// be used instead of the default OTLP metri endpoint path.
+// be used instead of the default OTLP metric endpoint path.
 //
 // If errCh is not nil, the collector will respond to HTTP requests with errors
 // sent on that channel. This means that if errCh is not nil Export calls will

exporters/otlp/otlplog/otlploghttp/config.go

@@ -377,7 +377,7 @@ func (s setting[T]) Resolve(fn ...resolver[T]) setting[T] {
 	return s
 }
 
-// loadEnvTLS returns a resolver that loads a *tls.Config from files defeind by
+// loadEnvTLS returns a resolver that loads a *tls.Config from files defined by
 // the OTLP TLS environment variables. This will load both the rootCAs and
 // certificates used for mTLS.
 //

exporters/otlp/otlplog/otlploghttp/config_test.go

@@ -190,7 +190,7 @@ func TestNewConfig(t *testing.T) {
 			},
 		},
 		{
-			name: "LogEnpointEnvironmentVariablesDefaultPath",
+			name: "LogEndpointEnvironmentVariablesDefaultPath",
 			envars: map[string]string{
 				"OTEL_EXPORTER_OTLP_LOGS_ENDPOINT": "http://env.endpoint",
 			},
@@ -225,7 +225,7 @@ func TestNewConfig(t *testing.T) {
 			},
 		},
 		{
-			name: "OTLPEnpointEnvironmentVariablesDefaultPath",
+			name: "OTLPEndpointEnvironmentVariablesDefaultPath",
 			envars: map[string]string{
 				"OTEL_EXPORTER_OTLP_ENDPOINT": "http://env.endpoint",
 			},

exporters/otlp/otlplog/otlploghttp/doc.go

@@ -22,7 +22,7 @@ target URL to which the exporter sends telemetry.
 The value must contain a scheme ("http" or "https") and host.
 The value may additionally contain a port and a path.
 The value should not contain a query string or fragment.
-The configuration can be overridden by [WithEndpoint], [WithEndpointURL], [WitnInsecure], and [WithURLPath] options.
+The configuration can be overridden by [WithEndpoint], [WithEndpointURL], [WithInsecure], and [WithURLPath] options.
 
 OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_LOGS_HEADERS (default: none) -
 key-value pairs used as headers associated with HTTP requests.

exporters/otlp/otlplog/otlploghttp/internal/transform/log.go

@@ -66,7 +66,7 @@ func resourceLogsMap(dst *map[attribute.Distinct]*lpb.ResourceLogs, records []lo
 	}
 }
 
-// ScopeLogs returns a slice of OTLP ScopeLogs generated from recoreds.
+// ScopeLogs returns a slice of OTLP ScopeLogs generated from records.
 func ScopeLogs(records []log.Record) []*lpb.ScopeLogs {
 	scopeMap := scopeLogsMapPool.Get().(map[instrumentation.Scope]*lpb.ScopeLogs)
 	defer func() {

exporters/otlp/otlpmetric/otlpmetricgrpc/internal/oconf/options.go

@@ -139,7 +139,7 @@ func NewGRPCConfig(opts ...GRPCOption) Config {
 	if cfg.ServiceConfig != "" {
 		cfg.DialOptions = append(cfg.DialOptions, grpc.WithDefaultServiceConfig(cfg.ServiceConfig))
 	}
-	// Priroritize GRPCCredentials over Insecure (passing both is an error).
+	// Prioritize GRPCCredentials over Insecure (passing both is an error).
 	if cfg.Metrics.GRPCCredentials != nil {
 		cfg.DialOptions = append(cfg.DialOptions, grpc.WithTransportCredentials(cfg.Metrics.GRPCCredentials))
 	} else if cfg.Metrics.Insecure {

exporters/otlp/otlpmetric/otlpmetricgrpc/internal/oconf/tls.go

@@ -14,7 +14,7 @@ import (
 )
 
 // ReadTLSConfigFromFile reads a PEM certificate file and creates
-// a tls.Config that will use this certifate to verify a server certificate.
+// a tls.Config that will use this certificate to verify a server certificate.
 func ReadTLSConfigFromFile(path string) (*tls.Config, error) {
 	b, err := os.ReadFile(path)
 	if err != nil {

exporters/otlp/otlpmetric/otlpmetrichttp/doc.go

@@ -22,7 +22,7 @@ target URL to which the exporter sends telemetry.
 The value must contain a scheme ("http" or "https") and host.
 The value may additionally contain a port and a path.
 The value should not contain a query string or fragment.
-The configuration can be overridden by [WithEndpoint], [WithEndpointURL], [WitnInsecure], and [WithURLPath] options.
+The configuration can be overridden by [WithEndpoint], [WithEndpointURL], [WithInsecure], and [WithURLPath] options.
 
 OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_METRICS_HEADERS (default: none) -
 key-value pairs used as headers associated with HTTP requests.

exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf/options.go

@@ -139,7 +139,7 @@ func NewGRPCConfig(opts ...GRPCOption) Config {
 	if cfg.ServiceConfig != "" {
 		cfg.DialOptions = append(cfg.DialOptions, grpc.WithDefaultServiceConfig(cfg.ServiceConfig))
 	}
-	// Priroritize GRPCCredentials over Insecure (passing both is an error).
+	// Prioritize GRPCCredentials over Insecure (passing both is an error).
 	if cfg.Metrics.GRPCCredentials != nil {
 		cfg.DialOptions = append(cfg.DialOptions, grpc.WithTransportCredentials(cfg.Metrics.GRPCCredentials))
 	} else if cfg.Metrics.Insecure {

exporters/otlp/otlpmetric/otlpmetrichttp/internal/oconf/tls.go

@@ -14,7 +14,7 @@ import (
 )
 
 // ReadTLSConfigFromFile reads a PEM certificate file and creates
-// a tls.Config that will use this certifate to verify a server certificate.
+// a tls.Config that will use this certificate to verify a server certificate.
 func ReadTLSConfigFromFile(path string) (*tls.Config, error) {
 	b, err := os.ReadFile(path)
 	if err != nil {

exporters/otlp/otlptrace/otlptracegrpc/internal/otlpconfig/options.go

@@ -125,7 +125,7 @@ func NewGRPCConfig(opts ...GRPCOption) Config {
 	if cfg.ServiceConfig != "" {
 		cfg.DialOptions = append(cfg.DialOptions, grpc.WithDefaultServiceConfig(cfg.ServiceConfig))
 	}
-	// Priroritize GRPCCredentials over Insecure (passing both is an error).
+	// Prioritize GRPCCredentials over Insecure (passing both is an error).
 	if cfg.Traces.GRPCCredentials != nil {
 		cfg.DialOptions = append(cfg.DialOptions, grpc.WithTransportCredentials(cfg.Traces.GRPCCredentials))
 	} else if cfg.Traces.Insecure {

exporters/otlp/otlptrace/otlptracehttp/client_test.go

@@ -35,7 +35,7 @@ var (
 	}
 
 	customUserAgentHeader = map[string]string{
-		"user-agent": "custome-user-agent",
+		"user-agent": "custom-user-agent",
 	}
 
 	customProxyHeader = map[string]string{

exporters/otlp/otlptrace/otlptracehttp/doc.go

@@ -22,7 +22,7 @@ target URL to which the exporter sends telemetry.
 The value must contain a scheme ("http" or "https") and host.
 The value may additionally contain a port and a path.
 The value should not contain a query string or fragment.
-The configuration can be overridden by [WithEndpoint], [WithEndpointURL], [WitnInsecure], and [WithURLPath] options.
+The configuration can be overridden by [WithEndpoint], [WithEndpointURL], [WithInsecure], and [WithURLPath] options.
 
 OTEL_EXPORTER_OTLP_HEADERS, OTEL_EXPORTER_OTLP_TRACES_HEADERS (default: none) -
 key-value pairs used as headers associated with HTTP requests.

exporters/otlp/otlptrace/otlptracehttp/internal/otlpconfig/options.go

@@ -125,7 +125,7 @@ func NewGRPCConfig(opts ...GRPCOption) Config {
 	if cfg.ServiceConfig != "" {
 		cfg.DialOptions = append(cfg.DialOptions, grpc.WithDefaultServiceConfig(cfg.ServiceConfig))
 	}
-	// Priroritize GRPCCredentials over Insecure (passing both is an error).
+	// Prioritize GRPCCredentials over Insecure (passing both is an error).
 	if cfg.Traces.GRPCCredentials != nil {
 		cfg.DialOptions = append(cfg.DialOptions, grpc.WithTransportCredentials(cfg.Traces.GRPCCredentials))
 	} else if cfg.Traces.Insecure {

exporters/prometheus/exporter_test.go

@@ -28,12 +28,12 @@ import (
 
 func TestPrometheusExporter(t *testing.T) {
 	testCases := []struct {
-		name               string
-		emptyResource      bool
-		customResouceAttrs []attribute.KeyValue
-		recordMetrics      func(ctx context.Context, meter otelmetric.Meter)
-		options            []Option
-		expectedFile       string
+		name                string
+		emptyResource       bool
+		customResourceAttrs []attribute.KeyValue
+		recordMetrics       func(ctx context.Context, meter otelmetric.Meter)
+		options             []Option
+		expectedFile        string
 	}{
 		{
 			name:         "counter",
@@ -264,7 +264,7 @@ func TestPrometheusExporter(t *testing.T) {
 		},
 		{
 			name: "custom resource",
-			customResouceAttrs: []attribute.KeyValue{
+			customResourceAttrs: []attribute.KeyValue{
 				attribute.Key("A").String("B"),
 				attribute.Key("C").String("D"),
 			},
@@ -417,7 +417,7 @@ func TestPrometheusExporter(t *testing.T) {
 					resource.WithAttributes(semconv.ServiceName("prometheus_test")),
 					// Overwrite the semconv.TelemetrySDKVersionKey value so we don't need to update every version
 					resource.WithAttributes(semconv.TelemetrySDKVersion("latest")),
-					resource.WithAttributes(tc.customResouceAttrs...),
+					resource.WithAttributes(tc.customResourceAttrs...),
 				)
 				require.NoError(t, err)
 
@@ -536,7 +536,7 @@ func TestDuplicateMetrics(t *testing.T) {
 	withTypeFoo := otelmetric.WithAttributeSet(typeFoo)
 	testCases := []struct {
 		name                  string
-		customResouceAttrs    []attribute.KeyValue
+		customResourceAttrs   []attribute.KeyValue
 		recordMetrics         func(ctx context.Context, meterA, meterB otelmetric.Meter)
 		options               []Option
 		possibleExpectedFiles []string

internal/global/meter_test.go

@@ -227,7 +227,7 @@ func TestMeterProviderDelegatesCalls(t *testing.T) {
 	assert.Equal(t, 1, tMeter.siHist)
 	assert.Equal(t, 1, len(tMeter.callbacks))
 
-	// Because the Meter was provided by testmeterProvider it should also return our test instrument
+	// Because the Meter was provided by testMeterProvider it should also return our test instrument
 	require.IsType(t, &testCountingFloatInstrument{}, ctr, "the meter did not delegate calls to the meter")
 	assert.Equal(t, 1, ctr.(*testCountingFloatInstrument).count)
 
@@ -276,11 +276,11 @@ func TestMeterDelegatesCalls(t *testing.T) {
 	assert.Equal(t, 1, tMeter.siUDCount)
 	assert.Equal(t, 1, tMeter.siHist)
 
-	// Because the Meter was provided by testmeterProvider it should also return our test instrument
+	// Because the Meter was provided by testMeterProvider it should also return our test instrument
 	require.IsType(t, &testCountingFloatInstrument{}, ctr, "the meter did not delegate calls to the meter")
 	assert.Equal(t, 1, ctr.(*testCountingFloatInstrument).count)
 
-	// Because the Meter was provided by testmeterProvider it should also return our test instrument
+	// Because the Meter was provided by testMeterProvider it should also return our test instrument
 	require.IsType(t, &testCountingFloatInstrument{}, actr, "the meter did not delegate calls to the meter")
 	assert.Equal(t, 1, actr.(*testCountingFloatInstrument).count)
 

internal/shared/otlp/otlplog/transform/log.go.tmpl

@@ -66,7 +66,7 @@ func resourceLogsMap(dst *map[attribute.Distinct]*lpb.ResourceLogs, records []lo
 	}
 }
 
-// ScopeLogs returns a slice of OTLP ScopeLogs generated from recoreds.
+// ScopeLogs returns a slice of OTLP ScopeLogs generated from records.
 func ScopeLogs(records []log.Record) []*lpb.ScopeLogs {
 	scopeMap := scopeLogsMapPool.Get().(map[instrumentation.Scope]*lpb.ScopeLogs)
 	defer func() {

internal/shared/otlp/otlpmetric/oconf/options.go.tmpl

@@ -139,7 +139,7 @@ func NewGRPCConfig(opts ...GRPCOption) Config {
 	if cfg.ServiceConfig != "" {
 		cfg.DialOptions = append(cfg.DialOptions, grpc.WithDefaultServiceConfig(cfg.ServiceConfig))
 	}
-	// Priroritize GRPCCredentials over Insecure (passing both is an error).
+	// Prioritize GRPCCredentials over Insecure (passing both is an error).
 	if cfg.Metrics.GRPCCredentials != nil {
 		cfg.DialOptions = append(cfg.DialOptions, grpc.WithTransportCredentials(cfg.Metrics.GRPCCredentials))
 	} else if cfg.Metrics.Insecure {

internal/shared/otlp/otlptrace/otlpconfig/options.go.tmpl

@@ -125,7 +125,7 @@ func NewGRPCConfig(opts ...GRPCOption) Config {
 	if cfg.ServiceConfig != "" {
 		cfg.DialOptions = append(cfg.DialOptions, grpc.WithDefaultServiceConfig(cfg.ServiceConfig))
 	}
-	// Priroritize GRPCCredentials over Insecure (passing both is an error).
+	// Prioritize GRPCCredentials over Insecure (passing both is an error).
 	if cfg.Traces.GRPCCredentials != nil {
 		cfg.DialOptions = append(cfg.DialOptions, grpc.WithTransportCredentials(cfg.Traces.GRPCCredentials))
 	} else if cfg.Traces.Insecure {

log/DESIGN.md

@@ -105,16 +105,16 @@ is defined as `Record` struct  in [record.go](record.go).
 is accessed using following methods:
 
 ```go
-func (r *Record) Timestamp() time.Time 
-func (r *Record) SetTimestamp(t time.Time) 
+func (r *Record) Timestamp() time.Time
+func (r *Record) SetTimestamp(t time.Time)
 ```
 
 [`ObservedTimestamp`](https://opentelemetry.io/docs/specs/otel/logs/data-model/#field-observedtimestamp)
 is accessed using following methods:
 
 ```go
-func (r *Record) ObservedTimestamp() time.Time 
-func (r *Record) SetObservedTimestamp(t time.Time) 
+func (r *Record) ObservedTimestamp() time.Time
+func (r *Record) SetObservedTimestamp(t time.Time)
 ```
 
 [`SeverityNumber`](https://opentelemetry.io/docs/specs/otel/logs/data-model/#field-severitynumber)

metric/asyncfloat64.go

@@ -213,7 +213,7 @@ type Float64Observer interface {
 }
 
 // Float64Callback is a function registered with a Meter that makes
-// observations for a Float64Observerable instrument it is registered with.
+// observations for a Float64Observable instrument it is registered with.
 // Calls to the Float64Observer record measurement values for the
 // Float64Observable.
 //

metric/asyncint64.go

@@ -212,7 +212,7 @@ type Int64Observer interface {
 }
 
 // Int64Callback is a function registered with a Meter that makes observations
-// for an Int64Observerable instrument it is registered with. Calls to the
+// for an Int64Observable instrument it is registered with. Calls to the
 // Int64Observer record measurement values for the Int64Observable.
 //
 // The function needs to complete in a finite amount of time and the deadline

sdk/log/example_test.go

@@ -70,12 +70,12 @@ func ExampleProcessor_filtering() {
 
 type key struct{}
 
-var igoreLogsKey key
+var ignoreLogsKey key
 
 // WithIgnoreLogs returns a context which is used by [ContextFilterProcessor]
 // to filter out log records.
 func WithIgnoreLogs(ctx context.Context) context.Context {
-	return context.WithValue(ctx, igoreLogsKey, true)
+	return context.WithValue(ctx, ignoreLogsKey, true)
 }
 
 // ContextFilterProcessor filters out logs when a context deriving from
@@ -110,7 +110,7 @@ func (p *ContextFilterProcessor) Enabled(ctx context.Context, record log.Record)
 }
 
 func ignoreLogs(ctx context.Context) bool {
-	_, ok := ctx.Value(igoreLogsKey).(bool)
+	_, ok := ctx.Value(ignoreLogsKey).(bool)
 	return ok
 }