Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4f03435 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Resolve metrics_proto warning"

parents c887ac6a 8d63d56a

ui/build/config.go

+4 −4
Original line number Diff line number Diff line
@@ -541,14 +541,14 @@ func storeConfigMetrics(ctx Context, config Config) { 
	ctx.Metrics.SystemResourceInfo(s)

}



func getNinjaWeightListSourceInMetric(s NinjaWeightListSource) *smpb.NinjaWeightListSource {

func getNinjaWeightListSourceInMetric(s NinjaWeightListSource) *smpb.BuildConfig_NinjaWeightListSource {

	switch s {

	case NINJA_LOG:

		return smpb.NinjaWeightListSource_NINJA_LOG.Enum()

		return smpb.BuildConfig_NINJA_LOG.Enum()

	case EVENLY_DISTRIBUTED:

		return smpb.NinjaWeightListSource_EVENLY_DISTRIBUTED.Enum()

		return smpb.BuildConfig_EVENLY_DISTRIBUTED.Enum()

	default:

		return smpb.NinjaWeightListSource_NOT_USED.Enum()

		return smpb.BuildConfig_NOT_USED.Enum()

	}

}

ui/build/config_test.go

+11 −11
Original line number Diff line number Diff line
@@ -1032,7 +1032,7 @@ func TestBuildConfig(t *testing.T) { 
				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(false),

				ForceDisableBazelMixedBuild: proto.Bool(false),

				NinjaWeightListSource:       smpb.NinjaWeightListSource_NOT_USED.Enum(),

				NinjaWeightListSource:       smpb.BuildConfig_NOT_USED.Enum(),

			},

		},

		{
@@ -1044,7 +1044,7 @@ func TestBuildConfig(t *testing.T) { 
				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(false),

				ForceDisableBazelMixedBuild: proto.Bool(false),

				NinjaWeightListSource:       smpb.NinjaWeightListSource_NOT_USED.Enum(),

				NinjaWeightListSource:       smpb.BuildConfig_NOT_USED.Enum(),

			},

		},

		{
@@ -1056,7 +1056,7 @@ func TestBuildConfig(t *testing.T) { 
				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(false),

				ForceDisableBazelMixedBuild: proto.Bool(false),

				NinjaWeightListSource:       smpb.NinjaWeightListSource_NOT_USED.Enum(),

				NinjaWeightListSource:       smpb.BuildConfig_NOT_USED.Enum(),

			},

		},

		{
@@ -1068,7 +1068,7 @@ func TestBuildConfig(t *testing.T) { 
				UseRbe:                      proto.Bool(true),

				BazelMixedBuild:             proto.Bool(false),

				ForceDisableBazelMixedBuild: proto.Bool(false),

				NinjaWeightListSource:       smpb.NinjaWeightListSource_NOT_USED.Enum(),

				NinjaWeightListSource:       smpb.BuildConfig_NOT_USED.Enum(),

			},

		},

		{
@@ -1080,7 +1080,7 @@ func TestBuildConfig(t *testing.T) { 
				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(false),

				ForceDisableBazelMixedBuild: proto.Bool(true),

				NinjaWeightListSource:       smpb.NinjaWeightListSource_NOT_USED.Enum(),

				NinjaWeightListSource:       smpb.BuildConfig_NOT_USED.Enum(),

			},

		},

		{
@@ -1093,7 +1093,7 @@ func TestBuildConfig(t *testing.T) { 
				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(false),

				ForceDisableBazelMixedBuild: proto.Bool(false),

				NinjaWeightListSource:       smpb.NinjaWeightListSource_NOT_USED.Enum(),

				NinjaWeightListSource:       smpb.BuildConfig_NOT_USED.Enum(),

			},

		},

		{
@@ -1106,7 +1106,7 @@ func TestBuildConfig(t *testing.T) { 
				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(true),

				ForceDisableBazelMixedBuild: proto.Bool(false),

				NinjaWeightListSource:       smpb.NinjaWeightListSource_NOT_USED.Enum(),

				NinjaWeightListSource:       smpb.BuildConfig_NOT_USED.Enum(),

			},

		},

		{
@@ -1119,7 +1119,7 @@ func TestBuildConfig(t *testing.T) { 
				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(true),

				ForceDisableBazelMixedBuild: proto.Bool(false),

				NinjaWeightListSource:       smpb.NinjaWeightListSource_NOT_USED.Enum(),

				NinjaWeightListSource:       smpb.BuildConfig_NOT_USED.Enum(),

			},

		},

		{
@@ -1132,7 +1132,7 @@ func TestBuildConfig(t *testing.T) { 
				UseRbe:                      proto.Bool(false),

				BazelMixedBuild:             proto.Bool(true),

				ForceDisableBazelMixedBuild: proto.Bool(false),

				NinjaWeightListSource:       smpb.NinjaWeightListSource_NOT_USED.Enum(),

				NinjaWeightListSource:       smpb.BuildConfig_NOT_USED.Enum(),

			},

		},

		{
@@ -1147,7 +1147,7 @@ func TestBuildConfig(t *testing.T) { 
				BazelMixedBuild:             proto.Bool(false),

				Targets:                     []string{"droid", "dist"},

				ForceDisableBazelMixedBuild: proto.Bool(false),

				NinjaWeightListSource:       smpb.NinjaWeightListSource_NOT_USED.Enum(),

				NinjaWeightListSource:       smpb.BuildConfig_NOT_USED.Enum(),

			},

		},

		{
@@ -1166,7 +1166,7 @@ func TestBuildConfig(t *testing.T) { 
				UseRbe:                      proto.Bool(true),

				BazelMixedBuild:             proto.Bool(true),

				ForceDisableBazelMixedBuild: proto.Bool(true),

				NinjaWeightListSource:       smpb.NinjaWeightListSource_NOT_USED.Enum(),

				NinjaWeightListSource:       smpb.BuildConfig_NOT_USED.Enum(),

			},

		},

	}

ui/metrics/metrics_proto/metrics.pb.go

+253 −252

File changed.

Preview size limit exceeded, changes collapsed.

ui/metrics/metrics_proto/metrics.proto

+6 −6
Original line number Diff line number Diff line
@@ -134,6 +134,12 @@ message MetricsBase { 
}



message BuildConfig {

  enum NinjaWeightListSource {

    NOT_USED = 0;

    NINJA_LOG = 1;

    EVENLY_DISTRIBUTED = 2;

  }



  optional bool use_goma = 1;



  optional bool use_rbe = 2;
@@ -342,9 +348,3 @@ message JobInfo { 
  // Description of a job

  optional string job_description = 2;

}
 


enum NinjaWeightListSource {

  NOT_USED = 0;

  NINJA_LOG = 1;

  EVENLY_DISTRIBUTED = 2;

}
 
 No newline at end of file