From e6bb4d161e77903fda3cb4171256d18774ef7fba Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 13 Sep 2023 07:43:47 +0200 Subject: [PATCH] IJPL-238 Update library versions in project This commit updates the versions of xml-apis, opentelemetry, TestNG, xtext-xbase, slf4j-jdk14, tls-channel, and associated dependencies in .idea/libraries. The jar-repository-id "central-proxy" was adjusted or added where necessary. GitOrigin-RevId: 3e390ee1e9a093051b42001ff2aa3a338b7ed8eb --- .idea/libraries/StreamEx.xml | 10 +- .idea/libraries/TestNG.xml | 10 +- .idea/libraries/commons_logging.xml | 2 +- .idea/libraries/jetbrains_annotations.xml | 2 +- .idea/libraries/maven_resolver_provider.xml | 99 +++++++++++-------- .idea/libraries/opentelemetry.xml | 79 +++++++-------- .../opentelemetry_exporter_otlp_common.xml | 18 ++-- .../opentelemetry_extension_kotlin.xml | 10 +- .idea/libraries/plexus_utils.xml | 10 +- .idea/libraries/slf4j_jdk14.xml | 2 +- .idea/libraries/sqlite.xml | 10 +- ...intellij.java.aetherDependencyResolver.iml | 32 +++--- .../intellij/build/ConsoleSpanExporter.kt | 12 ++- .../jetbrains/intellij/build/TraceManager.kt | 4 +- .../dev-server/src/DevMainImpl.kt | 4 +- .../impl/compilation/CompilationPartsUtil.kt | 10 +- .../src/TelemetryManagerImpl.kt | 10 +- .../telemetry/OpenTelemetryConfigurator.kt | 16 +-- 18 files changed, 177 insertions(+), 163 deletions(-) diff --git a/.idea/libraries/StreamEx.xml b/.idea/libraries/StreamEx.xml index 5cedc9fa1338..28a897314579 100644 --- a/.idea/libraries/StreamEx.xml +++ b/.idea/libraries/StreamEx.xml @@ -1,18 +1,18 @@ - + - - 84dbfa4730565134504d65cdd823341c8b2ee655e2d1c5f004cf95bff0180655 + + cf8459f4ce30c6eb57166de33d61699eedb7d91d9d0bbea8561971d145d58729 - + - + \ No newline at end of file diff --git a/.idea/libraries/TestNG.xml b/.idea/libraries/TestNG.xml index bc855045d987..8f4b1cd71f1d 100644 --- a/.idea/libraries/TestNG.xml +++ b/.idea/libraries/TestNG.xml @@ -1,9 +1,9 @@ - + - - 7c686ba8696f8206473b1b78e7e4947191b2aa4891c57b184b44ad4e052d2c08 + + dbbc43e2c64623661c3537f9d74061eb6c8fc3e5b4376f31fadb16de2b200f88 deeac157c8de6822878d85d0c7bc8467a19cc8484d37788f7804f039dde280b1 @@ -19,13 +19,13 @@ - + - + diff --git a/.idea/libraries/commons_logging.xml b/.idea/libraries/commons_logging.xml index 89dd626af9b6..49cff843f5cd 100644 --- a/.idea/libraries/commons_logging.xml +++ b/.idea/libraries/commons_logging.xml @@ -1,6 +1,6 @@ - + daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636 diff --git a/.idea/libraries/jetbrains_annotations.xml b/.idea/libraries/jetbrains_annotations.xml index f197195e41a9..27c74c3ec369 100644 --- a/.idea/libraries/jetbrains_annotations.xml +++ b/.idea/libraries/jetbrains_annotations.xml @@ -1,6 +1,6 @@ - + ff112f54ce874b8ae899cfd68f0315d96c9f406a338b8eca80c76d10e2e5a2f7 diff --git a/.idea/libraries/maven_resolver_provider.xml b/.idea/libraries/maven_resolver_provider.xml index 8a8992182269..03b0d6aa1749 100644 --- a/.idea/libraries/maven_resolver_provider.xml +++ b/.idea/libraries/maven_resolver_provider.xml @@ -1,79 +1,92 @@ - + - - 4b9f827efb393696431978dc0354651f1a95d4c52ba07c92d830efe5dc9b1012 + + ba9bf12fd2fa45780235bb61bbf7e4593c60d741f008e089b99929e8c6b58aa9 - - 7c9eeb30ac1941ea9bdf76c08c162ed98c005913e5bff66de3f1027a304546dc + + 7931dc8dda878eef46988d9fd07c4ade3c91892d7fb3208c742cb9457135bb15 - - 6bcd688b4700bc0d9046c531c316e75674f53b345d4432d6a7f62812b2424bef + + 815b1886d1ec8e1d8b57b61e6ac83235be3f6a60159c8ee5a6f4e91f513f497f b3b5412ce17889103ea564bcdfcf9fb3dfa540344ffeac6b538a73c9d7182662 - - 91172bc294d6eab02fc9f45f4ea01fd0e418962d128cf489abea7b6957d988ee + + 7dd352fd9f8ff86a1d0a7d89e6289d8d3cd346ac9b214ed85868d585be05ab78 - - a205eaa76609ae0039bf38fe9a9c024c646eded05d176effbef524f04a2c2761 + + d919d904486c037f8d193412da0c92e22a9fa24230b9d67a57855c5c31c7e94e + + + 86946fb06cb205515539b93b005c3bb928ba3d0d140af68079cc4cc815125096 c5994010bcdce1d2bd603a4d50c47191ddbd7875d1157b23aaa26d33c82fda13 - - 24d89a1b23dc0427ac67895a741802fd23897bdf135d87fe586d718b38a3e924 + + 1d5c3393aa39f807837fb058d78ac8d0a287adf19f4ba6ad5070353acf61b081 - - d0b28ed944058ba4f9be4b54c25d6d5269cc4f3f3c49aa450d4dc2f7e0d552f6 + + 2b8939ebb46a760deca82faae356145105d27a01748aac30d202ce9d4494edf4 - - 17441a39045ac19bc4a8068fb7284facebf6337754bf2bf8f26a76b5f98ed108 + + 5989f5060b163230b2c3f99d93f68622d6c33cce1a24f0077059dc69d2f7375b - - cdcad9355b625743f40e4cead9a96353404e010c39c808d23b044be331afa251 + + 04d47ff236f63ddd61cb2d6e537d2ffd4d326370d5d73fb480ba47b08760ffef - - 17aaebe6e3e59df8cb5b4ec210196f7084637312b9bc4ff14cb77ad1ae3c381b + + 80903754456410ae4c8eb5db2a773b2cbcc3e2eb3f9cffed414cb516d13ff7a0 + + + a5b11158da6c26a09bf894b90df12d11a6a6293790f25c96a4a7e509b6ac59f2 + + + 86e0255d4c879c61b4833ed7f13124e8bb679df47debb127326e7db7dd49a07b - - - - - + + + - - + + + - - - - - + + + + + + + - - - + + + - - + + + - - - - - + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/opentelemetry.xml b/.idea/libraries/opentelemetry.xml index 788179cb6192..7de9370a006e 100644 --- a/.idea/libraries/opentelemetry.xml +++ b/.idea/libraries/opentelemetry.xml @@ -1,63 +1,58 @@ - + - - 1160fd3bda62d68598213c29d5865b80bb4d47c1722c7bc95b2fd097c1ea8391 + + ae1ad40c09431954cfe21d6c09034f11810d51d54ff17468f676b3989ea14521 - - 58616acc0a8d98f8ac85b667d5935fd4ce51d973df05fe98abfcb27171e89b65 + + f6af593322a4b1dff60132ac7dc1a4f8d0bf418ed44925c4158bb96f15d0e531 - - 29c0a28fc8f8a026dde8c4ffac5ad55f1b7409a75e8aa82e200c5b860443f8f2 + + f957f2befbed298f956c92b8d8af56601042b372dc980917b1a942efaef216fa - - 87c3eb9980ffc6e5ea8f9bd7dc58d4d1a667b60e3a2d4af332e7632c1c672dec + + 95bb065fa8a057ecefa99bdada6135e57079965d1eddf03a4ee76e0b32528d72 - - 3629bdffca97c5a65f8d8d6ff436a4da9e9227b16608e5e5868fa36fbd5c637c + + 1eaf2ebe9f74d93db69a1169355a483a74ba35342cced3e8faffc3495418717b - - 50781d57743041745c5cecc3df2c82fa23edafbcc3ecd0092286f3a8914f012d + + 4f248678f47fae984c90eadd1def913f6bff6442ac990cc1e2aca45e70cbde76 - - 4fe2cbe9148cabaaa734e87decdd77b940e646d8069ba4288b2ce1764e8c08ed + + 20b956b82e3f397a8c8b94827b10c89a4095798df1394bfb7c45de0491d840be - - e0344f721e0df1d52aa87c08eda38bd46330a68d581bc4e2a8b075b22c667af5 + + 627f791446d23a26b15df67b6e28cc4e812cbd168a2b487a268dd3f0aeea601f - - 51dd2ce28afcddfd1513fb474c8dd35283929eb5212c9bb9ac38d9738a7a2ec9 - - - 364c3f07ed62e1b7aff6f7bd8cfbdb93150b705f7f25d2c07b3d7c34f6cf5e91 + + aaf4aba82dd07c0b277e7ae955f8e2b3ce5295d080d9cb2c0321c72550ac053e - - - - - - - - - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/opentelemetry_exporter_otlp_common.xml b/.idea/libraries/opentelemetry_exporter_otlp_common.xml index a5d1b4d23b36..39cc2c69b078 100644 --- a/.idea/libraries/opentelemetry_exporter_otlp_common.xml +++ b/.idea/libraries/opentelemetry_exporter_otlp_common.xml @@ -1,12 +1,12 @@ - + - - dd8da27a67a1e9c014bfd33399b2a82d6ccecbf2f9fcbcd077b2dd54e78f073e + + ebe1ecad6d09fed78f9838918bf59371e4258260347b02a3005f7c1dadfe3261 - - 62aa0438dfde70185c77edc7b512afcfc087e3b81b21edb4bd137a20a7da4f63 + + 11b534b293dbb81f93f927e276de84d9ce8df5fd9fedb7b9576cca5f80ac72ae @@ -16,13 +16,13 @@ - - + + - - + + \ No newline at end of file diff --git a/.idea/libraries/opentelemetry_extension_kotlin.xml b/.idea/libraries/opentelemetry_extension_kotlin.xml index 4ed7e7f0d962..98f156b0ebbf 100644 --- a/.idea/libraries/opentelemetry_extension_kotlin.xml +++ b/.idea/libraries/opentelemetry_extension_kotlin.xml @@ -1,18 +1,18 @@ - + - - 1552fb08aee63a94947cc5e94729bb2416ac500cd8f05c32fba4125e5d206b68 + + 1c7c509b10f32ecbe45c701aa3ce1ab5a1762853800fa43b9c18e22e2a813c27 - + - + \ No newline at end of file diff --git a/.idea/libraries/plexus_utils.xml b/.idea/libraries/plexus_utils.xml index c4443f8ad778..270afbec305f 100644 --- a/.idea/libraries/plexus_utils.xml +++ b/.idea/libraries/plexus_utils.xml @@ -1,18 +1,18 @@ - + - - 86e0255d4c879c61b4833ed7f13124e8bb679df47debb127326e7db7dd49a07b + + 270cd703b48c6e5c8c691f1875f22d62d22cfe072c73ae2f5814d83d68c1da0b - + - + \ No newline at end of file diff --git a/.idea/libraries/slf4j_jdk14.xml b/.idea/libraries/slf4j_jdk14.xml index 65abf0fdf3e5..b8e9836114a9 100644 --- a/.idea/libraries/slf4j_jdk14.xml +++ b/.idea/libraries/slf4j_jdk14.xml @@ -1,6 +1,6 @@ - + 5bf64690af4e59876b8902bb0db3dd39c686a40abfed97d3837eeeec7a2922ac diff --git a/.idea/libraries/sqlite.xml b/.idea/libraries/sqlite.xml index c78a6bd0572d..9c3f940083bf 100644 --- a/.idea/libraries/sqlite.xml +++ b/.idea/libraries/sqlite.xml @@ -1,18 +1,18 @@ - + - - a3078076bbadf5f2bd68a6f6974c2d278edfdce9ff24a2d061da8007ecf91943 + + 50524b16b649fb03f81df6e61dec69911b8849e6943c61b85faa24e49bfd98fc - + - + \ No newline at end of file diff --git a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml index 52840ba1e6e0..e9714479545e 100644 --- a/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml +++ b/aether-dependency-resolver/intellij.java.aetherDependencyResolver.iml @@ -33,10 +33,10 @@ - + - - e6842c1a2c9080e60fed7747d2375fedf7e51277a995b7c053426f68537bc9c3 + + 2402405da2a24324d5b15009c9cf65fc22a3b0d662af1533831c3b8b1ec5ceeb @@ -46,20 +46,20 @@ - + - + - + - - efe8d834e7b55c30e1e17a1a9171ffcf67915eb00c3b0f8a9b8f2bc8aa4752f8 + + 903130fb398dbedb1364cded7717ba3aa44084a1e403160cfb17e7ecbdc4e459 @@ -74,20 +74,20 @@ - + - + - + - - 273d2fe6bfe65986949d6e827794cf3ec43295af6dafe1d4186b6f3dd83c75a3 + + 36b7449dc69418d8ecb421fc06a72453980dcc56d57db3c343b16f44c797726c @@ -98,16 +98,14 @@ - + - + - - diff --git a/build/tasks/src/org/jetbrains/intellij/build/ConsoleSpanExporter.kt b/build/tasks/src/org/jetbrains/intellij/build/ConsoleSpanExporter.kt index 8fc3f233b10c..d567959e46cc 100644 --- a/build/tasks/src/org/jetbrains/intellij/build/ConsoleSpanExporter.kt +++ b/build/tasks/src/org/jetbrains/intellij/build/ConsoleSpanExporter.kt @@ -1,13 +1,13 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. @file:Suppress("ReplaceJavaStaticMethodWithKotlinAnalog", "ReplaceNegatedIsEmptyWithIsNotEmpty") package org.jetbrains.intellij.build import com.intellij.platform.diagnostic.telemetry.AsyncSpanExporter +import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.common.Attributes import io.opentelemetry.api.trace.StatusCode import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import it.unimi.dsi.fastutil.ints.IntArrayList import it.unimi.dsi.fastutil.longs.LongArrayList import org.jetbrains.annotations.Contract @@ -132,10 +132,14 @@ private fun writeValueAsHumanReadable(s: String, sb: StringBuilder) { sb.append(s) } +private val THREAD_NAME = AttributeKey.stringKey("thread.name") +private val THREAD_ID = AttributeKey.longKey("thread.id") +private val EXCEPTION_STACKTRACE = AttributeKey.stringKey("exception.stacktrace") + private fun writeAttributesAsHumanReadable(attributes: Attributes, sb: StringBuilder, writeFirstComma: Boolean) { var writeComma = writeFirstComma attributes.forEach(BiConsumer { k, v -> - if (k == SemanticAttributes.THREAD_NAME || k == SemanticAttributes.THREAD_ID) { + if (k == THREAD_NAME || k == THREAD_ID) { return@BiConsumer } @@ -148,7 +152,7 @@ private fun writeAttributesAsHumanReadable(attributes: Attributes, sb: StringBui sb.append(k.key) sb.append('=') - if (k == SemanticAttributes.EXCEPTION_STACKTRACE) { + if (k == EXCEPTION_STACKTRACE) { val delimiter = "─".repeat(79) sb.append("\n ┌") sb.append(delimiter) diff --git a/build/tasks/src/org/jetbrains/intellij/build/TraceManager.kt b/build/tasks/src/org/jetbrains/intellij/build/TraceManager.kt index 355799cebab7..537322996269 100644 --- a/build/tasks/src/org/jetbrains/intellij/build/TraceManager.kt +++ b/build/tasks/src/org/jetbrains/intellij/build/TraceManager.kt @@ -8,6 +8,7 @@ import com.intellij.platform.diagnostic.telemetry.BatchSpanProcessor import com.intellij.platform.diagnostic.telemetry.impl.JaegerJsonSpanExporter import com.intellij.platform.diagnostic.telemetry.impl.OtlpSpanExporter import com.intellij.platform.diagnostic.telemetry.impl.normalizeOtlpEndPoint +import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.common.Attributes import io.opentelemetry.api.trace.SpanBuilder import io.opentelemetry.api.trace.Tracer @@ -15,7 +16,6 @@ import io.opentelemetry.sdk.OpenTelemetrySdk import io.opentelemetry.sdk.resources.Resource import io.opentelemetry.sdk.trace.SdkTracerProvider import io.opentelemetry.sdk.trace.data.SpanData -import io.opentelemetry.semconv.resource.attributes.ResourceAttributes import kotlinx.coroutines.GlobalScope import org.jetbrains.intellij.build.dependencies.BuildDependenciesDownloader import java.io.IOException @@ -29,7 +29,7 @@ var traceManagerInitializer: () -> Tracer = { @Suppress("OPT_IN_USAGE") val tracerProvider = SdkTracerProvider.builder() .addSpanProcessor(BatchSpanProcessor(coroutineScope = GlobalScope, spanExporters = TracerProviderManager.spanExporterProvider())) - .setResource(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "builder"))) + .setResource(Resource.create(Attributes.of(AttributeKey.stringKey("service.name"), "builder"))) .build() val openTelemetry = OpenTelemetrySdk.builder() .setTracerProvider(tracerProvider) diff --git a/platform/build-scripts/dev-server/src/DevMainImpl.kt b/platform/build-scripts/dev-server/src/DevMainImpl.kt index 1d7c1feb2d42..606d3e594949 100644 --- a/platform/build-scripts/dev-server/src/DevMainImpl.kt +++ b/platform/build-scripts/dev-server/src/DevMainImpl.kt @@ -6,11 +6,11 @@ package org.jetbrains.intellij.build.devServer import com.intellij.openapi.application.PathManager import com.intellij.platform.diagnostic.telemetry.BatchSpanProcessor import com.intellij.util.childScope +import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.common.Attributes import io.opentelemetry.sdk.OpenTelemetrySdk import io.opentelemetry.sdk.resources.Resource import io.opentelemetry.sdk.trace.SdkTracerProvider -import io.opentelemetry.semconv.resource.attributes.ResourceAttributes import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.cancel import kotlinx.coroutines.runBlocking @@ -34,7 +34,7 @@ fun buildDevMain(): Collection { val tracerProvider = SdkTracerProvider.builder() .addSpanProcessor(spanProcessor) - .setResource(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "builder"))) + .setResource(Resource.create(Attributes.of(AttributeKey.stringKey("service.name"), "builder"))) .build() try { // don't use JaegerJsonSpanExporter - not needed for clients, should be enabled only if needed to avoid writing ~500KB JSON file diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/CompilationPartsUtil.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/CompilationPartsUtil.kt index 4b82db55542b..2f24cf577eb6 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/CompilationPartsUtil.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/compilation/CompilationPartsUtil.kt @@ -11,7 +11,6 @@ import io.opentelemetry.api.common.Attributes import io.opentelemetry.api.trace.Span import io.opentelemetry.api.trace.SpanBuilder import io.opentelemetry.context.Context -import io.opentelemetry.semconv.trace.attributes.SemanticAttributes import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable import kotlinx.serialization.encodeToString @@ -521,6 +520,11 @@ private data class CompilationPartsMetadata( val files: Map, ) +@PublishedApi +internal val THREAD_NAME: AttributeKey = AttributeKey.stringKey("thread.name") +@PublishedApi +internal val THREAD_ID: AttributeKey = AttributeKey.longKey("thread.id") + /** * Returns a new [ForkJoinTask] that performs the given function as its action within a trace, and returns * a null result upon [ForkJoinTask.join]. @@ -533,8 +537,8 @@ inline fun forkJoinTask(spanBuilder: SpanBuilder, crossinline operation: () val thread = Thread.currentThread() spanBuilder .setParent(context) - .setAttribute(SemanticAttributes.THREAD_NAME, thread.name) - .setAttribute(SemanticAttributes.THREAD_ID, thread.id) + .setAttribute(THREAD_NAME, thread.name) + .setAttribute(THREAD_ID, thread.id) .useWithScope { operation() } diff --git a/platform/diagnostic/telemetry-impl/src/TelemetryManagerImpl.kt b/platform/diagnostic/telemetry-impl/src/TelemetryManagerImpl.kt index 2a35b52feab3..052b16cc9872 100644 --- a/platform/diagnostic/telemetry-impl/src/TelemetryManagerImpl.kt +++ b/platform/diagnostic/telemetry-impl/src/TelemetryManagerImpl.kt @@ -15,12 +15,12 @@ import com.intellij.openapi.util.Ref import com.intellij.platform.diagnostic.telemetry.* import com.intellij.platform.diagnostic.telemetry.impl.otExporters.OpenTelemetryExporterProvider import com.intellij.util.childScope +import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.metrics.Meter import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator import io.opentelemetry.context.propagation.ContextPropagators import io.opentelemetry.sdk.OpenTelemetrySdk import io.opentelemetry.sdk.resources.Resource -import io.opentelemetry.semconv.resource.attributes.ResourceAttributes import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import org.jetbrains.annotations.ApiStatus @@ -140,9 +140,9 @@ private fun createSpanExporters(resource: Resource): List { System.getProperty("idea.diagnostic.opentelemetry.file")?.let { traceFile -> spanExporters.add(JaegerJsonSpanExporter( file = Path.of(traceFile), - serviceName = resource.getAttribute(ResourceAttributes.SERVICE_NAME)!!, - serviceVersion = resource.getAttribute(ResourceAttributes.SERVICE_VERSION), - serviceNamespace = resource.getAttribute(ResourceAttributes.SERVICE_NAMESPACE), + serviceName = resource.getAttribute(AttributeKey.stringKey("service.name"))!!, + serviceVersion = resource.getAttribute(AttributeKey.stringKey("service.version")), + serviceNamespace = resource.getAttribute(AttributeKey.stringKey("service.namespace")), )) } @@ -175,7 +175,7 @@ private fun createOpenTelemetryConfigurator(mainScope: CoroutineScope, appInfo: customResourceBuilder = { // don't write username to file - it maybe private information if (getOtlpEndPoint() != null) { - it.put(ResourceAttributes.PROCESS_OWNER, System.getProperty("user.name") ?: "unknown") + it.put(AttributeKey.stringKey("process.owner"), System.getProperty("user.name") ?: "unknown") } }, ) diff --git a/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/OpenTelemetryConfigurator.kt b/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/OpenTelemetryConfigurator.kt index 52ba1339138c..1e6869c8f9f4 100644 --- a/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/OpenTelemetryConfigurator.kt +++ b/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/OpenTelemetryConfigurator.kt @@ -6,6 +6,7 @@ import com.intellij.openapi.util.SystemInfoRt import com.intellij.platform.diagnostic.telemetry.otExporters.CsvMetricsExporter import com.intellij.util.ConcurrencyUtil import com.intellij.util.concurrency.SynchronizedClearableLazy +import io.opentelemetry.api.common.AttributeKey import io.opentelemetry.api.common.Attributes import io.opentelemetry.api.common.AttributesBuilder import io.opentelemetry.sdk.OpenTelemetrySdkBuilder @@ -13,7 +14,6 @@ import io.opentelemetry.sdk.metrics.SdkMeterProvider import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader import io.opentelemetry.sdk.resources.Resource import io.opentelemetry.sdk.trace.SdkTracerProvider -import io.opentelemetry.semconv.resource.attributes.ResourceAttributes import kotlinx.coroutines.CoroutineScope import org.jetbrains.annotations.ApiStatus import java.time.Instant @@ -33,13 +33,13 @@ class OpenTelemetryConfigurator(private val mainScope: CoroutineScope, private val metricsReportingPath = if (enableMetricsByDefault) OpenTelemetryUtils.metricsReportingPath() else null val resource: Resource = Resource.create( Attributes.builder() - .put(ResourceAttributes.SERVICE_NAME, serviceName) - .put(ResourceAttributes.SERVICE_VERSION, serviceVersion) - .put(ResourceAttributes.SERVICE_NAMESPACE, serviceNamespace) - .put(ResourceAttributes.OS_TYPE, SystemInfoRt.OS_NAME) - .put(ResourceAttributes.OS_VERSION, SystemInfoRt.OS_VERSION) - .put(ResourceAttributes.HOST_ARCH, System.getProperty("os.arch")) - .put(ResourceAttributes.SERVICE_INSTANCE_ID, DateTimeFormatter.ISO_INSTANT.format(Instant.now())) + .put(AttributeKey.stringKey("service.name"), serviceName) + .put(AttributeKey.stringKey("service.version"), serviceVersion) + .put(AttributeKey.stringKey("service.namespace"), serviceNamespace) + .put(AttributeKey.stringKey("os.type"), SystemInfoRt.OS_NAME) + .put(AttributeKey.stringKey("os.version"), SystemInfoRt.OS_VERSION) + .put(AttributeKey.stringKey("host.arch"), System.getProperty("os.arch")) + .put(AttributeKey.stringKey("service.instance.id"), DateTimeFormatter.ISO_INSTANT.format(Instant.now())) .also { customResourceBuilder?.invoke(it) }