Bump errorProneVersion from 2.15.0 to 2.18.0 (#5125)
* Bump errorProneVersion from 2.15.0 to 2.18.0 Bumps `errorProneVersion` from 2.15.0 to 2.18.0. Updates `error_prone_annotations` from 2.15.0 to 2.18.0 - [Release notes](https://github.com/google/error-prone/releases) - [Commits](https://github.com/google/error-prone/compare/v2.15.0...v2.18.0) Updates `error_prone_core` from 2.15.0 to 2.18.0 - [Release notes](https://github.com/google/error-prone/releases) - [Commits](https://github.com/google/error-prone/compare/v2.15.0...v2.18.0) --- updated-dependencies: - dependency-name: com.google.errorprone:error_prone_annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.errorprone:error_prone_core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fix and surpress complaints Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jack Berg <jberg@newrelic.com>
This commit is contained in:
		
							parent
							
								
									7f3c9cac05
								
							
						
					
					
						commit
						33faf8bdf6
					
				| 
						 | 
				
			
			@ -82,6 +82,10 @@ tasks {
 | 
			
		|||
        // every one of these methods is too noisy.
 | 
			
		||||
        disable("CanIgnoreReturnValueSuggester")
 | 
			
		||||
 | 
			
		||||
        // YodaConditions may improve safety in some cases. The argument of increased
 | 
			
		||||
        // cognitive load is dubious.
 | 
			
		||||
        disable("YodaCondition")
 | 
			
		||||
 | 
			
		||||
        if (name.contains("Jmh") || name.contains("Test")) {
 | 
			
		||||
          // Allow underscore in test-type method names
 | 
			
		||||
          disable("MemberName")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -26,7 +26,7 @@ val DEPENDENCY_BOMS = listOf(
 | 
			
		|||
)
 | 
			
		||||
 | 
			
		||||
val autoValueVersion = "1.10.1"
 | 
			
		||||
val errorProneVersion = "2.15.0"
 | 
			
		||||
val errorProneVersion = "2.18.0"
 | 
			
		||||
val jmhVersion = "1.36"
 | 
			
		||||
val mockitoVersion = "4.11.0"
 | 
			
		||||
val slf4jVersion = "2.0.6"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -127,6 +127,7 @@ public final class CodedInputStream {
 | 
			
		|||
  }
 | 
			
		||||
 | 
			
		||||
  /** Read varint32. */
 | 
			
		||||
  @SuppressWarnings("LabelledBreakTarget")
 | 
			
		||||
  public int readRawVarint32() throws IOException {
 | 
			
		||||
    // See implementation notes for readRawVarint64
 | 
			
		||||
    fastpath:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -135,6 +135,7 @@ public final class MarshalerUtil {
 | 
			
		|||
  }
 | 
			
		||||
 | 
			
		||||
  /** Returns the size of a repeated message field. */
 | 
			
		||||
  @SuppressWarnings("AvoidObjectArrays")
 | 
			
		||||
  public static <T extends Marshaler> int sizeRepeatedMessage(
 | 
			
		||||
      ProtoFieldInfo field, T[] repeatedMessage) {
 | 
			
		||||
    int size = 0;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -256,6 +256,7 @@ public abstract class Serializer implements AutoCloseable {
 | 
			
		|||
  }
 | 
			
		||||
 | 
			
		||||
  /** Serializes {@code repeated message} field. */
 | 
			
		||||
  @SuppressWarnings("AvoidObjectArrays")
 | 
			
		||||
  public abstract void serializeRepeatedMessage(ProtoFieldInfo field, Marshaler[] repeatedMessage)
 | 
			
		||||
      throws IOException;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -32,6 +32,7 @@ public final class KeyValueMarshaler extends MarshalerWithSize {
 | 
			
		|||
  private static final KeyValueMarshaler[] EMPTY_REPEATED = new KeyValueMarshaler[0];
 | 
			
		||||
 | 
			
		||||
  /** Returns Marshalers for the given Attributes. */
 | 
			
		||||
  @SuppressWarnings("AvoidObjectArrays")
 | 
			
		||||
  public static KeyValueMarshaler[] createRepeated(Attributes attributes) {
 | 
			
		||||
    if (attributes.isEmpty()) {
 | 
			
		||||
      return EMPTY_REPEATED;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -32,6 +32,7 @@ public final class ResourceLogsMarshaler extends MarshalerWithSize {
 | 
			
		|||
  private final InstrumentationScopeLogsMarshaler[] instrumentationScopeLogsMarshalers;
 | 
			
		||||
 | 
			
		||||
  /** Returns Marshalers of ResourceLogs created by grouping the provided logRecords. */
 | 
			
		||||
  @SuppressWarnings("AvoidObjectArrays")
 | 
			
		||||
  public static ResourceLogsMarshaler[] create(Collection<LogRecordData> logs) {
 | 
			
		||||
    Map<Resource, Map<InstrumentationScopeInfo, List<Marshaler>>> resourceAndScopeMap =
 | 
			
		||||
        groupByResourceAndScope(logs);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -32,6 +32,7 @@ public final class ResourceMetricsMarshaler extends MarshalerWithSize {
 | 
			
		|||
  private final InstrumentationScopeMetricsMarshaler[] instrumentationScopeMetricsMarshalers;
 | 
			
		||||
 | 
			
		||||
  /** Returns Marshalers of ResourceMetrics created by grouping the provided metricData. */
 | 
			
		||||
  @SuppressWarnings("AvoidObjectArrays")
 | 
			
		||||
  public static ResourceMetricsMarshaler[] create(Collection<MetricData> metricDataList) {
 | 
			
		||||
    Map<Resource, Map<InstrumentationScopeInfo, List<Marshaler>>> resourceAndScopeMap =
 | 
			
		||||
        groupByResourceAndScope(metricDataList);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -31,6 +31,7 @@ public final class ResourceSpansMarshaler extends MarshalerWithSize {
 | 
			
		|||
  private final InstrumentationScopeSpansMarshaler[] instrumentationScopeSpansMarshalers;
 | 
			
		||||
 | 
			
		||||
  /** Returns Marshalers of ResourceSpans created by grouping the provided SpanData. */
 | 
			
		||||
  @SuppressWarnings("AvoidObjectArrays")
 | 
			
		||||
  public static ResourceSpansMarshaler[] create(Collection<SpanData> spanDataList) {
 | 
			
		||||
    Map<Resource, Map<InstrumentationScopeInfo, List<SpanMarshaler>>> resourceAndScopeMap =
 | 
			
		||||
        groupByResourceAndScope(spanDataList);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -5,12 +5,12 @@
 | 
			
		|||
 | 
			
		||||
package io.opentelemetry;
 | 
			
		||||
 | 
			
		||||
import java.util.Arrays;
 | 
			
		||||
import java.util.List;
 | 
			
		||||
import javax.annotation.Nullable;
 | 
			
		||||
 | 
			
		||||
public final class Request {
 | 
			
		||||
  @Nullable private String url;
 | 
			
		||||
  @Nullable private Request[] arguments;
 | 
			
		||||
  @Nullable private List<Request> arguments;
 | 
			
		||||
 | 
			
		||||
  @Nullable
 | 
			
		||||
  public String getUrl() {
 | 
			
		||||
| 
						 | 
				
			
			@ -22,16 +22,16 @@ public final class Request {
 | 
			
		|||
  }
 | 
			
		||||
 | 
			
		||||
  @Nullable
 | 
			
		||||
  public Request[] getArguments() {
 | 
			
		||||
  public List<Request> getArguments() {
 | 
			
		||||
    return arguments;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  public void setArguments(Request[] arguments) {
 | 
			
		||||
  public void setArguments(List<Request> arguments) {
 | 
			
		||||
    this.arguments = arguments;
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  @Override
 | 
			
		||||
  public String toString() {
 | 
			
		||||
    return "Request{" + "url='" + url + '\'' + ", arguments=" + Arrays.toString(arguments) + '}';
 | 
			
		||||
    return "Request{" + "url='" + url + '\'' + ", arguments=" + arguments + '}';
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,7 +24,8 @@ class TraceContextIntegrationTest {
 | 
			
		|||
 | 
			
		||||
  @Container
 | 
			
		||||
  private static final GenericContainer<?> appContainer =
 | 
			
		||||
      new GenericContainer<>(DockerImageName.parse("ghcr.io/open-telemetry/openjdk17"))
 | 
			
		||||
      new GenericContainer<>(
 | 
			
		||||
              DockerImageName.parse("ghcr.io/open-telemetry/opentelemetry-java/openjdk17"))
 | 
			
		||||
          .withExposedPorts(5000)
 | 
			
		||||
          .withNetwork(Network.SHARED)
 | 
			
		||||
          .withNetworkAliases("app")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue