Skip to content

Fix gosec overflow alerts#5799

Merged
dmathieu merged 17 commits intoopen-telemetry:mainfrom
dmathieu:fix-uint-gosec
Sep 13, 2024
Merged

Fix gosec overflow alerts#5799
dmathieu merged 17 commits intoopen-telemetry:mainfrom
dmathieu:fix-uint-gosec

Conversation

@dmathieu
Copy link
Copy Markdown
Member

@dmathieu dmathieu commented Sep 10, 2024

To allow the golangci-lint upgrade in #5796.

@dmathieu dmathieu added the Skip Changelog PRs that do not require a CHANGELOG.md entry label Sep 10, 2024
@codecov
Copy link
Copy Markdown

codecov Bot commented Sep 10, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 84.5%. Comparing base (5e3434c) to head (dbb596f).
Report is 1 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@          Coverage Diff          @@
##            main   #5799   +/-   ##
=====================================
  Coverage   84.5%   84.5%           
=====================================
  Files        272     272           
  Lines      22771   22776    +5     
=====================================
+ Hits       19251   19256    +5     
  Misses      3177    3177           
  Partials     343     343

see 10 files with indirect coverage changes

@dmathieu dmathieu force-pushed the fix-uint-gosec branch 3 times, most recently from 9d84ad7 to b21f2f9 Compare September 10, 2024 08:10
@dmathieu dmathieu marked this pull request as ready for review September 10, 2024 08:13
pellared
pellared previously requested changes Sep 10, 2024
View reviewed changes
Comment thread internal/rawhelpers.go Outdated
pellared
pellared reviewed Sep 10, 2024
View reviewed changes
Comment thread internal/rawhelpers.go
@pellared pellared dismissed their stale review September 10, 2024 09:03

Bug is fixed

@MrAlias
Copy link
Copy Markdown
Contributor

MrAlias commented Sep 10, 2024

This is missing fixes for all the other lint errors:

golangci-lint --fix ./bridge/opencensus
internal/span.go:64:33: G115: integer overflow conversion int32 -> uint32 (gosec)
	s.otelSpan.SetStatus(codes.Code(status.Code), status.Message)
	                               ^
internal/ocmetric/metric.go:147:25: G115: integer overflow conversion int64 -> uint64 (gosec)
				Count:        uint64(dist.Count),
				                    ^
internal/ocmetric/metric.go:169:27: G115: integer overflow conversion int64 -> uint64 (gosec)
		bucketCounts[i] = uint64(bucket.Count)
		                        ^
internal/ocmetric/metric.go:360:27: G115: integer overflow conversion int64 -> uint64 (gosec)
				Count:          uint64(summary.Count),
				                      ^

golangci-lint --fix ./exporters/otlp/otlplog/otlploggrpc
internal/transform/log.go:145:15: G115: integer overflow conversion int64 -> uint64 (gosec)
	return uint64(t.UnixNano())
	             ^

golangci-lint --fix ./exporters/otlp/otlplog/otlploghttp
internal/transform/log.go:145:15: G115: integer overflow conversion int64 -> uint64 (gosec)
	return uint64(t.UnixNano())
	             ^

golangci-lint --fix ./exporters/otlp/otlpmetric/otlpmetricgrpc
internal/transform/metricdata.go:285:15: G115: integer overflow conversion int64 -> uint64 (gosec)
	return uint64(t.UnixNano())
	             ^

golangci-lint --fix ./exporters/otlp/otlpmetric/otlpmetrichttp
internal/transform/metricdata.go:285:15: G115: integer overflow conversion int64 -> uint64 (gosec)
	return uint64(t.UnixNano())
	             ^

golangci-lint --fix ./exporters/otlp/otlptrace
internal/tracetransform/span.go:100:33: G115: integer overflow conversion int64 -> uint64 (gosec)
		StartTimeUnixNano:      uint64(sd.StartTime().UnixNano()),
		                              ^
internal/tracetransform/span.go:101:33: G115: integer overflow conversion int64 -> uint64 (gosec)
		EndTimeUnixNano:        uint64(sd.EndTime().UnixNano()),
		                              ^
internal/tracetransform/span.go:181:15: G115: integer overflow conversion int32 -> uint32 (gosec)
	return uint32(flags)
	             ^
internal/tracetransform/span.go:195:34: G115: integer overflow conversion int64 -> uint64 (gosec)
			TimeUnixNano:           uint64(es[i].Time.UnixNano()),
			                              ^

golangci-lint --fix ./log
keyvalue.go:79:26: G115: integer overflow conversion int64 -> uint64 (gosec)
	return Value{num: uint64(v), any: KindInt64}
	                        ^

golangci-lint --fix ./schema
internal/parser_checks.go:29:39: G115: integer overflow conversion int -> uint64 (gosec)
	if fileFormatParsed.Major() != uint64(supportedFormatMajor) {
	                                     ^
internal/parser_checks.go:38:38: G115: integer overflow conversion int -> uint64 (gosec)
	if fileFormatParsed.Minor() > uint64(supportedFormatMinor) {
	                                    ^

golangci-lint --fix ./sdk/metric
internal/exemplar/value.go:31:46: G115: integer overflow conversion int64 -> uint64 (gosec)
		return Value{t: Int64ValueType, val: uint64(v)}

@dmathieu
Copy link
Copy Markdown
Member Author

dmathieu commented Sep 11, 2024

Duh you're right, my bad. I forgot that the linter stops after the first package with failures. I have fixed everything else.

MrAlias
MrAlias reviewed Sep 11, 2024
View reviewed changes
Comment thread schema/internal/parser_checks.go
MrAlias
MrAlias reviewed Sep 11, 2024
View reviewed changes
Comment thread internal/shared/otlp/otlpmetric/transform/metricdata.go.tmpl Outdated
Comment thread internal/shared/otlp/otlplog/transform/log.go.tmpl Outdated
Comment thread exporters/otlp/otlptrace/internal/tracetransform/span.go Outdated
Comment thread bridge/opencensus/internal/span.go Outdated
Comment thread bridge/opencensus/internal/ocmetric/metric.go Outdated
MrAlias
MrAlias reviewed Sep 12, 2024
View reviewed changes
Comment thread bridge/opencensus/internal/ocmetric/metric.go Outdated
Comment thread bridge/opencensus/internal/ocmetric/metric.go Outdated
dmathieu and others added 2 commits September 12, 2024 19:52
@dmathieu @MrAlias
Update bridge/opencensus/internal/ocmetric/metric.go
02e3d49 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
@dmathieu @MrAlias
Update bridge/opencensus/internal/ocmetric/metric.go
91c0ac0 
Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com>
pellared
pellared approved these changes Sep 13, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@pellared pellared left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@dmathieu dmathieu merged commit a3c512a into open-telemetry:main Sep 13, 2024
@dmathieu dmathieu deleted the fix-uint-gosec branch September 13, 2024 07:11
@MrAlias MrAlias added this to the v1.31.0 milestone Oct 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pellared pellared pellared approved these changes

@MrAlias MrAlias MrAlias approved these changes

@XSAM XSAM Awaiting requested review from XSAM XSAM is a code owner

@dashpole dashpole Awaiting requested review from dashpole dashpole is a code owner

@MadVikingGod MadVikingGod Awaiting requested review from MadVikingGod

@hanyuancheung hanyuancheung Awaiting requested review from hanyuancheung

Assignees

No one assigned

Labels

Skip Changelog PRs that do not require a CHANGELOG.md entry

Projects

None yet

Milestone

v1.31.0

Development

Successfully merging this pull request may close these issues.

3 participants

@dmathieu @MrAlias @pellared