Merge remote-tracking branch 'upstream/main' into enums

instrumentation/ratpack-1.4/library/src/main/java/io/opentelemetry/instrumentation/ratpack/RatpackTracingBuilder.java

@@ -70,13 +70,8 @@ public RatpackTracing build() {
  .addAttributesExtractor(httpAttributes)
  .addAttributesExtractors(additionalExtractors)
  .addRequestMetrics(HttpServerMetrics.get())
- .newServerInstrumenter(new RatpackGetter());
+ .newServerInstrumenter(RatpackGetter.INSTANCE);
 
- builder.setSpanStatusExtractor(HttpSpanStatusExtractor.create(httpAttributes));
- builder.addAttributesExtractor(netAttributes);
- builder.addAttributesExtractor(httpAttributes);
- builder.addAttributesExtractors(additionalExtractors);
-
- return new RatpackTracing(builder.newServerInstrumenter(RatpackGetter.INSTANCE));
+ return new RatpackTracing(instrumenter);
  }
 }

instrumentation/restlet/restlet-1.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v1_0/RestletTracingBuilder.java

@@ -77,6 +77,7 @@ public RestletTracing build() {
  .addAttributesExtractor(httpAttributesExtractor)
  .addAttributesExtractor(netAttributesExtractor)
  .addAttributesExtractors(additionalExtractors)
+ .addRequestMetrics(HttpServerMetrics.get())
  .newServerInstrumenter(RestletHeadersGetter.INSTANCE);
 
  return new RestletTracing(instrumenter);