(skywalking) branch master updated: Fix wrong environment variable name in doc (#11689)
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 0f2570a5c9 Fix wrong environment variable name in doc (#11689)
0f2570a5c9 is described below
commit 0f2570a5c9d5069b4168d8f6bc75cc3e4ed3fcf3
Author: kezhenxu94
AuthorDate: Sat Dec 23 11:28:03 2023 +0800
Fix wrong environment variable name in doc (#11689)
---
docs/en/setup/backend/storages/elasticsearch.md | 4 ++--
tools/profile-exporter/application.yml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/en/setup/backend/storages/elasticsearch.md
b/docs/en/setup/backend/storages/elasticsearch.md
index efe056297a..c4822e56bb 100644
--- a/docs/en/setup/backend/storages/elasticsearch.md
+++ b/docs/en/setup/backend/storages/elasticsearch.md
@@ -95,8 +95,8 @@ storage:
user: ${SW_ES_USER:""} # User needs to be set when Http Basic
authentication is enabled
password: ${SW_ES_PASSWORD:""} # Password to be set when Http Basic
authentication is enabled
clusterNodes: ${SW_STORAGE_ES_CLUSTER_NODES:localhost:443}
-trustStorePath: ${SW_SW_STORAGE_ES_SSL_JKS_PATH:"../es_keystore.jks"}
-trustStorePass: ${SW_SW_STORAGE_ES_SSL_JKS_PASS:""}
+trustStorePath: ${SW_STORAGE_ES_SSL_JKS_PATH:"../es_keystore.jks"}
+trustStorePass: ${SW_STORAGE_ES_SSL_JKS_PASS:""}
protocol: ${SW_STORAGE_ES_HTTP_PROTOCOL:"https"}
...
```
diff --git a/tools/profile-exporter/application.yml
b/tools/profile-exporter/application.yml
index f03d319dd7..de6a5963ee 100644
--- a/tools/profile-exporter/application.yml
+++ b/tools/profile-exporter/application.yml
@@ -21,8 +21,8 @@ storage:
namespace: ${SW_NAMESPACE:""}
clusterNodes: ${SW_STORAGE_ES_CLUSTER_NODES:localhost:9200}
protocol: ${SW_STORAGE_ES_HTTP_PROTOCOL:"http"}
-#trustStorePath: ${SW_SW_STORAGE_ES_SSL_JKS_PATH:"../es_keystore.jks"}
-#trustStorePass: ${SW_SW_STORAGE_ES_SSL_JKS_PASS:""}
+#trustStorePath: ${SW_STORAGE_ES_SSL_JKS_PATH:"../es_keystore.jks"}
+#trustStorePass: ${SW_STORAGE_ES_SSL_JKS_PASS:""}
user: ${SW_ES_USER:""}
password: ${SW_ES_PASSWORD:""}
dayStep: ${SW_STORAGE_DAY_STEP:1} # Represent the number of days in the
one minute/hour/day index.
(skywalking) branch kezhenxu94-patch-1 deleted (was 3b5f240c72)
This is an automated email from the ASF dual-hosted git repository. wusheng pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git was 3b5f240c72 Update application.yml 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] Fix wrong environment variable name in doc [skywalking]
wu-sheng merged PR #11689: URL: https://github.com/apache/skywalking/pull/11689 -- 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] Fix wrong environment variable name in doc [skywalking]
kezhenxu94 opened a new pull request, #11689: URL: https://github.com/apache/skywalking/pull/11689 - [ ] If this pull request closes/resolves/fixes an existing issue, replace the issue number. Closes #. - [ ] Update the [`CHANGES` log](https://github.com/apache/skywalking/blob/master/docs/en/changes/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
(skywalking) branch kezhenxu94-patch-1 updated: Update application.yml
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch kezhenxu94-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/kezhenxu94-patch-1 by this
push:
new 3b5f240c72 Update application.yml
3b5f240c72 is described below
commit 3b5f240c72e185ce01beaea183f28f74055d31bd
Author: kezhenxu94
AuthorDate: Sat Dec 23 10:55:55 2023 +0800
Update application.yml
---
tools/profile-exporter/application.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/profile-exporter/application.yml
b/tools/profile-exporter/application.yml
index f03d319dd7..de6a5963ee 100644
--- a/tools/profile-exporter/application.yml
+++ b/tools/profile-exporter/application.yml
@@ -21,8 +21,8 @@ storage:
namespace: ${SW_NAMESPACE:""}
clusterNodes: ${SW_STORAGE_ES_CLUSTER_NODES:localhost:9200}
protocol: ${SW_STORAGE_ES_HTTP_PROTOCOL:"http"}
-#trustStorePath: ${SW_SW_STORAGE_ES_SSL_JKS_PATH:"../es_keystore.jks"}
-#trustStorePass: ${SW_SW_STORAGE_ES_SSL_JKS_PASS:""}
+#trustStorePath: ${SW_STORAGE_ES_SSL_JKS_PATH:"../es_keystore.jks"}
+#trustStorePass: ${SW_STORAGE_ES_SSL_JKS_PASS:""}
user: ${SW_ES_USER:""}
password: ${SW_ES_PASSWORD:""}
dayStep: ${SW_STORAGE_DAY_STEP:1} # Represent the number of days in the
one minute/hour/day index.
(skywalking) branch kezhenxu94-patch-1 created (now 20e46481b4)
This is an automated email from the ASF dual-hosted git repository. kezhenxu94 pushed a change to branch kezhenxu94-patch-1 in repository https://gitbox.apache.org/repos/asf/skywalking.git at 20e46481b4 Fix wrong environment variable name in doc This branch includes the following new commits: new 20e46481b4 Fix wrong environment variable name in doc The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(skywalking) 01/01: Fix wrong environment variable name in doc
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch kezhenxu94-patch-1
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 20e46481b4c137400a74b52323c78368b652e035
Author: kezhenxu94
AuthorDate: Sat Dec 23 10:54:35 2023 +0800
Fix wrong environment variable name in doc
---
docs/en/setup/backend/storages/elasticsearch.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/en/setup/backend/storages/elasticsearch.md
b/docs/en/setup/backend/storages/elasticsearch.md
index efe056297a..c4822e56bb 100644
--- a/docs/en/setup/backend/storages/elasticsearch.md
+++ b/docs/en/setup/backend/storages/elasticsearch.md
@@ -95,8 +95,8 @@ storage:
user: ${SW_ES_USER:""} # User needs to be set when Http Basic
authentication is enabled
password: ${SW_ES_PASSWORD:""} # Password to be set when Http Basic
authentication is enabled
clusterNodes: ${SW_STORAGE_ES_CLUSTER_NODES:localhost:443}
-trustStorePath: ${SW_SW_STORAGE_ES_SSL_JKS_PATH:"../es_keystore.jks"}
-trustStorePass: ${SW_SW_STORAGE_ES_SSL_JKS_PASS:""}
+trustStorePath: ${SW_STORAGE_ES_SSL_JKS_PATH:"../es_keystore.jks"}
+trustStorePass: ${SW_STORAGE_ES_SSL_JKS_PASS:""}
protocol: ${SW_STORAGE_ES_HTTP_PROTOCOL:"https"}
...
```
Re: [PR] feature: add support for OPA policy files [skywalking-eyes]
wu-sheng merged PR #174: URL: https://github.com/apache/skywalking-eyes/pull/174 -- 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] feature: add support for OPA policy files [skywalking-eyes]
spacewander opened a new pull request, #174: URL: https://github.com/apache/skywalking-eyes/pull/174 (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
(skywalking-java) branch main updated: Fix re-transform bug when enhanced class proxy parent method (#659)
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 4f2f81e181 Fix re-transform bug when enhanced class proxy parent
method (#659)
4f2f81e181 is described below
commit 4f2f81e1819755d0d18d1453297142f0a7b0416a
Author: Gong Dewei
AuthorDate: Sat Dec 23 00:01:30 2023 +0800
Fix re-transform bug when enhanced class proxy parent method (#659)
---
CHANGES.md | 2 +-
.../skywalking/apm/agent/SkyWalkingAgent.java | 37 +---
.../jedis-plugins/jedis-2.x-3.x-plugin/pom.xml | 6 ++
.../apm/agent/JedisInstrumentationTest.java| 83 +
.../agent/builder/SWDescriptionStrategy.java | 69 ++
.../bytebuddy/SWMethodGraphCompilerDelegate.java | 103 +
6 files changed, 266 insertions(+), 34 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 738f67abc7..1ec8ba392b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ Release Notes.
* Fix NoSuchMethodError in mvc-annotation-commons and change deprecated method.
* fix forkjoinpool plugin in JDK11。
* Support for tracing spring-cloud-gateway 4.x in gateway-4.x-plugin.
-
+* Fix re-transform bug when plugin enhanced class proxy parent method.
Documentation
diff --git
a/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
b/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
index 19a0bb891b..2dd3fe8b38 100644
---
a/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
+++
b/apm-sniffer/apm-agent/src/main/java/org/apache/skywalking/apm/agent/SkyWalkingAgent.java
@@ -32,12 +32,14 @@ import net.bytebuddy.agent.builder.SWNativeMethodStrategy;
import net.bytebuddy.description.NamedElement;
import net.bytebuddy.description.type.TypeDescription;
import net.bytebuddy.dynamic.DynamicType;
+import net.bytebuddy.dynamic.scaffold.MethodGraph;
import net.bytebuddy.dynamic.scaffold.TypeValidation;
import org.apache.skywalking.apm.agent.bytebuddy.SWAuxiliaryTypeNamingStrategy;
import net.bytebuddy.implementation.SWImplementationContextFactory;
import net.bytebuddy.matcher.ElementMatcher;
import net.bytebuddy.matcher.ElementMatchers;
import net.bytebuddy.utility.JavaModule;
+import org.apache.skywalking.apm.agent.bytebuddy.SWMethodGraphCompilerDelegate;
import org.apache.skywalking.apm.agent.bytebuddy.SWMethodNameTransformer;
import org.apache.skywalking.apm.agent.core.boot.AgentPackageNotFoundException;
import org.apache.skywalking.apm.agent.core.boot.ServiceManager;
@@ -99,6 +101,23 @@ public class SkyWalkingAgent {
return;
}
+try {
+installClassTransformer(instrumentation, pluginFinder);
+} catch (Exception e) {
+LOGGER.error(e, "Skywalking agent installed class transformer
failure.");
+}
+
+try {
+ServiceManager.INSTANCE.boot();
+} catch (Exception e) {
+LOGGER.error(e, "Skywalking agent boot failure.");
+}
+
+Runtime.getRuntime()
+ .addShutdownHook(new Thread(ServiceManager.INSTANCE::shutdown,
"skywalking service shutdown thread"));
+}
+
+static void installClassTransformer(Instrumentation instrumentation,
PluginFinder pluginFinder) throws Exception {
LOGGER.info("Skywalking agent begin to install transformer ...");
AgentBuilder agentBuilder = newAgentBuilder().ignore(
@@ -116,15 +135,13 @@ public class SkyWalkingAgent {
try {
agentBuilder = BootstrapInstrumentBoost.inject(pluginFinder,
instrumentation, agentBuilder, edgeClasses);
} catch (Exception e) {
-LOGGER.error(e, "SkyWalking agent inject bootstrap instrumentation
failure. Shutting down.");
-return;
+throw new Exception("SkyWalking agent inject bootstrap
instrumentation failure. Shutting down.", e);
}
try {
agentBuilder = JDK9ModuleExporter.openReadEdge(instrumentation,
agentBuilder, edgeClasses);
} catch (Exception e) {
-LOGGER.error(e, "SkyWalking agent open read edge in JDK 9+
failure. Shutting down.");
-return;
+throw new Exception("SkyWalking agent open read edge in JDK 9+
failure. Shutting down.", e);
}
agentBuilder.type(pluginFinder.buildMatch())
@@ -137,15 +154,6 @@ public class SkyWalkingAgent {
PluginFinder.pluginInitCompleted();
LOGGER.info("Skywalking agent transformer has installed.");
-
-try {
-ServiceManager.INSTANCE.boot();
-} catch (Exception e) {
-LOGGER.error(e, "Skywalking agent boot failure.");
-}
-
-Runtime.getRuntime()
-
Re: [I] [Bug] SkyWalking Java Agent failed to work with Arthas in some cases [skywalking]
wu-sheng closed issue #11651: [Bug] SkyWalking Java Agent failed to work with Arthas in some cases URL: https://github.com/apache/skywalking/issues/11651 -- 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 re-transform bug when enhanced class proxy parent method [skywalking-java]
wu-sheng merged PR #659: URL: https://github.com/apache/skywalking-java/pull/659 -- 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 error in re-transforming the jedis class [skywalking-java]
wu-sheng commented on PR #659: URL: https://github.com/apache/skywalking-java/pull/659#issuecomment-1867629502 If that is the case, let's keep the test in the Jedis plugin. But let's make changes.md and PR title accurate. -- 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 error in re-transforming the jedis class [skywalking-java]
kylixs commented on PR #659: URL: https://github.com/apache/skywalking-java/pull/659#issuecomment-1867620613 > @kylixs Is this possible to makes tests in agent module, rather than Jedis? > > And we need to fix change logs, this is not a Jedis fix, but a retransform enhancement, and Arthes compatible fix I prefer to do a separate module ( agent-retransform-tests ), because there are a lot of plugin-related dependencies. The downside is that we need to maintain some associated dependencies when the plug-in changes. -- 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 error in re-transforming the jedis class [skywalking-java]
kylixs commented on PR #659: URL: https://github.com/apache/skywalking-java/pull/659#issuecomment-1867615035 > Submitted here [alibaba/arthas#2774](https://github.com/alibaba/arthas/issues/2774) Fixed: https://github.com/alibaba/arthas/pull/2775 -- 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] skywalking agent [skywalking]
wu-sheng commented on issue #11675: URL: https://github.com/apache/skywalking/issues/11675#issuecomment-1867507853 That is why your codes could be traced and monitored. Your codes are changed by the agent. -- 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] skywalking agent [skywalking]
wangkang4 commented on issue #11675: URL: https://github.com/apache/skywalking/issues/11675#issuecomment-1867478079 > > > > Hello, does skywalking support arthas' retransform command? After the configuration of agent.is_cache_enhanced_class and agent.class_cache_mode is enabled, the redefine command is successfully executed, but the retransform command fails. Using the jad command, you found that skywalking added properties and methods to the class. > > > > > > > > > IIRC, IS_CACHE_ENHANCED_CLASS flag has been removed since SkyWalking Agent 9.0 > > > > > > How to modify skywalking javaagent to support arthas hot load class command, is there a case code? > > As you may notice in [apache/skywalking-java#659](https://github.com/apache/skywalking-java/pull/659), we are still working on this topic. I suppose after that PR, we may stabilize this feature. > > Feel free to test [this PR](https://github.com/apache/skywalking-java/pull/659) for your use cases. Feedback is welcome. 为什么使用skywalking的javaagent会生成很多带有$的类？使用arthas的trace命令查看调用链，发现执行的都是那些生成的代理类.   -- 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 error in re-transforming the jedis class [skywalking-java]
wu-sheng commented on PR #659: URL: https://github.com/apache/skywalking-java/pull/659#issuecomment-1867468441 @kylixs Is this possible to makes tests in agent module, rather than Jedis? And we need to fix change logs, this is not a Jedis fix, but a retransform enhancement, and Arthes compatible fix -- 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 error in re-transforming the jedis class [skywalking-java]
lujiajing1126 commented on PR #659: URL: https://github.com/apache/skywalking-java/pull/659#issuecomment-1867459147 > Could someone submit a ticket to Arthas? I think they could know this quickly as this is just a diff between versions. Submitted here https://github.com/alibaba/arthas/issues/2774 -- 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 error in re-transforming the jedis class [skywalking-java]
wu-sheng commented on PR #659: URL: https://github.com/apache/skywalking-java/pull/659#issuecomment-1867445744 Could someone submit a ticket to Arthas? I think they could know this quickly as this is just a diff between versions. -- 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 error in re-transforming the jedis class [skywalking-java]
lujiajing1126 commented on PR #659: URL: https://github.com/apache/skywalking-java/pull/659#issuecomment-1867420001 After discussing with @kylixs, we've confirmed that this PR works well with Arthas 3.6.7, but not versions > 3.6.7 (including 3.7.1, 3.6.8 etc.) -- 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] Apache Skywalking for serverless architecture [skywalking]
ssvssv commented on issue #7253: URL: https://github.com/apache/skywalking/issues/7253#issuecomment-1867365877 Shall I configure Apache Skywalking for monitoring AWS ECS fargate? -- 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
