Bump opentelemetry java sdk version and add new semconv dependency (#217)

* Bumping OTel sdk and adding semconv lib * Updating unit tests * Updating changelog * Updated notice files

Author: LikeTheSalad

CHANGELOG.asciidoc

@@ -38,6 +38,7 @@ ${next_release_notes}
 * Removing Gradle's warning on missing serverUrl param: {pull}209[#209]
 * Adding http response content length attr to okhttp spans: {pull}211[#211]
 * Marking okhttp spans as failed when receiving an error response code: {pull}212[#212]
+* Bumping OTel SDK to 1.31.0 and adding new semconv dependency: {pull}217[#217]
 ////
 
 [[release-notes-0.9.0]]

NOTICE

@@ -16,6 +16,7 @@ This product includes software licensed under the 'Apache License Version 2.0' l
  - okhttp (https://square.github.io/okhttp/)
  - OpenTelemetry Java (https://github.com/open-telemetry/opentelemetry-java)
  - OpenTelemetry Java Contrib (https://github.com/open-telemetry/opentelemetry-java-contrib)
+ - OpenTelemetry Semantic Conventions Java (https://github.com/open-telemetry/semantic-conventions-java)
  - org.stagemonitor:stagemonitor-configuration (http://www.stagemonitor.org)
  - Weakly referenced lock-free data structures (https://github.com/raphw/weak-lock-free)
 

android-sdk-ktx/metadata/notice.properties

@@ -1 +1 @@
-dependencies.hash=83E0E6D9CD40065C79FADBCA67A5607B
+dependencies.hash=81F0B6D19D5388F15DBE3E189D6C1B22

android-sdk/build.gradle

@@ -44,7 +44,7 @@ dependencies {
  implementation 'com.blogspot.mydailyjava:weak-lock-free:0.18'
  implementation project(':android-common')
  implementation "io.opentelemetry:opentelemetry-exporter-otlp:$openTelemetry_version"
- implementation "io.opentelemetry:opentelemetry-semconv:$openTelemetry_version-alpha"
+ implementation "io.opentelemetry.semconv:opentelemetry-semconv:1.21.0-alpha"
  implementation "io.opentelemetry.contrib:opentelemetry-disk-buffering:$openTelemetry_version-alpha"
  implementation "androidx.annotation:annotation:$androidAnnotations_version"
  implementation 'com.dslplatform:dsl-json-java8:1.10.0'

android-sdk/metadata/notice.properties

@@ -1 +1 @@
-dependencies.hash=553460B56887EDB98C3A019266F71C55
+dependencies.hash=81E0A693875E87899494D84AB8C8D79D

android-sdk/src/main/java/co/elastic/apm/android/sdk/attributes/common/CarrierHttpAttributesVisitor.java

@@ -25,7 +25,7 @@
 import co.elastic.apm.android.sdk.internal.services.network.data.CarrierInfo;
 import co.elastic.apm.android.sdk.internal.utilities.providers.Provider;
 import io.opentelemetry.api.common.AttributesBuilder;
-import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import io.opentelemetry.semconv.SemanticAttributes;
 
 public class CarrierHttpAttributesVisitor implements AttributesVisitor {
  private final Provider<NetworkService> networkServiceProvider;
@@ -38,10 +38,10 @@ public CarrierHttpAttributesVisitor() {
  public void visit(AttributesBuilder builder) {
  CarrierInfo carrierInfo = networkServiceProvider.get().getCarrierInfo();
  if (carrierInfo != null) {
- builder.put(SemanticAttributes.NET_HOST_CARRIER_NAME, carrierInfo.name);
- builder.put(SemanticAttributes.NET_HOST_CARRIER_MCC, carrierInfo.mcc);
- builder.put(SemanticAttributes.NET_HOST_CARRIER_MNC, carrierInfo.mnc);
- builder.put(SemanticAttributes.NET_HOST_CARRIER_ICC, carrierInfo.icc);
+ builder.put(SemanticAttributes.NETWORK_CARRIER_NAME, carrierInfo.name);
+ builder.put(SemanticAttributes.NETWORK_CARRIER_MCC, carrierInfo.mcc);
+ builder.put(SemanticAttributes.NETWORK_CARRIER_MNC, carrierInfo.mnc);
+ builder.put(SemanticAttributes.NETWORK_CARRIER_ICC, carrierInfo.icc);
  }
  }
 }

android-sdk/src/main/java/co/elastic/apm/android/sdk/attributes/common/ConnectionHttpAttributesVisitor.java

@@ -24,7 +24,7 @@
 import co.elastic.apm.android.sdk.internal.services.network.NetworkService;
 import co.elastic.apm.android.sdk.internal.services.network.data.type.NetworkType;
 import io.opentelemetry.api.common.AttributesBuilder;
-import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
+import io.opentelemetry.semconv.SemanticAttributes;
 
 public class ConnectionHttpAttributesVisitor implements AttributesVisitor {
  private final NetworkService networkService;
@@ -48,9 +48,9 @@ private ConnectionHttpAttributesVisitor() {
  @Override
  public void visit(AttributesBuilder builder) {
  NetworkType networkType = networkService.getType();
- builder.put(SemanticAttributes.NET_HOST_CONNECTION_TYPE, networkType.getName());
+ builder.put(SemanticAttributes.NETWORK_CONNECTION_TYPE, networkType.getName());
  if (networkType.getSubTypeName() != null) {
- builder.put(SemanticAttributes.NET_HOST_CONNECTION_SUBTYPE, networkType.getSubTypeName());
+ builder.put(SemanticAttributes.NETWORK_CONNECTION_SUBTYPE, networkType.getSubTypeName());
  }
  }
 }

android-sdk/src/main/java/co/elastic/apm/android/sdk/attributes/resources/DeviceIdVisitor.java

@@ -25,7 +25,7 @@
 import co.elastic.apm.android.sdk.internal.services.ServiceManager;
 import co.elastic.apm.android.sdk.internal.services.preferences.PreferencesService;
 import io.opentelemetry.api.common.AttributesBuilder;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 
 public class DeviceIdVisitor implements AttributesVisitor {
 

android-sdk/src/main/java/co/elastic/apm/android/sdk/attributes/resources/DeviceInfoVisitor.java

@@ -22,7 +22,7 @@
 
 import co.elastic.apm.android.sdk.attributes.AttributesVisitor;
 import io.opentelemetry.api.common.AttributesBuilder;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 
 public class DeviceInfoVisitor implements AttributesVisitor {
 

android-sdk/src/main/java/co/elastic/apm/android/sdk/attributes/resources/OsDescriptorVisitor.java

@@ -22,7 +22,7 @@
 
 import co.elastic.apm.android.sdk.attributes.AttributesVisitor;
 import io.opentelemetry.api.common.AttributesBuilder;
-import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
+import io.opentelemetry.semconv.ResourceAttributes;
 
 public class OsDescriptorVisitor implements AttributesVisitor {