Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
TangoParser
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango devices
Calculation
TangoParser
Commits
86ac9dd1
Commit
86ac9dd1
authored
3 months ago
by
Alexandre TISON
Browse files
Options
Downloads
Patches
Plain Diff
Testing with OpenTelemetry
parent
a89d15d3
No related branches found
No related tags found
1 merge request
!2
JTango10: DevInfo & Telemetry upgrade
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/fr/soleil/tango/parser/AJepParser.java
+46
-25
46 additions, 25 deletions
src/main/java/fr/soleil/tango/parser/AJepParser.java
with
46 additions
and
25 deletions
src/main/java/fr/soleil/tango/parser/AJepParser.java
+
46
−
25
View file @
86ac9dd1
...
...
@@ -9,6 +9,7 @@ import java.util.Map;
import
java.util.concurrent.locks.Lock
;
import
java.util.concurrent.locks.ReentrantLock
;
import
fr.esrf.TangoApi.telemetry.*
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
org.lsmp.djep.vectorJep.Dimensions
;
...
...
@@ -26,6 +27,7 @@ import org.nfunk.jep.SymbolTable;
import
org.nfunk.jep.Variable
;
import
org.slf4j.Logger
;
import
org.slf4j.LoggerFactory
;
import
org.tango.server.ServerManager
;
import
org.tango.utils.CaseInsensitiveMap
;
import
org.tango.utils.DevFailedUtils
;
...
...
@@ -67,6 +69,7 @@ import fr.soleil.tango.parser.function.spectrum.VSinus;
public
abstract
class
AJepParser
{
private
Logger
logger
=
LoggerFactory
.
getLogger
(
AJepParser
.
class
);
private
final
OpenTelemetry
openTelemetry
;
/**
* Use in throw DevFailed
*/
...
...
@@ -103,6 +106,14 @@ public abstract class AJepParser {
this
.
constants
=
constants
;
this
.
dataSource
=
dataSource
;
this
.
openTelemetry
=
new
OpenTelemetry
(
deviceName
);
this
.
openTelemetry
.
setTangoDeviceName
(
deviceName
);
this
.
openTelemetry
.
setTangoProcessId
(
ServerManager
.
getInstance
().
getPid
());
this
.
openTelemetry
.
setTangoHostName
(
ServerManager
.
getInstance
().
getHostName
());
this
.
openTelemetry
.
setTangoServerName
(
ServerManager
.
getInstance
().
getServerName
());
this
.
openTelemetry
.
setTangoProcessKind
(
EProcessKind
.
SERVER
);
this
.
openTelemetry
.
init
();
jep
=
new
VectorJep
();
jep
.
addStandardFunctions
();
jep
.
addStandardConstants
();
...
...
@@ -254,6 +265,9 @@ public abstract class AJepParser {
locker
.
lock
();
}
try
{
TangoContext
ctx
=
openTelemetry
.
handleServer
();
TangoSpan
span
=
ctx
.
buildSpan
(
"getValue (Eq)"
,
sourceName
,
expressions
);
// static Method ?
try
(
TangoScope
scope
=
span
.
makeCurrent
())
{
// get results for tango attributes
for
(
final
String
variableName
:
variables
.
values
())
{
if
(!
tangoVariable
.
containsKey
(
variableName
))
{
...
...
@@ -284,6 +298,13 @@ public abstract class AJepParser {
Object
lastWriteResult
=
parse
(
name
,
expressions
);
lastWriteResult
=
fromJepToStandardType
(
lastWriteResult
);
return
lastWriteResult
;
}
catch
(
final
Exception
e
)
{
span
.
recordException
(
e
);
throw
DevFailedUtils
.
newDevFailed
(
e
);
}
finally
{
span
.
end
();
}
}
finally
{
if
(
lock
)
{
locker
.
unlock
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment