Re: [I] [Feature] Support for Auto-Injection of traceId in JsonLayout for log4j2 [skywalking]
wu-sheng closed issue #11361: [Feature] Support for Auto-Injection of traceId in JsonLayout for log4j2 URL: https://github.com/apache/skywalking/issues/11361 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Feature] Support for Auto-Injection of traceId in JsonLayout for log4j2 [skywalking]
wu-sheng commented on issue #11361: URL: https://github.com/apache/skywalking/issues/11361#issuecomment-1761395481 No update in 2 weeks. This seems a feature suggestion only. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [Bug] oracle lower case tns url parse err [skywalking]
wu-sheng closed issue #11399: [Bug] oracle lower case tns url parse err URL: https://github.com/apache/skywalking/issues/11399 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[skywalking] branch master updated: test: fix ES disk insufficient in test (#11406)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking.git The following commit(s) were added to refs/heads/master by this push: new 0bbdd376b2 test: fix ES disk insufficient in test (#11406) 0bbdd376b2 is described below commit 0bbdd376b21027e179dd75be9d20be0aabb3ebee Author: kezhenxu94 AuthorDate: Fri Oct 13 19:42:48 2023 +0800 test: fix ES disk insufficient in test (#11406) --- .github/workflows/skywalking.yaml | 40 +++--- .../analysis/manual/segment/SegmentRecord.java | 2 +- test/e2e-v2/cases/istio/values.yaml| 11 -- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index 3f5b684085..bfb1b97bcb 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -539,26 +539,26 @@ jobs: - name: Kafka Log config: test/e2e-v2/cases/kafka/log/e2e.yaml - # - name: Istio Metrics Service 1.15.0 - # config: test/e2e-v2/cases/istio/metrics/e2e.yaml - # env: | - # ISTIO_VERSION=1.15.0 - # KUBERNETES_VERSION=25 - # - name: Istio Metrics Service 1.16.0 - # config: test/e2e-v2/cases/istio/metrics/e2e.yaml - # env: | - # ISTIO_VERSION=1.16.0 - # KUBERNETES_VERSION=25 - # - name: Istio Metrics Service 1.17.0 - # config: test/e2e-v2/cases/istio/metrics/e2e.yaml - # env: | - # ISTIO_VERSION=1.17.0 - # KUBERNETES_VERSION=25 - # - name: Istio Metrics Service 1.18.0 - # config: test/e2e-v2/cases/istio/metrics/e2e.yaml - # env: | - # ISTIO_VERSION=1.18.0 - # KUBERNETES_VERSION=25 + - name: Istio Metrics Service 1.15.0 +config: test/e2e-v2/cases/istio/metrics/e2e.yaml +env: | + ISTIO_VERSION=1.15.0 + KUBERNETES_VERSION=25 + - name: Istio Metrics Service 1.16.0 +config: test/e2e-v2/cases/istio/metrics/e2e.yaml +env: | + ISTIO_VERSION=1.16.0 + KUBERNETES_VERSION=25 + - name: Istio Metrics Service 1.17.0 +config: test/e2e-v2/cases/istio/metrics/e2e.yaml +env: | + ISTIO_VERSION=1.17.0 + KUBERNETES_VERSION=25 + - name: Istio Metrics Service 1.18.0 +config: test/e2e-v2/cases/istio/metrics/e2e.yaml +env: | + ISTIO_VERSION=1.18.0 + KUBERNETES_VERSION=25 - name: Rover with Istio Process 1.15.0 config: test/e2e-v2/cases/rover/process/istio/e2e.yaml diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java index e33adbaee0..d07f6842d6 100644 --- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java +++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/manual/segment/SegmentRecord.java @@ -37,7 +37,7 @@ import org.apache.skywalking.oap.server.core.storage.type.StorageBuilder; import java.util.List; -import static org.apache.skywalking.oap.server.core.analysis.record.Record.TIME_BUCKET; +import static org.apache.skywalking.oap.server.core.storage.StorageData.TIME_BUCKET; @SuperDataset @Stream(name = SegmentRecord.INDEX_NAME, scopeId = DefaultScopeDefine.SEGMENT, builder = SegmentRecord.Builder.class, processor = RecordStreamProcessor.class) diff --git a/test/e2e-v2/cases/istio/values.yaml b/test/e2e-v2/cases/istio/values.yaml index 02048abbad..8b42ad4765 100644 --- a/test/e2e-v2/cases/istio/values.yaml +++ b/test/e2e-v2/cases/istio/values.yaml @@ -22,6 +22,11 @@ oap: elasticsearch: esConfig: elasticsearch.yml: | - cluster.routing.allocation.disk.watermark.low: 90% - cluster.routing.allocation.disk.watermark.high: 99% - cluster.routing.allocation.disk.watermark.flood_stage: 99% \ No newline at end of file + cluster.routing.allocation.disk.threshold_enabled: false + volumeClaimTemplate: +accessModes: [ "ReadWriteOnce" ] +resources: + requests: +storage: 2Gi + persistence: +enabled: true
[skywalking] branch test/e2e/istio deleted (was f908de76bc)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch test/e2e/istio in repository https://gitbox.apache.org/repos/asf/skywalking.git was f908de76bc test: fix ES disk insufficient in test The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] test: fix ES disk insufficient in test [skywalking]
wu-sheng merged PR #11406: URL: https://github.com/apache/skywalking/pull/11406 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[skywalking-website] branch asf-site updated: deploy: 4e09d232662637ff21c0e9d6b5053ab2a9062d4b
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/skywalking-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 79df1f68aa8 deploy: 4e09d232662637ff21c0e9d6b5053ab2a9062d4b 79df1f68aa8 is described below commit 79df1f68aa8a464eb32e6f3514709b89fb8d4845 Author: wu-sheng AuthorDate: Fri Oct 13 10:05:37 2023 + deploy: 4e09d232662637ff21c0e9d6b5053ab2a9062d4b --- .../next/en/contribution/compiling/index.html | 2 +- .../en/contribution/release-java-agent/index.html | 2 +- .../next/en/faq/ext-dirs/index.html| 2 +- docs/skywalking-java/next/en/faq/osgi/index.html | 2 +- .../java-agent/advanced-features/index.html| 2 +- .../java-agent/advanced-reporters/index.html | 2 +- .../kotlin-coroutine-plugin/index.html | 2 +- .../oracle-resin-plugins/index.html| 2 +- .../spring-annotation-plugin/index.html| 2 +- .../trace-ignore-plugin/index.html | 2 +- .../application-toolkit-dependency/index.html | 2 +- .../application-toolkit-kafka/index.html | 2 +- .../application-toolkit-log4j-1.x/index.html | 2 +- .../application-toolkit-log4j-2.x/index.html | 2 +- .../application-toolkit-logback-1.x/index.html | 2 +- .../application-toolkit-meter/index.html | 2 +- .../application-toolkit-micrometer-1.10/index.html | 2 +- .../application-toolkit-micrometer/index.html | 2 +- .../index.html | 2 +- .../index.html | 2 +- .../index.html | 2 +- .../index.html | 2 +- .../application-toolkit-trace/index.html | 2 +- .../application-toolkit-tracer/index.html | 2 +- .../application-toolkit-webflux/index.html | 2 +- .../java-agent/bootstrap-plugins/index.html| 2 +- .../java-agent/configuration-discovery/index.html | 2 +- .../java-agent/configurations/index.html | 2 +- .../java-agent/containerization/index.html | 2 +- .../java-agent/customize-enhance-trace/index.html | 2 +- .../java-agent/how-to-disable-plugin/index.html| 2 +- .../how-to-tolerate-exceptions/index.html | 2 +- .../java-plugin-development-guide/index.html | 4 +- .../java-agent/logic-endpoint/index.html | 2 +- .../java-agent/opentracing/index.html | 2 +- .../java-agent/optional-plugins/index.html | 2 +- .../java-agent/plugin-list/index.html | 2 +- .../java-agent/plugin-test/index.html | 26 - .../service-agent/java-agent/readme/index.html | 2 +- .../java-agent/setting-override/index.html | 2 +- .../java-agent/specified-agent-config/index.html | 2 +- .../java-agent/supported-list/index.html | 2 +- .../setup/service-agent/java-agent/tls/index.html | 4 +- .../service-agent/java-agent/token-auth/index.html | 2 +- docs/skywalking-java/next/readme/index.html| 2 +- index.html | 2 +- index.json | 2 +- team/index.html| 67 +++--- 48 files changed, 96 insertions(+), 93 deletions(-) diff --git a/docs/skywalking-java/next/en/contribution/compiling/index.html b/docs/skywalking-java/next/en/contribution/compiling/index.html index e8773d1acfe..374ef0468de 100644 --- a/docs/skywalking-java/next/en/contribution/compiling/index.html +++ b/docs/skywalking-java/next/en/contribution/compiling/index.html @@ -742,7 +742,7 @@ if (!doNotTrack) { })() - Commit Id: c2fe67b + Commit Id: 6c4af4e diff --git a/docs/skywalking-java/next/en/contribution/release-java-agent/index.html b/docs/skywalking-java/next/en/contribution/release-java-agent/index.html index 9556dab813c..2d2541753fb 100644 --- a/docs/skywalking-java/next/en/contribution/release-java-agent/index.html +++ b/docs/skywalking-java/next/en/contribution/release-java-agent/index.html @@ -742,7 +742,7 @@ if (!doNotTrack) { })() - Commit Id: c2fe67b + Commit Id: 6c4af4e diff --git a/docs/skywalking-java/next/en/faq/ext-dirs/index.html b/docs/skywalking-java/next/en/faq/ext-dirs/index.html index 620f1daa3a4..b1b8ed3085b 100644 --- a/docs/skywalking-java/next/en/faq/ext-dirs/index.html +++ b/docs/skywalking-java/next/en/faq/ext-dirs/index.html @@ -736,7 +736,7 @@ if (!doNotTrack) { })() - Commit Id: c2fe67b + Commit Id: 6c4af4e diff --git a/docs/skywalking-java/next/en/faq/osgi/index.html b/docs/skywalking-java/next/en/faq/osgi/index.
Re: [PR] Fix oracle lower case tns url parse error. (#11399) [skywalking-java]
wu-sheng commented on PR #621: URL: https://github.com/apache/skywalking-java/pull/621#issuecomment-1761247400 The whole https://www.caucho.com is down. I am not sure. Merged your PR. It should not be your concern. Thanks for your contribution. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[skywalking-java] branch main updated: Fix oracle lower case tns url parse error. (#11399) (#621)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/skywalking-java.git The following commit(s) were added to refs/heads/main by this push: new 6c4af4e7d1 Fix oracle lower case tns url parse error. (#11399) (#621) 6c4af4e7d1 is described below commit 6c4af4e7d10dcda5b7c16de13356ef8b5cdb7f40 Author: 抹布先生M AuthorDate: Fri Oct 13 17:44:56 2023 +0800 Fix oracle lower case tns url parse error. (#11399) (#621) --- CHANGES.md | 1 + .../jdbc/connectionurl/parser/OracleURLParser.java | 42 +- .../jdbc/connectionurl/parser/URLParserTest.java | 8 + 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4ce56aabea..d34b14f914 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,7 @@ Release Notes. * Add max length configurations in `agent.config` file for service_name and instance_name * Optimize spring-cloud-gateway 2.1.x, 3.x witness class. * Support report MongoDB instance info in Mongodb 4.x plugin. +* To compatible upper and lower case Oracle TNS url parse. Documentation diff --git a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/OracleURLParser.java b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/OracleURLParser.java index 9c14d40ce5..e8af5cea54 100644 --- a/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/OracleURLParser.java +++ b/apm-sniffer/apm-sdk-plugin/jdbc-commons/src/main/java/org/apache/skywalking/apm/plugin/jdbc/connectionurl/parser/OracleURLParser.java @@ -18,12 +18,13 @@ package org.apache.skywalking.apm.plugin.jdbc.connectionurl.parser; -import java.util.ArrayList; -import java.util.List; import org.apache.skywalking.apm.network.trace.component.ComponentsDefine; import org.apache.skywalking.apm.plugin.jdbc.trace.ConnectionInfo; import org.apache.skywalking.apm.util.StringUtil; +import java.util.ArrayList; +import java.util.List; + /** * {@link OracleURLParser} presents that how to parse oracle connection url. * @@ -36,9 +37,16 @@ public class OracleURLParser extends AbstractURLParser { private static final int DEFAULT_PORT = 1521; public static final String SERVICE_NAME_FLAG = "@//"; public static final String TNSNAME_URL_FLAG = "DESCRIPTION"; +public static final String SERVICE_NAME_FIELD = "SERVICE_NAME"; +public static final String HOST_FIELD = "HOST"; +public static final String PORT_FIELD = "PORT"; + +// only use to indexOf TNS url keyword +private final String upperUrl; public OracleURLParser(String url) { super(url); +upperUrl = url == null ? null : url.toUpperCase(); } @Override @@ -63,24 +71,24 @@ public class OracleURLParser extends AbstractURLParser { @Override protected URLLocation fetchDatabaseNameIndexRange() { int hostLabelStartIndex; -int hostLabelEndIndex = url.length(); +int hostLabelEndIndex = upperUrl.length(); if (isServiceNameURL()) { -hostLabelStartIndex = url.lastIndexOf("/") + 1; +hostLabelStartIndex = upperUrl.lastIndexOf("/") + 1; } else if (isTNSNameURL()) { -hostLabelStartIndex = url.indexOf("=", url.indexOf("SERVICE_NAME")) + 1; -hostLabelEndIndex = url.indexOf(")", hostLabelStartIndex); +hostLabelStartIndex = upperUrl.indexOf("=", upperUrl.indexOf(SERVICE_NAME_FIELD)) + 1; +hostLabelEndIndex = upperUrl.indexOf(")", hostLabelStartIndex); } else { -hostLabelStartIndex = url.lastIndexOf(":") + 1; +hostLabelStartIndex = upperUrl.lastIndexOf(":") + 1; } return new URLLocation(hostLabelStartIndex, hostLabelEndIndex); } private boolean isServiceNameURL() { -return url.contains(SERVICE_NAME_FLAG); +return upperUrl.contains(SERVICE_NAME_FLAG); } private boolean isTNSNameURL() { -return url.contains(TNSNAME_URL_FLAG); +return upperUrl.contains(TNSNAME_URL_FLAG); } @Override @@ -110,23 +118,23 @@ public class OracleURLParser extends AbstractURLParser { } private String parseDatabaseHostsFromURL() { -int beginIndex = url.indexOf("DESCRIPTION"); +int beginIndex = upperUrl.indexOf(TNSNAME_URL_FLAG); List hosts = new ArrayList(); do { -int hostStartIndex = url.indexOf("HOST", beginIndex); +int hostStartIndex = upperUrl.indexOf(HOST_FIELD, beginIndex); if (hostStartIndex == -1) { break; } -int equalStartIndex = url.indexOf("=", hostStartIndex); -int hostEndIndex = url.indexOf(")", ho
Re: [PR] Fix oracle lower case tns url parse error. (#11399) [skywalking-java]
wu-sheng merged PR #621: URL: https://github.com/apache/skywalking-java/pull/621 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix oracle lower case tns url parse error. (#11399) [skywalking-java]
Builder34 commented on PR #621: URL: https://github.com/apache/skywalking-java/pull/621#issuecomment-1761142228 I am not sure; it cannot be accessed, and no new accessible address was found. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix oracle lower case tns url parse error. (#11399) [skywalking-java]
wu-sheng commented on PR #621: URL: https://github.com/apache/skywalking-java/pull/621#issuecomment-1761125885 Is the website changed? Or it is just down? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Fix oracle lower case tns url parse error. (#11399) [skywalking-java]
Builder34 commented on PR #621: URL: https://github.com/apache/skywalking-java/pull/621#issuecomment-1761123586 https://www.caucho.com/resin-4.0/ dead Link check failed,do i need fix it ? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support collect ZGC memory pool metrics [skywalking-java]
wu-sheng commented on code in PR #622: URL: https://github.com/apache/skywalking-java/pull/622#discussion_r1357862831 ## apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/memorypool/ZGCCollectorModule.java: ## @@ -0,0 +1,70 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package org.apache.skywalking.apm.agent.core.jvm.memorypool; + +import org.apache.skywalking.apm.network.language.agent.v3.MemoryPool; +import org.apache.skywalking.apm.network.language.agent.v3.PoolType; + +import java.lang.management.MemoryPoolMXBean; +import java.lang.management.MemoryUsage; +import java.util.LinkedList; +import java.util.List; + +public class ZGCCollectorModule implements MemoryPoolMetricsAccessor { + +private final List beans; + +public ZGCCollectorModule(List beans) { +this.beans = beans; +} + +@Override +public List getMemoryPoolMetricsList() { +List poolList = new LinkedList<>(); +for (MemoryPoolMXBean bean : beans) { +String name = bean.getName(); +PoolType type; +if (name.equals("ZHeap")) { +type = PoolType.ZHEAP_USAGE; +} else if (name.equals("Metaspace")) { +type = PoolType.METASPACE_USAGE; +} else if (name.equals("Compressed Class Space")) { +type = PoolType.COMPRESSED_CLASS_SPACE_USAGE; +} else if (name.equals("CodeHeap 'non-nmethods'")) { Review Comment: Is the single quote from official definition? It is strange to read. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Support collect ZGC memory pool metrics [skywalking-java]
wu-sheng commented on PR #622: URL: https://github.com/apache/skywalking-java/pull/622#issuecomment-1761028716 So, this relies on the protocol update. Java 9.1 can't release before OAP 9.7, right? And do we expect UI setting change? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Support collect ZGC memory pool metrics [skywalking-data-collect-protocol]
Z-Beatles opened a new pull request, #86: URL: https://github.com/apache/skywalking-data-collect-protocol/pull/86 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Support collect ZGC memory pool metrics [skywalking-java]
Z-Beatles opened a new pull request, #622: URL: https://github.com/apache/skywalking-java/pull/622 - [ ] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #. - [x] Update the [`CHANGES` log](https://github.com/apache/skywalking-java/blob/main/CHANGES.md). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@skywalking.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org