Skip to content

Commit

Permalink
Merge branch 'master' into actors-scheduler-reminder-state-migration
Browse files Browse the repository at this point in the history
  • Loading branch information
dapr-bot authored Oct 23, 2024
2 parents 93b34e4 + 2b76820 commit 64429ee
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pkg/config/configuration.go
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ func (c Configuration) GetLoggingSpec() LoggingSpec {
return *c.Spec.LoggingSpec
}

// GetLoggingSpec returns the Logging.APILogging spec.
// GetAPILoggingSpec returns the Logging.APILogging spec.
// It's a short-hand that includes nil-checks for safety.
func (c Configuration) GetAPILoggingSpec() APILoggingSpec {
if c.Spec.LoggingSpec == nil || c.Spec.LoggingSpec.APILogging == nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/resiliency/noop.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func (NoOp) ComponentOutboundPolicy(name string, componentName ComponentType) *P
return nil
}

// BuildInPolicy returns a NoOp policy definition for a built-in policy.
// BuiltInPolicy returns a NoOp policy definition for a built-in policy.
func (NoOp) BuiltInPolicy(name BuiltInPolicyName) *PolicyDefinition {
return nil
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/runtime/trace.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func (s *opentelemetryTracerProviderStore) RegisterSampler(sampler sdktrace.Samp
s.sampler = sampler
}

// RegisterTraceProvider registers a trace provider as per the tracer options in the store
// RegisterTracerProvider registers a trace provider as per the tracer options in the store
func (s *opentelemetryTracerProviderStore) RegisterTracerProvider() *sdktrace.TracerProvider {
if len(s.exporters) != 0 {
tracerOptions := []sdktrace.TracerProviderOption{}
Expand Down

0 comments on commit 64429ee

Please sign in to comment.