tri11paragon
/
COSC_3P95_Assignment_2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

otel working

main
Brett 2023-11-16 20:29:46 -05:00
parent b2b3bc7f93
commit bc1aa49115
34 changed files with 296 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/compiler.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="Assignment 2 Java" />
</profile>
</annotationProcessing>
</component>
</project>

7
.idea/encodings.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>

20
.idea/jarRepositories.xml Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
</component>
</project>

8
.idea/modules.xml
View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/Assignment 2 Java.iml" filepath="$PROJECT_DIR$/Assignment 2 Java.iml" />
</modules>
</component>
</project>

23
Assignment 2 Java.iml
View File

@ -1,27 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<javadoc-paths>
<root url="file://$MODULE_DIR$/libs" />
</javadoc-paths>
<content url="file://$MODULE_DIR$">
<component name="AdditionalModuleElements">
<content url="file://$MODULE_DIR$" dumb="true">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" exported="">
<library>
<CLASSES>
<root url="file://$MODULE_DIR$/libs" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$MODULE_DIR$/libs" />
</SOURCES>
<jarDirectory url="file://$MODULE_DIR$/libs" recursive="false" />
<jarDirectory url="file://$MODULE_DIR$/libs" recursive="false" type="SOURCES" />
</library>
</orderEntry>
</component>
</module>

BIN
libs/opentelemetry-exporter-otlp-common-1.31.0.jar Normal file
View File

Binary file not shown.

BIN
libs/opentelemetry-exporter-sender-okhttp-1.31.0.jar Normal file
View File

Binary file not shown.

BIN
libs/opentelemetry-sdk-extension-autoconfigure-spi-1.31.0.jar Normal file
View File

Binary file not shown.

104
pom.xml Normal file
View File

@ -0,0 +1,104 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>ca.brock.3P95.Assignemnt2</groupId>
<artifactId>FemboyInternational</artifactId>
<version>0.69.420</version>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>1.32.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-api</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-metrics</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-logging</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp-common</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-jaeger-proto</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/io.opentelemetry/opentelemetry-semconv -->
<dependency>
<!-- Not managed by opentelemetry-bom -->
<groupId>io.opentelemetry.semconv</groupId>
<artifactId>opentelemetry-semconv</artifactId>
<version>1.22.0-alpha</version>
</dependency>
<!-- https://mvnrepository.com/artifact/io.opentelemetry.javaagent/opentelemetry-javaagent -->
<!-- <dependency>-->
<!-- <groupId>io.opentelemetry.javaagent</groupId>-->
<!-- <artifactId>opentelemetry-javaagent</artifactId>-->
<!-- <version>1.31.0</version>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
<!-- https://mvnrepository.com/artifact/io.opentelemetry.javaagent/opentelemetry-javaagent-api -->
<!-- <dependency>-->
<!-- <groupId>io.opentelemetry.javaagent</groupId>-->
<!-- <artifactId>opentelemetry-javaagent-api</artifactId>-->
<!-- <version>0.16.1</version>-->
<!-- <scope>runtime</scope>-->
<!-- </dependency>-->
<dependency>
<groupId>org.lz4</groupId>
<artifactId>lz4-java</artifactId>
<version>1.8.0</version>
</dependency>
</dependencies>
</project>

0
src/client/ChunkedCompressedChecksumFileWriter.java → src/main/java/client/ChunkedCompressedChecksumFileWriter.java
View File

3
src/client/Client.java → src/main/java/client/Client.java
View File

@ -41,12 +41,15 @@ public class Client {
public void close(){
try {
out.writeByte(FileUtil.COMMAND.CLOSE.type);
out.flush();
in.close();
out.close();
serverConnection.close();
} catch (Exception e){
ExceptionLogger.log(e);
}
System.out.println("Disconnected!");
}
public static void main(String[] args) {

29
src/server/ChunkedCompressedChecksumFileReader.java → src/main/java/server/ChunkedCompressedChecksumFileReader.java
View File

@ -1,5 +1,9 @@
package server;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import net.jpountz.xxhash.StreamingXXHash64;
import shared.ArrayData;
import shared.FileUtil;
@ -7,6 +11,7 @@ import shared.FileUtil;
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.concurrent.TimeUnit;
public class ChunkedCompressedChecksumFileReader {
@ -22,14 +27,24 @@ public class ChunkedCompressedChecksumFileReader {
this.seed = seed;
}
public FileHeader readChunk() throws IOException {
public FileHeader readChunk(Tracer trace, Span sp) throws IOException {
//Span gf = trace.spanBuilder("Chunk Read").setParent(Context.current().with(sp)).startSpan();
FileHeader header = readHeader();
if (header.getUncompressed() == 0)
return header;
byte[] data = readSome(header);
byte[] decompressed = decompress(header, data);
hash(header, decompressed);
fileOutputWriter.write(decompressed, 0, decompressed.length);
//try (Scope scope = gf.makeCurrent()) {
if (header.getUncompressed() == 0)
return header;
sp.addEvent("Read Data");
byte[] data = readSome(header);
sp.addEvent("Decompress Data");
byte[] decompressed = decompress(header, data);
sp.addEvent("Hash");
hash(header, decompressed);
sp.addEvent("Write");
fileOutputWriter.write(decompressed, 0, decompressed.length);
sp.addEvent("End");
// } finally {
// gf.end();
// }
return header;
}

48
src/server/Connection.java → src/main/java/server/Connection.java
View File

@ -4,6 +4,7 @@ import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Context;
import io.opentelemetry.context.Scope;
import shared.ExceptionLogger;
import shared.FileUtil;
@ -17,22 +18,21 @@ public class Connection implements Runnable {
private final Server server;
private DataOutputStream out;
private DataInputStream in;
private Tracer trace;
private Span fileSend;
public Connection(Server server, Tracer trace, Span parent, Socket clientSocket) {
this.server = server;
this.clientSocket = clientSocket;
this.trace = trace;
try {
out = new DataOutputStream(new BufferedOutputStream(clientSocket.getOutputStream()));
in = new DataInputStream(new BufferedInputStream(clientSocket.getInputStream()));
} catch (Exception e) {
ExceptionLogger.log(e);
}
parent.addEvent("Connection Established", System.nanoTime(), TimeUnit.NANOSECONDS);
parent.addEvent("Connection Established");
SpanBuilder sb = trace.spanBuilder("New Connection");
Context ctx = Context.current();
parent.storeInContext(ctx);
sb.setParent(ctx);
sb.setAttribute("INetAddress", clientSocket.getInetAddress().toString());
sb.setAttribute("Port", clientSocket.getPort());
sb.setAttribute("LocalPort", clientSocket.getLocalPort());
@ -41,19 +41,37 @@ public class Connection implements Runnable {
@Override
public void run() {
while (server.isRunning()) {
if (!clientSocket.isConnected())
break;
try {
if (in.available() > 0) {
byte command = in.readByte();
if (command == FileUtil.COMMAND.WRITE.type)
FileUtil.receive(in, fileSend);
try (Scope scope = fileSend.makeCurrent()) {
int filesReceived = 0;
while (server.isRunning()) {
System.out.println("Hello " + clientSocket.isConnected());
if (!clientSocket.isConnected()) {
System.out.println("Client Disconnected");
break;
}
try {
if (in.available() > 0) {
fileSend.addEvent("File Received");
Span fileIn = trace.spanBuilder("File Received").setAttribute("Files Received", filesReceived).startSpan();
try (Scope s = fileIn.makeCurrent()){
byte command = in.readByte();
if (command == FileUtil.COMMAND.CLOSE.type) {
System.out.println("Client sent disconnect signal!");
break;
}
if (command == FileUtil.COMMAND.WRITE.type)
FileUtil.receive(in, trace, fileIn);
} finally {
fileIn.end();
}
}
} catch (IOException e) {
throw new RuntimeException(e);
}
} catch (IOException e) {
throw new RuntimeException(e);
}
} finally {
fileSend.end();
}
try {
out.close();

0
src/server/FileHeader.java → src/main/java/server/FileHeader.java
View File

27
src/server/Server.java → src/main/java/server/Server.java
View File

@ -3,7 +3,9 @@ package server;
import io.opentelemetry.api.OpenTelemetry;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanBuilder;
import io.opentelemetry.api.trace.SpanKind;
import io.opentelemetry.api.trace.Tracer;
import io.opentelemetry.context.Scope;
import shared.ExceptionLogger;
import shared.OTelUtils;
@ -25,12 +27,25 @@ public class Server {
public Server() {
Tracer main = ot.getTracer("Main Server", "0.69");
System.out.println("Starting server");
SpanBuilder sb = main.spanBuilder("Start Server");
Span sbs = sb.startSpan();
try {
Span sbs = main.spanBuilder("Start Server").setAttribute("Server Port", SERVER_PORT).startSpan();
try (Scope scope = sbs.makeCurrent()) {
System.out.println("Starting server");
sbs.addEvent("Server Start", System.nanoTime(), TimeUnit.NANOSECONDS);
ServerSocket serverSocket = new ServerSocket(SERVER_PORT);
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
System.out.println("Closing Server");
running = false;
sbs.end();
executor.shutdown();
try {
serverSocket.close();
} catch (IOException e) {
throw new RuntimeException(e);
}
}
});
System.out.println("Server Started");
while (running)
@ -40,8 +55,12 @@ public class Server {
} catch (IOException e) {
sbs.recordException(e);
ExceptionLogger.log(e);
} finally {
sbs.end();
}
System.out.println("Closing thread pool");
executor.shutdown();
System.out.println("Server exited!");
}
public boolean isRunning(){

0
src/shared/ArrayData.java → src/main/java/shared/ArrayData.java
View File

0
src/shared/ExceptionLogger.java → src/main/java/shared/ExceptionLogger.java
View File

15
src/shared/FileUtil.java → src/main/java/shared/FileUtil.java
View File

@ -2,6 +2,7 @@ package shared;
import client.ChunkedCompressedChecksumFileWriter;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.Tracer;
import net.jpountz.lz4.LZ4Compressor;
import net.jpountz.lz4.LZ4Factory;
import net.jpountz.lz4.LZ4FastDecompressor;
@ -28,7 +29,8 @@ public class FileUtil {
public static final XXHash64 HASH_64 = XX_HASH_FACTORY.hash64();
public enum COMMAND {
WRITE((byte) 1);
CLOSE((byte) 1),
WRITE((byte) 2);
public final byte type;
COMMAND(byte type) {
@ -57,21 +59,26 @@ public class FileUtil {
}
}
public static void receive(DataInputStream dataIn, Span fs) {
public static void receive(DataInputStream dataIn, Tracer trace, Span sp) {
try {
String path = createPath(dataIn.readUTF());
fs.addEvent("Sending file " + path, System.nanoTime(), TimeUnit.NANOSECONDS);
sp.addEvent("Sending file " + path);
System.out.println("Writing to file: " + path);
sp.setAttribute("File", path);
sp.addEvent("File Received");
ChunkedCompressedChecksumFileReader reader = new ChunkedCompressedChecksumFileReader(dataIn, path, FileUtil.SEED);
// ugh I want while(reader.readChunk().getUncompressed()); but it makes warnings!!!
while(true) {
if (reader.readChunk().getUncompressed() == 0)
if (reader.readChunk(trace, sp).getUncompressed() == 0) {
sp.addEvent("Chunk Read");
break;
}
}
reader.close();
System.out.println("Writing " + path + " complete");
sp.addEvent("File Written");
} catch (Exception e) {
ExceptionLogger.log(e);
}

38
src/shared/OTelUtils.java → src/main/java/shared/OTelUtils.java
View File

@ -8,7 +8,7 @@ import io.opentelemetry.context.propagation.TextMapPropagator;
import io.opentelemetry.exporter.logging.LoggingMetricExporter;
import io.opentelemetry.exporter.logging.LoggingSpanExporter;
import io.opentelemetry.exporter.logging.SystemOutLogRecordExporter;
import io.opentelemetry.javaagent.shaded.io.opentelemetry.semconv.ResourceAttributes;
import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter;
import io.opentelemetry.sdk.OpenTelemetrySdk;
import io.opentelemetry.sdk.logs.SdkLoggerProvider;
import io.opentelemetry.sdk.logs.export.BatchLogRecordProcessor;
@ -17,11 +17,13 @@ import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import io.opentelemetry.semconv.ResourceAttributes;
public class OTelUtils {
public static OpenTelemetry create(){
Resource resource = Resource.getDefault().toBuilder().put(ResourceAttributes.SERVICE_NAME.getKey(), "cum").put(ResourceAttributes.SERVICE_VERSION.getKey(), "0.1.0").build();
public static OpenTelemetry createLogger(){
Resource resource = Resource.getDefault().toBuilder().put(ResourceAttributes.SERVICE_NAME, "cum").put(ResourceAttributes.SERVICE_VERSION, "0.1.0").build();
SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
.addSpanProcessor(SimpleSpanProcessor.create(LoggingSpanExporter.create()))
@ -46,4 +48,34 @@ public class OTelUtils {
.buildAndRegisterGlobal();
}
public static OpenTelemetry create(){
Resource resource = Resource.getDefault().toBuilder().put(ResourceAttributes.SERVICE_NAME.getKey(), "cum").put(ResourceAttributes.SERVICE_VERSION.getKey(), "0.1.0").build();
SpanExporter otlpExporter = OtlpGrpcSpanExporter.builder()
.setEndpoint("http://sc.on.underlying.skynet.tpgc.me:4317")
.build();
SdkTracerProvider sdkTracerProvider = SdkTracerProvider.builder()
.addSpanProcessor(SimpleSpanProcessor.create(otlpExporter))
.setResource(resource)
.build();
SdkMeterProvider sdkMeterProvider = SdkMeterProvider.builder()
.registerMetricReader(PeriodicMetricReader.builder(LoggingMetricExporter.create()).build())
.setResource(resource)
.build();
SdkLoggerProvider sdkLoggerProvider = SdkLoggerProvider.builder()
.addLogRecordProcessor(BatchLogRecordProcessor.builder(SystemOutLogRecordExporter.create()).build())
.setResource(resource)
.build();
return OpenTelemetrySdk.builder()
.setTracerProvider(sdkTracerProvider)
.setMeterProvider(sdkMeterProvider)
.setLoggerProvider(sdkLoggerProvider)
.setPropagators(ContextPropagators.create(TextMapPropagator.composite(W3CTraceContextPropagator.getInstance(), W3CBaggagePropagator.getInstance())))
.buildAndRegisterGlobal();
}
}

BIN
target/classes/client/ChunkedCompressedChecksumFileWriter.class Normal file
View File

Binary file not shown.

BIN
target/classes/client/Client.class Normal file
View File

Binary file not shown.

BIN
target/classes/server/ChunkedCompressedChecksumFileReader.class Normal file
View File

Binary file not shown.

BIN
target/classes/server/Connection.class Normal file
View File

Binary file not shown.

BIN
target/classes/server/FileHeader.class Normal file
View File

Binary file not shown.

BIN
target/classes/server/Server$1.class Normal file
View File

Binary file not shown.

BIN
target/classes/server/Server.class Normal file
View File

Binary file not shown.

BIN
target/classes/shared/ArrayData.class Normal file
View File

Binary file not shown.

BIN
target/classes/shared/ExceptionLogger.class Normal file
View File

Binary file not shown.

BIN
target/classes/shared/FileUtil$COMMAND.class Normal file
View File

Binary file not shown.

BIN
target/classes/shared/FileUtil$InvalidUsageException.class Normal file
View File

Binary file not shown.

BIN
target/classes/shared/FileUtil.class Normal file
View File

Binary file not shown.

BIN
target/classes/shared/OTelUtils.class Normal file
View File

Binary file not shown.

13
target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst Normal file
View File

@ -0,0 +1,13 @@
shared/ExceptionLogger.class
server/Server$1.class
shared/FileUtil.class
server/Server.class
server/Connection.class
shared/ArrayData.class
server/ChunkedCompressedChecksumFileReader.class
client/ChunkedCompressedChecksumFileWriter.class
shared/FileUtil$InvalidUsageException.class
shared/OTelUtils.class
client/Client.class
server/FileHeader.class
shared/FileUtil$COMMAND.class

10
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst Normal file
View File

@ -0,0 +1,10 @@
/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/client/Client.java
/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/server/FileHeader.java
/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/client/ChunkedCompressedChecksumFileWriter.java
/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/server/ChunkedCompressedChecksumFileReader.java
/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/shared/ArrayData.java
/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/server/Server.java
/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/server/Connection.java
/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/shared/OTelUtils.java
/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/shared/ExceptionLogger.java
/home/brett/Documents/Brock/CS 3P95/Assignments/Assignment 2 Java/src/main/java/shared/FileUtil.java